summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-20 20:00:12 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-20 20:00:12 +0000
commit0ebf97b015a9f011e7c3e3b9303bd2799b2b427d (patch)
treed6b4085de44506b57db751eb10ac4e7729ade073
parentd8138385b0d42b4e4ca1684bc6acb50586b9db46 (diff)
parent970541e0330bce5fea9fa9af4cb26141b455a757 (diff)
downloadgitlab-ce-0ebf97b015a9f011e7c3e3b9303bd2799b2b427d.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 569a4c651cc..6bdaa7cdd6f 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;
}
}