From 473a69ab18c17551c99dc0806aa948b7edaf7cb0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 1 Mar 2018 02:48:08 +0100
Subject: [PATCH] Fix margin on top action button, fix width of counters on
frontpage (#6573)
---
app/javascript/styles/mastodon/about.scss | 7 ++-----
app/javascript/styles/mastodon/forms.scss | 5 +++++
app/views/settings/preferences/show.html.haml | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index c2e819f51..9ce83aa9b 100644
--- 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 dec7d2284..2e38cda4e 100644
--- 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 030719201..fd66e13fb 100644
--- 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'