summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-12 17:59:54 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-12 17:59:54 +0000
commitbf62539239f142abd66255967a49a82921c331eb (patch)
tree596bd4b69682a00fc7aeff755539f9123189164b
parentd293b55a039bf6406ca5063d68a73f3b4aa243cd (diff)
parent8fd930548f57c0fdc8ae1597622f5c088939c96e (diff)
downloadgitlab-ce-bf62539239f142abd66255967a49a82921c331eb.tar.gz
Merge branch '24202-header-ui-improvements' into 'master'
Improvements to hover/active/focus states in header items ## What does this MR do? Adds some improvements to buttons, dropdowns, inputs, etc. in the header area. ## Are there points in the code the reviewer needs to double check? I'm not sure. ## Why was this MR needed? Requested in an issue. ## Screenshots (if relevant) ![caret](/uploads/574135282e4b2e81476fdd6dd6c1c05d/caret.gif)![hover](/uploads/15a3b8a2aa89baf20270be97c452e006/hover.gif) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24202 This is not complete yet. I'm new to this, so please let me know what all steps do I need to do (tests, changelog, etc.). See merge request !7412
-rw-r--r--app/assets/stylesheets/framework/header.scss5
-rw-r--r--app/assets/stylesheets/pages/search.scss7
2 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 5a34132112a..7f226b7920d 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -63,6 +63,7 @@ header {
&:focus,
&:active {
background-color: $background-color;
+ color: darken($gl-icon-color, 50%);
}
.fa-caret-down {
@@ -191,6 +192,10 @@ header {
font-size: 10px;
text-align: center;
cursor: pointer;
+
+ &:hover {
+ color: darken($color: $gl-text-color, $amount: 50%);
+ }
}
.project-item-select {
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index b4761df3f23..a0108bba6d9 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -21,6 +21,11 @@
padding: 4px;
width: $search-input-width;
line-height: 24px;
+
+ &:hover {
+ border-color: lighten($dropdown-input-focus-border, 20%);
+ box-shadow: 0 0 4px lighten($search-input-focus-shadow-color, 20%);
+ }
}
.location-text {
@@ -153,6 +158,7 @@
width: 68%;
}
}
+
}
.search-holder {
@@ -229,4 +235,5 @@
&:focus {
color: $gl-link-color;
}
+
}