Improve appearence consistency of settings pages (#13938)

* Fix header button changing header size in settings pages

* Make form buttons look more like a part of the form in settings pages

- Put buttons closer, using same distance as between inputs
- Make buton font size a bit smaller to blend a bit more
- Add the class button to button tags for consisent styling
signup-info-prompt
Mélanie Chauvel 2020-06-26 00:36:30 +02:00 committed by GitHub
parent e49bd93211
commit 08cf81f8c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 10 deletions

View File

@ -171,9 +171,7 @@ $content-width: 840px;
} }
.content { .content {
padding: 20px 15px; padding: 55px 15px 20px 25px;
padding-top: 60px;
padding-left: 25px;
@media screen and (max-width: $no-columns-breakpoint) { @media screen and (max-width: $no-columns-breakpoint) {
max-width: none; max-width: none;
@ -184,7 +182,7 @@ $content-width: 840px;
&-heading { &-heading {
display: flex; display: flex;
padding-bottom: 40px; padding-bottom: 36px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
margin: -15px -15px 40px 0; margin: -15px -15px 40px 0;
@ -215,7 +213,7 @@ $content-width: 840px;
h2 { h2 {
color: $secondary-text-color; color: $secondary-text-color;
font-size: 24px; font-size: 24px;
line-height: 28px; line-height: 36px;
font-weight: 400; font-weight: 400;
@media screen and (max-width: $no-columns-breakpoint) { @media screen and (max-width: $no-columns-breakpoint) {
@ -512,6 +510,16 @@ body,
max-width: 100%; max-width: 100%;
} }
.simple_form {
.actions {
margin-top: 15px;
}
.button {
font-size: 15px;
}
}
.batch-form-box { .batch-form-box {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

View File

@ -38,7 +38,7 @@
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}") = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
.actions .actions
%button= t('admin.accounts.search') %button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative' = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
.table-wrapper .table-wrapper

View File

@ -34,7 +34,7 @@
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.custom_emojis.#{key}") = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.custom_emojis.#{key}")
.actions .actions
%button= t('admin.accounts.search') %button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative' = link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative'
= form_for(@form, url: batch_admin_custom_emojis_path) do |f| = form_for(@form, url: batch_admin_custom_emojis_path) do |f|

View File

@ -27,7 +27,7 @@
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}") = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}")
.actions .actions
%button= t('admin.accounts.search') %button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_instances_path, class: 'button negative' = link_to t('admin.accounts.reset'), admin_instances_path, class: 'button negative'
%hr.spacer/ %hr.spacer/

View File

@ -18,7 +18,7 @@
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}") = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}")
.actions .actions
%button= t('admin.accounts.search') %button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative' = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'
- @reports.group_by(&:target_account_id).each do |target_account_id, reports| - @reports.group_by(&:target_account_id).each do |target_account_id, reports|

View File

@ -36,7 +36,7 @@
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.tags.#{key}") = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.tags.#{key}")
.actions .actions
%button= t('admin.accounts.search') %button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_tags_path, class: 'button negative' = link_to t('admin.accounts.reset'), admin_tags_path, class: 'button negative'
%hr.spacer/ %hr.spacer/