diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-06 21:26:56 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-06 21:26:56 +0000 |
commit | b6d5fcd4775718676f1a11ddb6a88a08c67c9d0a (patch) | |
tree | 33c699336648b74b430d2f00b6d5bf6e9e3f6c66 /app/assets/stylesheets/pages | |
parent | fe132f52e862abd6e4cfcabaefed61ac080f3cab (diff) | |
parent | d1ad639010ecb8619db08f412babc6fb9e23458e (diff) | |
download | gitlab-ce-b6d5fcd4775718676f1a11ddb6a88a08c67c9d0a.tar.gz |
Merge branch 'issue_14800' into 'master'
Search Design fixes
Closes #14800
- Use colors according to design
- Fix width of search input
![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)
![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)
See merge request !3475
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/search.scss | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 3c74d25beb0..f0f3744c6fa 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -135,25 +135,25 @@ .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; } } + } - &.has-location-badge { - .search-icon { - display: none; - } + &.has-value { + .search-icon { + display: none; + } - .clear-icon { - cursor: pointer; - display: block; - } + .clear-icon { + cursor: pointer; + display: block; } } |