summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-08-26 19:51:26 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-08-26 19:51:26 +0000
commit0e3c7b2f2a5742216eda2d2cf6df9a5ea5f866ff (patch)
treea624c351472d567ef6289f3f17f8861f65aa76d9
parentaf3cc3837856e86815cb1d774b831fa7abaa8795 (diff)
parentcfb77171bd16f20902265456178dc92527e82adf (diff)
downloadgitlab-ce-0e3c7b2f2a5742216eda2d2cf6df9a5ea5f866ff.tar.gz
Merge branch '21099-ie-fork-btn' into 'master'
Fix enormous IE11 fork button ## What does this MR do? Puts a width on btn SVGs because IE can't handle `auto` ## What are the relevant issue numbers? Closes #21099 See merge request !5982
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/framework/buttons.scss2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 16c4b7cb858..7817470d95e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 8.11.3 (unreleased)
- Allow system info page to handle case where info is unavailable
- Label list shows all issues (opened or closed) with that label
- Don't show resolve conflicts link before MR status is updated
+ - Fix IE11 fork button bug !598
- Don't prevent viewing the MR when git refs for conflicts can't be found on disk
- Fix external issue tracker "Issues" link leading to 404s
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 6c3786b49bb..cd3ddf5fee9 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -200,7 +200,7 @@
svg {
height: 15px;
- width: auto;
+ width: 15px;
position: relative;
top: 2px;
}