diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-26 19:51:26 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-26 15:43:42 -0500 |
| commit | 63a485a9ead2d2ef45a50a23d575bd4b6f57d896 (patch) | |
| tree | 0ac7730f66766673f7ad12fc1553f91453a9c79a | |
| parent | 5062826922dd636889ce216909f9120c96b7ceb7 (diff) | |
| download | gitlab-ce-63a485a9ead2d2ef45a50a23d575bd4b6f57d896.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-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index cb8204393d2..08168d122e9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.11.3 (unreleased) - 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 - Allow system info page to handle case where info is unavailable - 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 f1fe1697d30..5a08a92f81e 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; } |