diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-31 11:50:00 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-31 11:50:00 -0500 |
| commit | ccc929d75d1f34accc4c7a6604c26cac6113a18c (patch) | |
| tree | 2dbcbfde47a7b237ed109067de9de3aa0d05c64a | |
| parent | c3875b5f7517e5d170f3028f98490c22d6eac872 (diff) | |
| download | gitlab-ce-ccc929d75d1f34accc4c7a6604c26cac6113a18c.tar.gz | |
CSS tweaks
- Use colors according to design
- Fix search input' width
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index bb49ae396c7..b86dbcb04b6 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -199,11 +199,11 @@ $award-emoji-new-btn-icon-color: #dcdcdc; /* * Search Box */ -$search-input-border-color: $dropdown-input-focus-border; +$search-input-border-color: rgba(#4688f1, .8); $search-input-focus-shadow-color: $dropdown-input-focus-shadow; -$search-input-width: $dropdown-width; +$search-input-width: 244px; $location-badge-color: #aaa; $location-badge-bg: $gray-normal; +$location-badge-active-bg: #4f91f8; $location-icon-color: #e7e9ed; -$location-active-color: $gl-text-color; -$location-active-bg: $search-input-border-color; +$location-icon-active-color: #807e7e; diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 3c74d25beb0..9274796233b 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -135,13 +135,13 @@ .location-badge { @include transition(all .15s); - background-color: $location-active-bg; + background-color: $location-badge-active-bg; color: $white-light; } .search-input-wrap { i { - color: $location-active-color; + color: $location-icon-active-color; } } |