diff --git a/app/assets/stylesheets/common/admin/admin_report.scss b/app/assets/stylesheets/common/admin/admin_report.scss index f5f058ba1fa..c623faa2194 100644 --- a/app/assets/stylesheets/common/admin/admin_report.scss +++ b/app/assets/stylesheets/common/admin/admin_report.scss @@ -6,6 +6,7 @@ align-self: flex-start; text-align: center; padding: 3em; + margin-bottom: 1.5em; box-sizing: border-box; } @@ -36,7 +37,8 @@ display: flex; justify-content: space-between; align-items: center; - margin-bottom: 1em; + margin-top: 0.5em; + margin-bottom: 0.5em; .report-title { align-items: center; @@ -169,16 +171,16 @@ } .admin-report.users-by-type { - margin-top: 1em; + margin-top: 1.5em; } .admin-report.users-by-type, .admin-report.users-by-trust-level { - margin-bottom: 1em; + margin-bottom: 1.5em; flex: 1; .report-header { border-bottom: 1px solid $primary-medium; - padding-bottom: 0.5em; + padding-bottom: 0.25em; border-bottom: 1px solid #e9e9e9; } } diff --git a/app/assets/stylesheets/common/admin/admin_report_counters.scss b/app/assets/stylesheets/common/admin/admin_report_counters.scss index aa82ae050cb..a25da105f3a 100644 --- a/app/assets/stylesheets/common/admin/admin_report_counters.scss +++ b/app/assets/stylesheets/common/admin/admin_report_counters.scss @@ -2,6 +2,7 @@ display: flex; flex: 1; flex-direction: column; + border-bottom: 1px solid $primary-low; .counters-header { display: grid; @@ -34,9 +35,6 @@ } .admin-report.counters { - &:last-child .admin-report-counters { - border-bottom: 1px solid $primary-low; - } .admin-report-counters { display: grid; @@ -110,8 +108,7 @@ flex-direction: row; align-items: center; font-size: $font-0; - border: 0; - background: $primary-low; + border-bottom: 0; color: $primary-medium; .d-icon { font-size: $font-up-1; diff --git a/app/assets/stylesheets/common/admin/admin_report_table.scss b/app/assets/stylesheets/common/admin/admin_report_table.scss index 4170fff4e85..733ab5620fb 100644 --- a/app/assets/stylesheets/common/admin/admin_report_table.scss +++ b/app/assets/stylesheets/common/admin/admin_report_table.scss @@ -10,7 +10,7 @@ .pagination { display: flex; justify-content: flex-end; - margin-top: 0.5em; + margin-top: 0.25em; button { margin-left: 0.5em; @@ -36,7 +36,6 @@ table-layout: fixed; border: 1px solid $primary-low; margin-top: 0; - margin-bottom: 10px; tbody { border: none; diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss index 1f53e3662cf..1a7f8d93187 100644 --- a/app/assets/stylesheets/common/admin/dashboard_next.scss +++ b/app/assets/stylesheets/common/admin/dashboard_next.scss @@ -7,28 +7,33 @@ .dashboard-next { .section-top { - margin-bottom: 1em; + margin-bottom: .5em; } .navigation { display: flex; - margin: 0 0 1em 0; + margin: 0 0 2.5em 0; + border-bottom: 1px solid $primary-low-mid; .navigation-item { display: inline; background: $secondary; - padding: 0.5em 1em; + &:hover { + background: $primary-very-low; + } } .navigation-link { - font-weight: 700; + display: block; + font-weight: bold; + padding: .6em 1em .5em 1em; } } @mixin active-navigation-item { - border-radius: 3px 3px 0 0; - border: 1px solid $primary-low; - border-bottom: 10px solid $secondary; + .navigation-link { + border-bottom: .4em solid $tertiary; + } } &.dashboard-next-moderation .navigation-item.moderation { @@ -108,6 +113,9 @@ .section-body { padding: 1em 0 0; + > p { + margin-top: 0; + } } } @@ -122,7 +130,6 @@ flex-grow: 1; flex-basis: 100%; display: flex; - margin-bottom: 1em; } @include breakpoint(medium) { @@ -158,6 +165,7 @@ display: flex; flex-wrap: wrap; justify-content: space-between; + border-right: 1px solid $primary-low; .backups, .uploads { @@ -189,7 +197,6 @@ } } .last-dashboard-update { - border-left: 1px solid $primary-low; text-align: center; display: flex; justify-content: center; @@ -229,7 +236,7 @@ } .dashboard-problems { - margin-bottom: 2em; + margin-bottom: 2.5em; .d-icon-exclamation-triangle { color: $danger; @@ -242,8 +249,6 @@ } .admin-report-table { - margin-bottom: 1em; - &.is-disabled { background: $primary-low; padding: 1em; @@ -263,7 +268,7 @@ } .activity-metrics { - margin-bottom: 1em; + margin-bottom: .25em; } .user-metrics {