From 143b2460e9e7f42ff4b45f2af23d2dbe2f58281d Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Thu, 29 Apr 2021 17:08:09 +0100 Subject: [PATCH] [VIEWS] Minor proofreading of templates and css --- public/assets/css/base.css | 6 +++--- public/assets/css/base_mid.css | 8 ++++---- public/assets/css/base_small.css | 8 ++++---- public/assets/css/doc/doc_mid.css | 7 +++---- public/assets/css/doc/doc_small.css | 7 +++---- public/assets/css/login/login.css | 6 +++--- public/assets/css/network/public.css | 6 +++--- public/assets/css/network/public_mid.css | 6 +++--- public/assets/css/network/public_small.css | 6 +++--- public/assets/css/settings/settings.css | 12 ++++++------ public/assets/css/settings/settings_mid.css | 12 ++++++------ public/assets/css/settings/settings_small.css | 5 ++--- templates/config/admin.html.twig | 2 +- templates/doc/faq/contact.html.twig | 4 ++-- templates/doc/faq/faq.html.twig | 2 +- templates/doc/faq/groups.html.twig | 2 +- templates/settings/account.html.twig | 2 +- templates/settings/notifications.html.twig | 2 +- templates/settings/profile.html.twig | 2 +- 19 files changed, 51 insertions(+), 54 deletions(-) diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 4fd7334f88..7d4c4d0e3a 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -232,7 +232,7 @@ input.larger { .content input[type="checkbox"]:focus + label::before, .content input[type="checkbox"]:hover + label::before{ border-radius: 10%; - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .content input[type="checkbox"] { position: absolute; @@ -269,7 +269,7 @@ input.larger { .content input[type="radio"]:focus + label::before, .content input[type="radio"]:hover + label::before{ border-radius: 50%; - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .content input[type="radio"] { position: absolute; @@ -294,7 +294,7 @@ input.larger { .create-notice button[type=submit]:focus, .create-notice button[type=submit]:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .avatar { diff --git a/public/assets/css/base_mid.css b/public/assets/css/base_mid.css index b5a282e125..99292a78ff 100644 --- a/public/assets/css/base_mid.css +++ b/public/assets/css/base_mid.css @@ -127,7 +127,7 @@ b { transform: translateY(6px); } #toggle:checked+div label{ - width: 0px; + width: 0; } #toggle:checked+div label::before { transform: rotate(45deg); @@ -260,7 +260,7 @@ input.larger { .content input[type="checkbox"]:focus + label::before, .content input[type="checkbox"]:hover + label::before{ border-radius: 10%; - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .content input[type="checkbox"] { position: absolute; @@ -294,7 +294,7 @@ input.larger { .content input[type="radio"]:focus + label::before, .content input[type="radio"]:hover + label::before{ border-radius: 50%; - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .content input[type="radio"] { position: absolute; @@ -319,7 +319,7 @@ input.larger { .create-notice button[type=submit]:focus, .create-notice button[type=submit]:hover { border-radius: var(--small-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .avatar { diff --git a/public/assets/css/base_small.css b/public/assets/css/base_small.css index 2217d9d518..468a46bf3c 100644 --- a/public/assets/css/base_small.css +++ b/public/assets/css/base_small.css @@ -126,7 +126,7 @@ b { transform: translateY(6px); } #toggle:checked+div label{ - width: 0px; + width: 0; } #toggle:checked+div label::before { transform: rotate(45deg); @@ -260,7 +260,7 @@ input.larger { .content input[type="checkbox"]:focus + label::before, .content input[type="checkbox"]:hover + label::before{ border-radius: 10%; - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .content input[type="checkbox"] { position: absolute; @@ -294,7 +294,7 @@ input.larger { .content input[type="radio"]:focus + label::before, .content input[type="radio"]:hover + label::before{ border-radius: 50%; - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .content input[type="radio"] { position: absolute; @@ -319,7 +319,7 @@ input.larger { .create-notice button[type=submit]:focus, .create-notice button[type=submit]:hover { border-radius: var(--small-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .avatar { diff --git a/public/assets/css/doc/doc_mid.css b/public/assets/css/doc/doc_mid.css index 055ce25fcf..8f33edbbf7 100644 --- a/public/assets/css/doc/doc_mid.css +++ b/public/assets/css/doc/doc_mid.css @@ -19,7 +19,7 @@ padding: var(--medium-size); font-size: var(--medium-size); font-family: var(--head-font); - box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); + box-shadow: 0 0 60px -20px rgba(0, 0, 0, 0.75); } .faq-nav ul { @@ -61,13 +61,12 @@ order: 2; background-color: #00000050; font-size: var(--small-size); - padding: calc(3*var(--unit-size)); - padding-top: var(--unit-size); + padding: var(--unit-size) calc(3 * var(--unit-size)) calc(3 * var(--unit-size)); border-radius: var(--unit-size); margin-top: calc(2 * var(--unit-size)); margin-right: var(--side-margin); margin-left: var(--side-margin); - box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); + box-shadow: 0 0 60px -20px rgba(0, 0, 0, 0.75); } .markd h2 { diff --git a/public/assets/css/doc/doc_small.css b/public/assets/css/doc/doc_small.css index 82ca2d3d8a..4b510fa1c9 100644 --- a/public/assets/css/doc/doc_small.css +++ b/public/assets/css/doc/doc_small.css @@ -6,7 +6,7 @@ align-items: center; margin-left: 0; margin-right: 0; - box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); + box-shadow: 0 0 60px -20px rgba(0, 0, 0, 0.75); height: 100%; } @@ -61,13 +61,12 @@ order: 2; background-color: #00000050; font-size: var(--small-size); - padding: calc(3*var(--unit-size)); - padding-top: var(--unit-size); + padding: var(--unit-size) calc(3 * var(--unit-size)) calc(3 * var(--unit-size)); border-radius: var(--unit-size); margin-top: calc(2 * var(--unit-size)); margin-right: 1%; margin-left: 1%; - box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); + box-shadow: 0 0 60px -20px rgba(0, 0, 0, 0.75); } .markd h2 { diff --git a/public/assets/css/login/login.css b/public/assets/css/login/login.css index 88e1cb9949..e2acfd42a5 100644 --- a/public/assets/css/login/login.css +++ b/public/assets/css/login/login.css @@ -63,13 +63,13 @@ form button[type=submit] { form button[type=submit]:focus, form button[type=submit]:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } #login-notes { - margin: 0px; + margin: 0; } #login-main { - border: 0px; + border: 0; } diff --git a/public/assets/css/network/public.css b/public/assets/css/network/public.css index 5f51b39ca4..ef430c5548 100644 --- a/public/assets/css/network/public.css +++ b/public/assets/css/network/public.css @@ -379,8 +379,8 @@ } #post_attachments { - width: 0.1px; - height: 0.1px; + width: 0; + height: 0; opacity: 0; overflow: hidden; position: absolute; @@ -392,7 +392,7 @@ #post_attachments:focus + label, #post_attachments + label:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .icon-attach { width: var(--main-size); diff --git a/public/assets/css/network/public_mid.css b/public/assets/css/network/public_mid.css index 2d908b6b13..6fc52289f6 100644 --- a/public/assets/css/network/public_mid.css +++ b/public/assets/css/network/public_mid.css @@ -378,8 +378,8 @@ } #post_attachments { - width: 0.1px; - height: 0.1px; + width: 0; + height: 0; opacity: 0; overflow: hidden; position: absolute; @@ -391,7 +391,7 @@ #post_attachments:focus + label, #post_attachments + label:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .icon-attach { width: var(--main-size); diff --git a/public/assets/css/network/public_small.css b/public/assets/css/network/public_small.css index f6c8eaef48..ddaf7119a8 100644 --- a/public/assets/css/network/public_small.css +++ b/public/assets/css/network/public_small.css @@ -377,8 +377,8 @@ } #post_attachments { - width: 0.1px; - height: 0.1px; + width: 0; + height: 0; opacity: 0; overflow: hidden; position: absolute; @@ -390,7 +390,7 @@ #post_attachments:focus + label, #post_attachments + label:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } .icon-attach { width: var(--main-size); diff --git a/public/assets/css/settings/settings.css b/public/assets/css/settings/settings.css index 4786f43031..4752e06e81 100644 --- a/public/assets/css/settings/settings.css +++ b/public/assets/css/settings/settings.css @@ -63,7 +63,7 @@ font-weight: 700; } -.secundary { +.secondary { display: flex; flex-wrap: wrap; background-color: var(--bg3); @@ -264,7 +264,7 @@ input[type=radio] { margin-left: 0; margin-right: 0; margin-top: 0; - box-shadow: 0; + box-shadow: none; border-radius: 0 0 var(--unit-size) var(--unit-size); font-size: var(--unit-size); } @@ -275,7 +275,7 @@ input[type=radio] { margin-bottom: calc(var(--unit-size) * 0.5); } -.secundary button[type=submit] { +.secondary button[type=submit] { background: var(--bg1); padding: 0.6em 1.2em; color: var(--fg); @@ -286,8 +286,8 @@ input[type=radio] { font-family: 'Montserrat', sans-serif; font-weight: 700; } -.secundary button[type=submit]:focus, -.secundary button[type=submit]:hover { +.secondary button[type=submit]:focus, +.secondary button[type=submit]:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } \ No newline at end of file diff --git a/public/assets/css/settings/settings_mid.css b/public/assets/css/settings/settings_mid.css index bd297d53ec..8ec21439ca 100644 --- a/public/assets/css/settings/settings_mid.css +++ b/public/assets/css/settings/settings_mid.css @@ -63,7 +63,7 @@ font-weight: 700; } -.secundary { +.secondary { display: flex; flex-wrap: wrap; background-color: var(--bg3); @@ -252,7 +252,7 @@ input[type=radio] { margin-left: 0; margin-right: 0; margin-top: 0; - box-shadow: 0; + box-shadow: none; border-radius: 0 0 var(--unit-size) var(--unit-size); font-size: var(--unit-size); } @@ -263,7 +263,7 @@ input[type=radio] { margin-bottom: calc(var(--unit-size) * 0.5); } -.secundary button[type=submit] { +.secondary button[type=submit] { background: var(--bg1); padding: 0.6em 1.2em; color: var(--fg); @@ -274,8 +274,8 @@ input[type=radio] { font-family: 'Montserrat', sans-serif; font-weight: 700; } -.secundary button[type=submit]:focus, -.secundary button[type=submit]:hover { +.secondary button[type=submit]:focus, +.secondary button[type=submit]:hover { border-radius: var(--unit-size); - box-shadow: 0 0px 8px var(--accent); + box-shadow: 0 0 8px var(--accent); } \ No newline at end of file diff --git a/public/assets/css/settings/settings_small.css b/public/assets/css/settings/settings_small.css index e68cd5976a..2bd8a4214a 100644 --- a/public/assets/css/settings/settings_small.css +++ b/public/assets/css/settings/settings_small.css @@ -63,10 +63,9 @@ font-weight: 700; } -.secundary { +.secondary { display: flex; flex-wrap: wrap; - border-radius: 0 0 var(--unit-size) var(--unit-size); background-color: var(--bg3); margin: 2%; border: solid 2px var(--accent-low); @@ -255,7 +254,7 @@ input[type=radio] { margin-left: 0; margin-right: 0; margin-top: 0; - box-shadow: 0; + box-shadow: none; border-radius: 0 0 var(--unit-size) var(--unit-size); font-size: var(--unit-size); } diff --git a/templates/config/admin.html.twig b/templates/config/admin.html.twig index 4d053395d9..6874a2e2a9 100644 --- a/templates/config/admin.html.twig +++ b/templates/config/admin.html.twig @@ -21,7 +21,7 @@ Old value: {{ old_value }}
Default value: {{ default }} Configuration dumped to social.local.yaml - Backup of previous configuration in social.local.yaml.back will be overriden with the next change + Backup of previous configuration in social.local.yaml.back will be overridden with the next change {% endif %} diff --git a/templates/doc/faq/contact.html.twig b/templates/doc/faq/contact.html.twig index 6e39a46213..add80ae13a 100644 --- a/templates/doc/faq/contact.html.twig +++ b/templates/doc/faq/contact.html.twig @@ -10,8 +10,8 @@ {% apply markdown_to_html %} ## Bugs If you think you've found a bug in the underlying [GNU social](https://gnu.io/social/) software, or if there's a new feature you'd like to see, add it into the [GNU social task list](https://git.gnu.io/gnu/gnu-social/issues). Don't forget to - check the list of existing bugs to make sure it hasn't already been reported! ## Post a notice If you have a question about how to do something, just post a notice with your question, preferrably tagged with #NewHere. Watch your inbox for replies. + check the list of existing bugs to make sure it hasn't already been reported! ## Post a notice If you have a question about how to do something, just post a notice with your question, preferably tagged with #NewHere. Watch your inbox for replies. ## Post a notice - If you have a question about how to do something, just post a notice with your question, preferrably tagged with #NewHere. Watch your inbox for replies. + If you have a question about how to do something, just post a notice with your question, preferably tagged with #NewHere. Watch your inbox for replies. {% endapply %} {% endblock %} diff --git a/templates/doc/faq/faq.html.twig b/templates/doc/faq/faq.html.twig index 7e17dbbc5b..030bb5daf3 100644 --- a/templates/doc/faq/faq.html.twig +++ b/templates/doc/faq/faq.html.twig @@ -40,7 +40,7 @@ You can also share other types of data, like bookmarks, event invitations, polls, and questions. - If you'd like to try it out, first register a new account. Then, on the public timeline, enter your message into the textbox at the top of the page, and click "Send". It will go out on the public timeline and to anyone who is subscribed to your notices. + If you'd like to try it out, first register a new account. Then, on the public timeline, enter your message into the text box at the top of the page, and click "Send". It will go out on the public timeline and to anyone who is subscribed to your notices. To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications. {% endapply %} diff --git a/templates/doc/faq/groups.html.twig b/templates/doc/faq/groups.html.twig index 07f3ade0b5..9cabe24149 100644 --- a/templates/doc/faq/groups.html.twig +++ b/templates/doc/faq/groups.html.twig @@ -20,7 +20,7 @@ When choosing the nickname for your group, try to keep it short. The nickname is sometimes included in messages to and from the group, so the less chars the better. Try using acronyms for organizations, or airport codes for places (like 'pdx' instead of 'portland'). ## Sending messages to a group - You can send a message to a group using the syntax "!groupname" anywhere in the message. If you have more than one group named, the notice will go to each group. Only members can send notices to a group, and groups do not respond to direct messages (DMs). + You can send a message to a group using the syntax "!groupName" anywhere in the message. If you have more than one group named, the notice will go to each group. Only members can send notices to a group, and groups do not respond to direct messages (DMs). You can also select the group from the "To:" drop down when posting. diff --git a/templates/settings/account.html.twig b/templates/settings/account.html.twig index 8a962314ec..a1656a74c6 100644 --- a/templates/settings/account.html.twig +++ b/templates/settings/account.html.twig @@ -9,7 +9,7 @@ {% block primary_nav %} {{ parent() }} {% endblock primary_nav %} -
+
{% block form %}
{{ form(acc) }} diff --git a/templates/settings/notifications.html.twig b/templates/settings/notifications.html.twig index beccfd1917..a32d919b58 100644 --- a/templates/settings/notifications.html.twig +++ b/templates/settings/notifications.html.twig @@ -13,7 +13,7 @@ {{ parent() }} {% endblock primary_nav %} -
+
{% block form %}
    diff --git a/templates/settings/profile.html.twig b/templates/settings/profile.html.twig index c2345f6214..294914f66d 100644 --- a/templates/settings/profile.html.twig +++ b/templates/settings/profile.html.twig @@ -9,7 +9,7 @@ {{ parent() }} {% endblock primary_nav %} -
    +
    {% block secundary_nav %}