diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-05 12:28:10 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-05 12:28:10 +0200 |
| commit | 832cf92c74925b91c315272846b13eee581f5238 (patch) | |
| tree | fae50a7b23d932710d71735e696f62bab810cea1 /app | |
| parent | f2cf8144b427ba0639cea7976718b0ed77fbf183 (diff) | |
| parent | fc192b882f43d1dd3d61c68dc3fb327432b9388d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/locales/cs.json | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/widgets.scss | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index f98ea7f26..cbf303f3c 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -77,6 +77,7 @@ "compose_form.poll.remove_option": "Odstranit tuto volbu", "compose_form.publish": "Tootnout", "compose_form.publish_loud": "{publish}!", + "compose_form.sensitive.hide": "Označit média jako citlivá", "compose_form.sensitive.marked": "Média jsou označena jako citlivá", "compose_form.sensitive.unmarked": "Média nejsou označena jako citlivá", "compose_form.spoiler.marked": "Text je skrytý za varováním", @@ -209,6 +210,7 @@ "lightbox.close": "Zavřít", "lightbox.next": "Další", "lightbox.previous": "Předchozí", + "lightbox.view_context": "Zobrazit kontext", "lists.account.add": "Přidat do seznamu", "lists.account.remove": "Odebrat ze seznamu", "lists.delete": "Smazat seznam", diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss index e736d7a7e..acaf5b024 100644 --- a/app/javascript/styles/mastodon/widgets.scss +++ b/app/javascript/styles/mastodon/widgets.scss @@ -4,7 +4,6 @@ &__img { width: 100%; - height: 167px; position: relative; overflow: hidden; border-radius: 4px 4px 0 0; |