summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/search.scss
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-06-09 14:40:14 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-06-09 14:40:14 +0530
commit1779d68bfe2872c36f475798c5e1b82678f3225d (patch)
tree8be5c6e486c1aa769ad95160219fe7f47ab1a57d /app/assets/stylesheets/pages/search.scss
parent1f5ecf916ee7b1d34fbf8775890b2aada2055384 (diff)
parent3d72cb897efddc14021afe8b064aa2bff14c7c15 (diff)
downloadgitlab-ce-1779d68bfe2872c36f475798c5e1b82678f3225d.tar.gz
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'app/assets/stylesheets/pages/search.scss')
-rw-r--r--app/assets/stylesheets/pages/search.scss2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 037ad520545..ae524cd6bae 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -158,13 +158,11 @@
.search-holder {
@media (min-width: $screen-sm-min) {
display: -webkit-flex;
- display: -ms-flexbox;
display: flex;
}
.search-field-holder {
-webkit-flex: 1 0 auto;
- -ms-flex: 1 0 auto;
flex: 1 0 auto;
position: relative;
margin-right: 0;