summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-01-22 23:48:15 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-01-24 20:20:03 -0500
commita80d55b766d84c488bbfc9b4e0c5330fc618d74e (patch)
treee54b3432f0b13ed092d93ca27420d915c7eb056c
parentc10705c59fa25adf6d7bfb48abf5e60f0b5bbf68 (diff)
downloadgitlab-ce-top-search-colors-and-element-position-is-not-like-in-design.tar.gz
Only top search is gray.
-rw-r--r--app/assets/stylesheets/framework/forms.scss10
-rw-r--r--app/assets/stylesheets/framework/tw_bootstrap_variables.scss6
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index d4d1d7a700a..d097e4d32f7 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -3,11 +3,15 @@ textarea {
}
input {
- border-radius: 3px;
+ border-radius: $border-radius-base;
+}
+
+input[type='search'] {
+ background-color: white;
+ padding-left: 10px;
}
-input[type='search'],
-input[type='search'].search-text-input {
+input[type='search'].search-input {
background-repeat: no-repeat;
background-position: 10px;
background-size: 16px;
diff --git a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
index 798cd224ad0..33270388e64 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
@@ -22,9 +22,9 @@ $brand-info: $gl-info;
$brand-warning: $gl-warning;
$brand-danger: $gl-danger;
-$border-radius-base: 2px !default;
-$border-radius-large: 2px !default;
-$border-radius-small: 2px !default;
+$border-radius-base: 3px !default;
+$border-radius-large: 3px !default;
+$border-radius-small: 3px !default;
//== Scaffolding