nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Eugen Rochko 2018-03-01 02:48:08 +01:00 committed by GitHub
parent fce8464077
commit 473a69ab18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/styles/mastodon/about.scss
View File

@ -15,8 +15,6 @@ $small-breakpoint: 960px;
} }
} }
.landing-page { .landing-page {
.grid { .grid {
display: grid; display: grid;
@ -51,7 +49,6 @@ $small-breakpoint: 960px;
} }
@media screen and (max-width: $small-breakpoint) { @media screen and (max-width: $small-breakpoint) {
.grid { .grid {
grid-template-columns: 40% 60%; grid-template-columns: 40% 60%;
@ -633,8 +630,8 @@ $small-breakpoint: 960px;
align-items: flex-end; align-items: flex-end;
.information-board__section { .information-board__section {
flex: 1 0 80px; flex: 1 0 auto;
padding: 0 5px; padding: 0 10px;
} }
} }

5
app/javascript/styles/mastodon/forms.scss
View File

@ -278,6 +278,11 @@ code {
.actions { .actions {
margin-top: 30px; margin-top: 30px;
display: flex; display: flex;
&.actions--top {
margin-top: 0;
margin-bottom: 30px;
}
} }
button, button,

2
app/views/settings/preferences/show.html.haml
View File

@ -4,7 +4,7 @@
= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
= render 'shared/error_messages', object: current_user = render 'shared/error_messages', object: current_user
.actions .actions.actions--top
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit
%h4= t 'preferences.languages' %h4= t 'preferences.languages'