summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-20 20:00:12 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-03-21 17:37:41 +0800
commitafe0f9007cf0864e0da76e0b400a56fc95fadb40 (patch)
tree4b7814486be5482fb05b20c424fa04835215c438
parent88fb39afdda99f01a1fdb322e691f890f4dc8d71 (diff)
downloadgitlab-ce-afe0f9007cf0864e0da76e0b400a56fc95fadb40.tar.gz
Merge branch 'fix-input-token-spacing' into 'master'
Fix input token spacing See merge request !10090
-rw-r--r--app/assets/stylesheets/framework/filters.scss10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index de67c138aab..8c600547a4a 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -76,12 +76,14 @@
}
.input-token {
- flex: 1;
- -webkit-flex: 1;
+ max-width: 200px;
}
- .filtered-search-token + .input-token:not(:last-child) {
- max-width: 200px;
+ .input-token:only-child,
+ .input-token:last-child {
+ flex: 1;
+ -webkit-flex: 1;
+ max-width: initial;
}
}