diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-29 14:22:00 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-05-30 08:08:54 -0500 |
| commit | 32bc1d83e468221815b0b11228484c961425c21a (patch) | |
| tree | 0dad77a18ea454fe39edf7a4432ec3ac62b41650 | |
| parent | 96329067edbaabd06a662a6d1c25a25d2e9dc6d6 (diff) | |
| download | gitlab-ce-61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture.tar.gz | |
Increase chat bubble size and move mixin61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 2311f6748ce..97a763671ba 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -5,7 +5,8 @@ font-size: 12px; color: $blue-500; border: 1px solid $blue-500; - @include code-icon-size(); + width: 24px; + height: 24px; &:hover, &.inverted { diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 02dd07cfee6..fc488b85138 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -151,11 +151,6 @@ table { } } -@mixin code-icon-size() { - width: $gl-font-size * $code-line-height * 0.9; - height: $gl-font-size * $code-line-height * 0.9; -} - .loading { margin: 20px auto; height: 40px; diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 18671f7c4d8..df40149f0a6 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -385,3 +385,8 @@ height: $size; margin-right: $margin-right; } + +@mixin code-icon-size() { + width: $gl-font-size * $code-line-height * 0.9; + height: $gl-font-size * $code-line-height * 0.9; +} diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 7b2ddb9f95a..32477c20db6 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -743,7 +743,7 @@ $note-form-margin-left: 72px; .add-diff-note { @include btn-comment-icon; opacity: 0; - margin-left: -50px; + margin-left: -52px; position: absolute; top: 50%; transform: translateY(-50%); |