diff options
| author | chr <chr@cybre.space> | 2021-03-02 00:03:24 -0800 |
|---|---|---|
| committer | chr <chr@cybre.space> | 2021-03-02 00:03:24 -0800 |
| commit | 8856c046e4e035dd0e02de32bd0a9fe4e83c81d2 (patch) | |
| tree | 5759dce6c43322fabfa2bdc5ae2102092adcefda | |
| parent | 39a545e9a2a8e26503d4acb32ff424da1c3c0142 (diff) | |
fixes
| -rw-r--r-- | app/javascript/mastodon/locales/en-CY.json | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 2 | ||||
| -rw-r--r-- | app/javascript/styles/cybre-light.scss | 4 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/en-CY.yml | 5 |
5 files changed, 11 insertions, 4 deletions
diff --git a/app/javascript/mastodon/locales/en-CY.json b/app/javascript/mastodon/locales/en-CY.json index 2ae215249..1c3a76244 100644 --- a/app/javascript/mastodon/locales/en-CY.json +++ b/app/javascript/mastodon/locales/en-CY.json @@ -112,7 +112,7 @@ "getting_started.appsshort": "Apps", "getting_started.faq": "FAQ", "getting_started.heading": "Getting started", - "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", + "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on cybre.tech at {github}.", "getting_started.userguide": "User Guide", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 3f8d37249..2d45bad66 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -183,7 +183,7 @@ "getting_started.documentation": "Documentation", "getting_started.heading": "Getting started", "getting_started.invite": "Invite people", - "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", + "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on cybre.tech at {github}.", "getting_started.security": "Account settings", "getting_started.terms": "Terms of service", "hashtag.column_header.tag_mode.all": "and {additional}", diff --git a/app/javascript/styles/cybre-light.scss b/app/javascript/styles/cybre-light.scss index 952c2ea96..78656e030 100644 --- a/app/javascript/styles/cybre-light.scss +++ b/app/javascript/styles/cybre-light.scss @@ -329,6 +329,10 @@ $gold-star: #dd9d08; } } +.character-counter { + color:$white; +} + button.icon-button { &.disabled { } diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 4885878f0..ff9cd997f 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -10,7 +10,7 @@ .fields-row .fields-row__column.fields-group.fields-row__column-6 = f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30, data: { default: @account.username } }, hint: false - = f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false + = f.input :note, wrapper: :with_label, input_html: { maxlength: 1024 }, hint: false .fields-row .fields-row__column.fields-row__column-6 diff --git a/config/locales/en-CY.yml b/config/locales/en-CY.yml index 9c48ee2ab..9a4b7b294 100644 --- a/config/locales/en-CY.yml +++ b/config/locales/en-CY.yml @@ -42,7 +42,10 @@ en-CY: nothing_here: There is nothing here! people_followed_by: People whom %{name} follows people_who_follow: People who follow %{name} - posts: Pings + posts: + one: Ping + other: Pings + posts_tab_heading: Pings posts_with_replies: Pings with replies remote_follow: Remote follow reserved_username: The username is reserved |