Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7acd9c41
Commit
7acd9c41
authored
Jun 08, 2020
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix filtered search bar layout on small screens
parent
4c1dff36
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
...mponents/filtered_search_bar/filtered_search_bar_root.vue
+4
-3
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+14
-0
No files found.
app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
View file @
7acd9c41
...
@@ -221,7 +221,7 @@ export default {
...
@@ -221,7 +221,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"vue-filtered-search-bar-container d-flex"
>
<div
class=
"vue-filtered-search-bar-container d-
md-
flex"
>
<gl-filtered-search
<gl-filtered-search
v-model=
"filterValue"
v-model=
"filterValue"
:placeholder=
"searchInputPlaceholder"
:placeholder=
"searchInputPlaceholder"
...
@@ -230,8 +230,8 @@ export default {
...
@@ -230,8 +230,8 @@ export default {
class=
"flex-grow-1"
class=
"flex-grow-1"
@
submit=
"handleFilterSubmit"
@
submit=
"handleFilterSubmit"
/>
/>
<gl-button-group
class=
"
ml-2
"
>
<gl-button-group
class=
"
sort-dropdown-container d-flex
"
>
<gl-dropdown
:text=
"selectedSortOption.title"
:right=
"true"
>
<gl-dropdown
:text=
"selectedSortOption.title"
:right=
"true"
class=
"w-100"
>
<gl-dropdown-item
<gl-dropdown-item
v-for=
"sortBy in sortOptions"
v-for=
"sortBy in sortOptions"
:key=
"sortBy.id"
:key=
"sortBy.id"
...
@@ -245,6 +245,7 @@ export default {
...
@@ -245,6 +245,7 @@ export default {
v-gl-tooltip
v-gl-tooltip
:title=
"sortDirectionTooltip"
:title=
"sortDirectionTooltip"
:icon=
"sortDirectionIcon"
:icon=
"sortDirectionIcon"
class=
"flex-shrink-1"
@
click=
"handleSortDirectionClick"
@
click=
"handleSortDirectionClick"
/>
/>
</gl-button-group>
</gl-button-group>
...
...
app/assets/stylesheets/framework/filters.scss
View file @
7acd9c41
...
@@ -449,3 +449,17 @@
...
@@ -449,3 +449,17 @@
font-size
:
13px
;
font-size
:
13px
;
}
}
}
}
.vue-filtered-search-bar-container
{
@include
media-breakpoint-up
(
md
)
{
.sort-dropdown-container
{
margin-left
:
10px
;
}
}
@include
media-breakpoint-down
(
sm
)
{
.sort-dropdown-container
{
margin-top
:
10px
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment