diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-07 11:26:35 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-10 08:35:46 +0000 |
| commit | 8651137a4fb616441b2d30229f724d1fd0d48bc5 (patch) | |
| tree | 772e710031683e1436791e5db475d3b3563e7790 /app | |
| parent | c6f516626d1cac6947a298a89594be6e486a50a2 (diff) | |
| download | gitlab-ce-8651137a4fb616441b2d30229f724d1fd0d48bc5.tar.gz | |
Dropdown variables
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 5 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 2e847a345fe..dbf11316811 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -187,13 +187,13 @@ position: absolute; top: -1px; padding: 0; - color: #BFBFBF; + color: $dropdown-title-btn-color; font-size: 14px; border: 0; background: none; &:hover { - color: darken(#BFBFBF, 15%); + color: darken($dropdown-title-btn-color, 15%); } } @@ -222,7 +222,7 @@ .dropdown-input-field { width: 100%; padding: 0 7px; - color: #C7C7C7; + color: $dropdown-input-color; line-height: 30px; border: 1px solid $dropdown-divider-color; border-radius: 2px; @@ -230,8 +230,8 @@ &:focus { color: $dropdown-link-color; - border-color: rgb(58, 171, 240); - box-shadow: 0 0 4px rgba(#000, .2); + border-color: $dropdown-input-focus-border; + box-shadow: 0 0 4px $dropdown-input-focus-shadow; + .fa { color: $dropdown-link-color; @@ -265,7 +265,7 @@ left: 0; display: none; z-index: 9; - background-color: rgba(#fff, .6); + background-color: $dropdown-loading-bg; font-size: 28px; .fa { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index cc84a5ff932..aad7ca1a396 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -138,3 +138,8 @@ $dropdown-shadow-color: rgba(#000, .1); $dropdown-divider-color: rgba(#000, .1); $dropdown-header-color: #959494; $dropdown-caret-color: #54565B; +$dropdown-title-btn-color: #BFBFBF; +$dropdown-input-color: #C7C7C7; +$dropdown-input-focus-border: rgb(58, 171, 240); +$dropdown-input-focus-shadow: rgba(#000, .2); +$dropdown-loading-bg: rgba(#fff, .6); diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 1ec3b0e4853..97a27e373ed 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -353,7 +353,7 @@ .example %div - .dropdown.inline.open + .dropdown.inline %button.dropdown-toggle.btn{type: 'button', data: {toggle: 'dropdown'}} Dropdown page 2 %b.caret |