github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Improve layout of groups filter on groups page.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-03-21 14:22:34 +08:00
parent 6a3c8fe69c
commit dda78f2fd0
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/templates/groups.hbs
View File

@ -1,15 +1,17 @@
{{#d-section pageClass="groups"}} {{#d-section pageClass="groups"}}
<h1>{{i18n "groups.index.title"}}</h1> <h1>{{i18n "groups.index.title"}}</h1>
{{text-field value=filterInput <div class="groups-filter">
placeholderKey="groups.filter_name" {{combo-box value=type
class="groups-name-filter no-blur"}} content=types
clearable=true
none="groups.index.all_groups"
class="groups-type-filter"}}
{{combo-box value=type {{text-field value=filterInput
content=types placeholderKey="groups.filter_name"
clearable=true class="groups-name-filter no-blur"}}
none="groups.index.all_groups" </div>
class="groups-type-filter"}}
{{#if model}} {{#if model}}
{{#conditional-loading-spinner condition=model.loading}} {{#conditional-loading-spinner condition=model.loading}}

3
app/assets/stylesheets/common/base/groups.scss
View File

@ -5,7 +5,8 @@
} }
} }
.groups-name-filter, .groups-type-filter { .groups-filter {
display: inline-block;
float: right; float: right;
} }

7
app/assets/stylesheets/mobile/groups.scss
View File

@ -3,7 +3,12 @@
margin-top: 20px; margin-top: 20px;
} }
.groups-filter {
display: block;
float: none;
}
.groups-name-filter { .groups-name-filter {
margin-top: 20px; margin-top: 10px;
} }
} }