Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UX: minor tweaks to users directory last updated at styling #9322

Merged
merged 2 commits into from
Mar 31, 2020
Merged

UX: minor tweaks to users directory last updated at styling #9322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
722cbc6
UX: minor tweaks to users directory last updated at styling
jjaffeux Mar 31, 2020
7591af8
even cleaner
jjaffeux Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/discourse/templates/mobile/users.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#load-more selector=".directory .user" action=(action "loadMore")}}
<div class="container">
<div class='directory'>
<div class='users-directory directory'>
{{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}

<div class='directory-controls'>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/discourse/templates/users.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#d-section pageClass="users"}}
{{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
<div class="container">
<div class='directory'>
<div class='users-directory directory'>
{{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
<div class='directory-controls'>
<div class='period-controls'>
Expand Down
13 changes: 13 additions & 0 deletions app/assets/stylesheets/common/base/directory.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand All @@ -16,9 +27,11 @@
height: 1em;
}
}

.directory-last-updated {
margin-bottom: 0.5em;
color: $primary-medium;
font-size: $font-down-1;
}

table {
Expand Down
16 changes: 12 additions & 4 deletions app/assets/stylesheets/mobile/directory.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down