Commit 3109623d authored by Phil Hughes's avatar Phil Hughes

Merge branch '34921-global-dropdown-ui-improvement' into 'master'

Global nav (9.0) UI improvement

Closes #34921

See merge request !12772
parents ba81e6de cc25e2ba
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
padding: 5px 8px; padding: 5px 8px;
color: $gl-text-color; color: $gl-text-color;
line-height: initial; line-height: initial;
text-overflow: ellipsis;
border-radius: 2px; border-radius: 2px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
...@@ -203,11 +202,6 @@ ...@@ -203,11 +202,6 @@
border-radius: $border-radius-base; border-radius: $border-radius-base;
box-shadow: 0 2px 4px $dropdown-shadow-color; box-shadow: 0 2px 4px $dropdown-shadow-color;
@media (max-width: $screen-sm-min) {
width: 100%;
min-width: 180px;
}
&.dropdown-open-left { &.dropdown-open-left {
right: 0; right: 0;
left: auto; left: auto;
...@@ -289,6 +283,11 @@ ...@@ -289,6 +283,11 @@
padding: 5px 8px; padding: 5px 8px;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
.badge + span:not(.badge) {
// Expects up to 3 digits on the badge
margin-right: 40px;
}
} }
.droplab-dropdown { .droplab-dropdown {
...@@ -373,7 +372,6 @@ ...@@ -373,7 +372,6 @@
.dropdown-menu, .dropdown-menu,
.dropdown-menu-nav { .dropdown-menu-nav {
max-width: 280px; max-width: 280px;
width: auto;
} }
} }
......
...@@ -393,7 +393,8 @@ ...@@ -393,7 +393,8 @@
@media (max-width: $screen-xs) { @media (max-width: $screen-xs) {
.filter-dropdown-container { .filter-dropdown-container {
.dropdown-toggle, .dropdown-toggle,
.dropdown { .dropdown,
.dropdown-menu {
width: 100%; width: 100%;
} }
......
...@@ -707,6 +707,7 @@ pre.light-well { ...@@ -707,6 +707,7 @@ pre.light-well {
background-color: transparent; background-color: transparent;
border: 0; border: 0;
text-align: left; text-align: left;
text-overflow: ellipsis;
} }
.protected-branches-list, .protected-branches-list,
......
---
title: Improve CSS for global nav dropdown UI
merge_request: 12772
author: Takuya Noguchi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment