summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-12 17:13:47 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-12 17:13:47 +0000
commita5cb6b0b83477e2722432cd21974e9a7d42a62e5 (patch)
treeec219ce3b9cad14f2c8ba81afc204d04ae000bca
parentfa0de68cd88bfa765540bbe1cc583ef906c5a9a6 (diff)
parent24f18c8e52b55c96f20dbe0b3b9a9c74baff7813 (diff)
downloadgitlab-ce-a5cb6b0b83477e2722432cd21974e9a7d42a62e5.tar.gz
Merge branch 'admin-pages-layout-sass-update' into 'master'
Updated media query for admin/groups search box @jschatz1 based on your comment https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3523#note_4632743 See merge request !3599
-rw-r--r--app/assets/stylesheets/framework/nav.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 94f5a12ff6a..192d53b048a 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -58,12 +58,12 @@
.nav-search {
display: inline-block;
- width: 50%;
+ width: 100%;
padding: 11px 0;
/* Small devices (phones, tablets, 768px and lower) */
- @media (max-width: $screen-sm-min) {
- width: 100%;
+ @media (min-width: $screen-sm-min) {
+ width: 50%;
}
}