summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-04-05 12:26:51 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-04-05 13:14:45 -0500
commitcc0fc4a9247db8cf1acf943f61d5e1a98ceb1481 (patch)
treedba4cc640e641c0993f817885d2249b7488fdbec
parent0912fd8ad203fce9f0d4a61b2dd24f1f34c5474e (diff)
downloadgitlab-ce-cc0fc4a9247db8cf1acf943f61d5e1a98ceb1481.tar.gz
Fix button text wrapping to next line60116-fix-button-wrapping
Bootstrap removed white-space nowrap from buttons in v4.2.1, causing at least one bug, so this commit re-adds that style to all buttons
-rw-r--r--app/assets/stylesheets/framework/buttons.scss1
-rw-r--r--changelogs/unreleased/60116-fix-button-wrapping.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 695ce014659..ab8f397f3a0 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -139,6 +139,7 @@
@include btn-white;
color: $gl-text-color;
+ white-space: nowrap;
&:focus:active {
outline: 0;
diff --git a/changelogs/unreleased/60116-fix-button-wrapping.yml b/changelogs/unreleased/60116-fix-button-wrapping.yml
new file mode 100644
index 00000000000..d6df920b51d
--- /dev/null
+++ b/changelogs/unreleased/60116-fix-button-wrapping.yml
@@ -0,0 +1,5 @@
+---
+title: Add to white-space nowrap to all buttons
+merge_request: 27069
+author:
+type: fixed