From 827ba2d3cfd5adb89fcae139c3c8193d9b6e7a3b Mon Sep 17 00:00:00 2001 From: Kris Date: Wed, 16 May 2018 15:49:02 -0400 Subject: [PATCH] styling misc section of dashboard --- .../admin/templates/dashboard_next.hbs | 24 +++++---- .../common/admin/dashboard_next.scss | 51 +++++++++++++++++-- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/admin/templates/dashboard_next.hbs b/app/assets/javascripts/admin/templates/dashboard_next.hbs index be8c5e3d41c..34fe21fafd7 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next.hbs @@ -116,22 +116,24 @@ -
+ +
+
+

{{i18n "admin.dashboard.last_updated"}}

+

{{updatedTimestamp}}

+ + {{i18n "admin.dashboard.whats_new_in_discourse"}} + + +
+ +
+

{{i18n 'admin.dashboard.find_old'}} {{#link-to 'admin.dashboard'}}{{i18n "admin.dashboard.old_link"}}{{/link-to}}

-
- -

- {{i18n "admin.dashboard.last_updated"}} {{updatedTimestamp}} -

- - - {{i18n "admin.dashboard.whats_new_in_discourse"}} - - {{/conditional-loading-section}} diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss index 40be1271d7a..01e8c69dde9 100644 --- a/app/assets/stylesheets/common/admin/dashboard_next.scss +++ b/app/assets/stylesheets/common/admin/dashboard_next.scss @@ -97,18 +97,63 @@ } .misc { + display: flex; border: 1px solid $primary-low; - padding: 20px; + + .durability, .last-dashboard-update { + flex: 1 1 50%; + box-sizing: border-box; + margin: 20px 0; + padding: 0 20px; + } + .durability { display: flex; + flex-wrap: wrap; justify-content: space-between; + .backups, .uploads { + flex: 1 1 100%; + } + + .uploads p:last-of-type { + margin-bottom: 0; + } .durability-title { text-transform: capitalize; } } + + @media screen and (max-width: 400px) { + flex-wrap: wrap; + .durability, .last-dashboard-update { + flex: 1 1 100%; + text-align: left; + } + .last-dashboard-update { + display: block; + margin: 0 20px 20px 20px; + padding: 20px 0 0 0; + border-top: 1px solid $primary-low; + border-left: none; + } + } + .last-dashboard-update { + border-left: 1px solid $primary-low; + text-align: center; + display: flex; + justify-content: center; + div { + align-self: center; + h4 { + margin-bottom: 0; + } + } + } } + + .community-health { .period-chooser .period-chooser-header { .selected-name, .d-icon { @@ -232,10 +277,10 @@ padding: 1em; } - @include small-width { + @media screen and (max-width: 650px) { table { tbody tr td { - font-size: $font-down-2; + font-size: $font-down-1; } } }