Fix margin on top action button, fix width of counters on frontpage (#6573)

diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index c2e819f5172a120d3e8bf1fc9a7bcb3ab960d500..9ce83aa9be57505d6e0fe6e49d1ecd934cf7ec52 100644 (file)
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -15,8 +15,6 @@ $small-breakpoint: 960px;
   }
 }
 
-
-
 .landing-page {
   .grid {
     display: grid;
@@ -51,7 +49,6 @@ $small-breakpoint: 960px;
   }
 
   @media screen and (max-width: $small-breakpoint) {
-
     .grid {
       grid-template-columns: 40% 60%;
 
@@ -633,8 +630,8 @@ $small-breakpoint: 960px;
       align-items: flex-end;
 
       .information-board__section {
-        flex: 1 0 80px;
-        padding: 0 5px;
+        flex: 1 0 auto;
+        padding: 0 10px;
       }
     }
 

diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index dec7d22843a74099a1f980563641b35c045f04f0..2e38cda4ede33dfbd596c074f47c5b47c2f195aa 100644 (file)
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -278,6 +278,11 @@ code {
   .actions {
     margin-top: 30px;
     display: flex;
+
+    &.actions--top {
+      margin-top: 0;
+      margin-bottom: 30px;
+    }
   }
 
   button,

diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 030719201b1a1478388c618b45270929b05b3660..fd66e13fb8ef38660d7ce167abefd27355386795 100644 (file)
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -4,7 +4,7 @@
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
 
-  .actions
+  .actions.actions--top
     = f.button :button, t('generic.save_changes'), type: :submit
 
   %h4= t 'preferences.languages'