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
4cf5facb
Commit
4cf5facb
authored
Oct 15, 2020
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Swimlanes - Fix mobile view of filtering bar
Adjust margins around dropdowns
parent
ddeb7429
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
12 deletions
+34
-12
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+23
-6
changelogs/unreleased/238931-improve-responsive-state-of-board-filtering-bar-when-group-by-drop.yml
...nsive-state-of-board-filtering-bar-when-group-by-drop.yml
+5
-0
ee/app/assets/javascripts/boards/components/toggle_epics_swimlanes.vue
.../javascripts/boards/components/toggle_epics_swimlanes.vue
+4
-4
ee/spec/frontend/boards/components/toggle_epics_swimlanes_spec.js
...frontend/boards/components/toggle_epics_swimlanes_spec.js
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/assets/stylesheets/framework/filters.scss
View file @
4cf5facb
...
...
@@ -355,28 +355,45 @@
background-color
:
$white
;
}
.boards-switcher
{
margin
:
0
0
10px
;
.filtered-search-block
.boards-switcher
{
@include
gl-mr-0
;
margin-bottom
:
$gl-input-padding
;
.boards-selector-wrapper
,
.dropdown
{
display
:
block
;
@include
gl-display-
block
;
}
}
.filter-dropdown-container
{
>
div
{
margin
:
0
;
@include
gl-m-
0
;
>
.btn
{
margin
:
0
0
10px
;
width
:
100%
;
margin
:
0
0
$gl-input-padding
;
@include
gl-w-full
;
}
}
.board-labels-toggle-wrapper
{
margin-bottom
:
$gl-input-padding
;
}
.board-swimlanes-toggle-wrapper
{
@include
gl-h-auto
;
margin-bottom
:
$gl-input-padding
;
>
span
,
>
.dropdown
,
.gl-dropdown-toggle
{
@include
gl-w-full
;
@include
gl-m-0
;
}
>
.dropdown
{
@include
gl-mt-2
;
}
}
}
.boards-add-list
>
.btn
{
...
...
changelogs/unreleased/238931-improve-responsive-state-of-board-filtering-bar-when-group-by-drop.yml
0 → 100644
View file @
4cf5facb
---
title
:
Fix mobile view of filtering bar
merge_request
:
45226
author
:
type
:
fixed
ee/app/assets/javascripts/boards/components/toggle_epics_swimlanes.vue
View file @
4cf5facb
...
...
@@ -50,19 +50,19 @@ export default {
<
template
>
<div
class=
"board-swimlanes-toggle-wrapper gl-display-flex gl-align-items-center gl-ml-3"
class=
"board-swimlanes-toggle-wrapper gl-display-
md-
flex gl-align-items-center gl-ml-3"
data-testid=
"toggle-swimlanes"
>
<span
class=
"board-swimlanes-toggle-text gl-white-space-nowrap"
class=
"board-swimlanes-toggle-text gl-white-space-nowrap
gl-font-weight-bold
"
data-testid=
"toggle-swimlanes-label"
>
{{
__
(
'
Group by
:
'
)
}}
{{
__
(
'
Group by
'
)
}}
</span>
<gl-dropdown
right
:text=
"dropdownLabel"
toggle-class=
"gl-ml-
2
gl-border-none gl-inset-border-1-gray-200! border-radius-default"
toggle-class=
"gl-ml-
3
gl-border-none gl-inset-border-1-gray-200! border-radius-default"
>
<gl-dropdown-item
:is-check-item=
"true"
...
...
ee/spec/frontend/boards/components/toggle_epics_swimlanes_spec.js
View file @
4cf5facb
...
...
@@ -41,7 +41,7 @@ describe('ToggleEpicsSwimlanes', () => {
});
it
(
'
renders "Group by" label
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
[data-testid="toggle-swimlanes-label"]
'
).
text
()).
toEqual
(
'
Group by
:
'
);
expect
(
wrapper
.
find
(
'
[data-testid="toggle-swimlanes-label"]
'
).
text
()).
toEqual
(
'
Group by
'
);
});
it
(
'
renders dropdown with 2 options
'
,
()
=>
{
...
...
locale/gitlab.pot
View file @
4cf5facb
...
...
@@ -12696,7 +12696,7 @@ msgstr ""
msgid "Group avatar"
msgstr ""
msgid "Group by
:
"
msgid "Group by"
msgstr ""
msgid "Group description"
...
...
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