diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-19 10:44:10 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-19 10:44:10 +0200 |
| commit | 268417daf314a5af2cc81e75d9d476f79a697b17 (patch) | |
| tree | 84e958cf40862ea3e51f2bf5159bebeae25de898 /app | |
| parent | 546688aa1d7355b732f10a60d4b27cb9306eee32 (diff) | |
| parent | 3d70ec470aa99b93e518f7b1e7938687be56748e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/locales/pt-BR.json | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 12 |
2 files changed, 5 insertions, 9 deletions
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, |