diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-19 13:41:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-19 13:41:34 +0200 |
| commit | 8933e8cb1d54a6c96e4085e426481143d3e209e0 (patch) | |
| tree | 2afac9cff3c093d8464f7f4b59f0e76ae1d9183f /app/javascript | |
| parent | 546688aa1d7355b732f10a60d4b27cb9306eee32 (diff) | |
| parent | 8b7b65e995849550957ecfda7fc1bf5fa9c8fcdf (diff) | |
Merge pull request #998 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/modal.scss | 12 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/pt-BR.json | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 12 |
3 files changed, 9 insertions, 17 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index fece8593b..05af34680 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -488,14 +488,6 @@ font-size: 14px; } -.confirmation-modal { - max-width: 85vw; - - @media screen and (min-width: 480px) { - max-width: 380px; - } -} - .mute-modal { line-height: 24px; } @@ -685,6 +677,10 @@ color: darken($lighter-text-color, 4%); } } + + .confirmation-modal__secondary-button { + flex-shrink: 1; + } } .confirmation-modal__do_not_ask_again { diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 5b07c2295..e469344ec 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -117,7 +117,7 @@ "emoji_button.symbols": "Símbolos", "emoji_button.travel": "Viagens & Lugares", "empty_column.account_timeline": "Não há toots aqui!", - "empty_column.account_unavailable": "Profile unavailable", + "empty_column.account_unavailable": "Perfil indisponível", "empty_column.blocks": "Você ainda não bloqueou nenhum usuário.", "empty_column.community": "A timeline local está vazia. Escreva algo publicamente para começar!", "empty_column.direct": "Você não tem nenhuma mensagem direta ainda. Quando você enviar ou receber uma, as mensagens aparecerão por aqui.", diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 9fcaeb8dd..6a81a4fc1 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3961,14 +3961,6 @@ a.status-card.compact:hover { font-size: 14px; } -.confirmation-modal { - max-width: 85vw; - - @media screen and (min-width: 480px) { - max-width: 380px; - } -} - .mute-modal { line-height: 24px; } @@ -4147,6 +4139,10 @@ a.status-card.compact:hover { color: darken($lighter-text-color, 4%); } } + + .confirmation-modal__secondary-button { + flex-shrink: 1; + } } .confirmation-modal__container, |