diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-14 19:47:53 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-15 12:24:15 -0500 |
| commit | 0556d661e0027068aa7bee45a5c61017344505f3 (patch) | |
| tree | 7c308625161bb95292fb58190c94594e66eea525 /app/assets/stylesheets | |
| parent | 88ddce257d90114c3981c5c07d621331a683bd05 (diff) | |
| download | gitlab-ce-0556d661e0027068aa7bee45a5c61017344505f3.tar.gz | |
Fix Label dropdown and organize code
# Conflicts:
# app/assets/javascripts/labels_select.js.coffee
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index ba6c7930cdc..719703b1afa 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -320,7 +320,7 @@ } } -.dropdown-input-field { +.dropdown-input-field, .default-dropdown-input { width: 100%; padding: 0 7px; color: $dropdown-input-color; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 6bd90a23620..152b60d1e85 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -248,6 +248,10 @@ background: $gray-dark; border: 1px solid $border-gray-dark; } + + &.btn-primary { + @extend .btn-primary + } } a:not(.btn) { |