diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-04 15:30:03 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-04 15:30:03 +0100 |
commit | 3569b2e2d715ffeecf27e26cf3d8c9ec08b8ad49 (patch) | |
tree | 2c3ccbe19c476d543956a72d8a63cfbae5aa4bae /app/assets/stylesheets/framework/dropdowns.scss | |
parent | f0248fa8c0620eb70e70b8ccdcff89ee7797ac4f (diff) | |
parent | ebbbc7ef52fbd1d3339e2e21be967d313a074a28 (diff) | |
download | gitlab-ce-3569b2e2d715ffeecf27e26cf3d8c9ec08b8ad49.tar.gz |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/assets/stylesheets/framework/dropdowns.scss')
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index df8d7c431d3..12fc3867c32 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -189,11 +189,11 @@ width: auto; top: 100%; left: 0; - z-index: 9; + z-index: 200; min-width: 240px; max-width: 500px; margin-top: 2px; - margin-bottom: 0; + margin-bottom: 2px; font-size: 14px; font-weight: $gl-font-weight-normal; padding: 8px 0; @@ -368,6 +368,10 @@ transform: translateY(0); } +.comment-type-dropdown.open .dropdown-menu { + display: block; +} + .filtered-search-box-input-container { .dropdown-menu, .dropdown-menu-nav { @@ -618,6 +622,11 @@ border-top: 1px solid $dropdown-divider-color; } +.dropdown-footer-content { + padding-left: 10px; + padding-right: 10px; +} + .dropdown-due-date-footer { padding-top: 0; margin-left: 10px; @@ -729,6 +738,7 @@ #{$selector}.dropdown-menu, #{$selector}.dropdown-menu-nav { li { + display: block; padding: 0 1px; &:hover { @@ -748,13 +758,17 @@ } a, - button { + button, + .menu-item { border-radius: 0; + box-shadow: none; padding: 8px 16px; + text-align: left; + width: 100%; // make sure the text color is not overriden &.text-danger { - @extend .text-danger; + // @extend .text-danger; } &.is-focused, @@ -796,8 +810,16 @@ #{$selector}.dropdown-menu-align-right { margin-top: 2px; } -} -.breadcrumbs-list { - @include new-style-dropdown; + .open { + #{$selector}.dropdown-menu, + #{$selector}.dropdown-menu-nav { + @media (max-width: $screen-xs-max) { + max-width: 100%; + } + } + } } + +@include new-style-dropdown('.breadcrumbs-list .dropdown '); +@include new-style-dropdown('.js-namespace-select + '); |