summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-03-24 13:54:26 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-03-24 13:54:26 -0500
commitebd329fe4cddbea0e8c5e9b0080291a2248a690c (patch)
tree6ebc20a7e3de4ce8b0508bb818650b7abd408720
parent4d8c5828bfa639961d3f9a01a0bd1d7a0e041785 (diff)
downloadgitlab-ce-ebd329fe4cddbea0e8c5e9b0080291a2248a690c.tar.gz
Make form width the same as dropdown width
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
-rw-r--r--app/assets/stylesheets/pages/search.scss2
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 2d616fc660c..8caadda2852 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -189,7 +189,7 @@
}
.dropdown-select {
- width: 300px;
+ width: $dropdown-width;
}
.dropdown-menu-align-right {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index e5e0f9ce0a4..15c2d02f4ac 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -166,6 +166,7 @@ $regular_font: 'Source Sans Pro', "Helvetica Neue", Helvetica, Arial, sans-serif
/*
* Dropdowns
*/
+$dropdown-width: 300px;
$dropdown-bg: #fff;
$dropdown-link-color: #555;
$dropdown-link-hover-bg: $row-hover;
@@ -197,6 +198,7 @@ $award-emoji-new-btn-icon-color: #dcdcdc;
/*
* Search Box
*/
+$search-input-width: $dropdown-width;
$location-badge-color: #aaa;
$location-badge-bg: $gray-normal;
$location-icon-color: #e7e9ed;
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 6726aa883f5..e41be4d502a 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -30,7 +30,7 @@
@extend .form-control;
margin: 0;
padding: 4px;
- width: 350px;
+ width: $search-input-width;
line-height: 24px;
}