diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 22:50:02 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-16 03:59:26 +0300 |
| commit | 85f254cec18667b08d28b0eb808af46dc3049d4b (patch) | |
| tree | 7b7d4f604975cb31eb3df20d87302d79bdff147c /app/assets/stylesheets/framework | |
| parent | 7580597cf36c32f5e063cd3545f2f7c861ac723e (diff) | |
Merge branch 'issue_18575' into 'master'
Improve usability for prioritized labels
## What does this MR do?
- Adds an icon next to prioritized label rows serving as a hint to the user that the labels can be sorted by dragging them.
- Adds description about prioritized labels.
- Restores empty message when removing all prioritized labels.
## Screenshots (if relevant)
Closes #18575
See merge request !4652
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index b34ec16cdba..a12c0bba44a 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -159,7 +159,7 @@ ul.content-list { background-color: $gray-light; border: dotted 1px $gray-dark; margin: 1px 0; - min-height: 30px; + min-height: 52px; } } } diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 282fffcf986..a8f00e46502 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -242,6 +242,12 @@ } } } + + &.adjust { + .nav-text, .nav-controls { + width: auto; + } + } } .layout-nav { |