From f724cf1cfeab9beb8754d611ab3591b7679ca214 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 31 Mar 2020 10:12:52 +0200 Subject: [PATCH] UX: minor tweaks to users directory last updated at styling (#9322) --- .../discourse/templates/mobile/users.hbs | 2 +- .../javascripts/discourse/templates/users.hbs | 2 +- .../stylesheets/common/base/directory.scss | 13 +++++++++++++ app/assets/stylesheets/mobile/directory.scss | 16 ++++++++++++---- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs index 7f208e2abbc..808458bbcb8 100644 --- a/app/assets/javascripts/discourse/templates/mobile/users.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs @@ -1,6 +1,6 @@ {{#load-more selector=".directory .user" action=(action "loadMore")}}
-
+
{{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs index 09f4ba4f0ce..af5d17f15b0 100644 --- a/app/assets/javascripts/discourse/templates/users.hbs +++ b/app/assets/javascripts/discourse/templates/users.hbs @@ -1,7 +1,7 @@ {{#d-section pageClass="users"}} {{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
-
+
{{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index 81045260a57..b01248d1449 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -1,6 +1,17 @@ .directory { margin-bottom: 100px; + &.users-directory { + .period-chooser { + .selected-name { + margin: 0; + } + .period-chooser-header .caret-icon { + margin: 0; + } + } + } + .user-info { margin-bottom: 0; } @@ -16,9 +27,11 @@ height: 1em; } } + .directory-last-updated { margin-bottom: 0.5em; color: $primary-medium; + font-size: $font-down-1; } table { diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss index c1057bd636f..f963433e290 100644 --- a/app/assets/stylesheets/mobile/directory.scss +++ b/app/assets/stylesheets/mobile/directory.scss @@ -1,9 +1,17 @@ .directory { - .select-kit.dropdown-select-box.period-chooser - .period-chooser-header - h2.selected-name { + .period-chooser .period-chooser-header h2.selected-name { font-size: $font-up-1; - margin-bottom: 0.25em; + } + + &.users-directory { + .filter-name { + width: 100%; + margin-bottom: 1em; + } + + .directory-last-updated { + margin-bottom: 1em; + } } .directory-controls {