diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-15 18:13:31 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-15 18:13:31 +0300 |
| commit | 32c91331d83dae2f98486ebc31d57b43d844f60e (patch) | |
| tree | c54e18ee948690acc10cb3bedc27812f4e22fc37 /app/assets | |
| parent | 6d34ce73a62f2b108e3fc59d56ce7065e7762eab (diff) | |
| parent | 37a290033833ed5c83ae583b41517295685c5f1e (diff) | |
Merge branch '50433-make-emoji-picker-bigger' into 'master'
Resolve "Make emoji picker bigger"
Closes #50433
See merge request gitlab-org/gitlab-ce!25187
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index ad650d45314..fd4fb16b941 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -15,7 +15,7 @@ margin-top: 3px; padding: $gl-padding; z-index: 300; - width: 300px; + width: $award-emoji-width; font-size: 14px; background-color: $white-light; border: 1px solid $border-white-light; @@ -55,6 +55,10 @@ transform: none; } } + + @include media-breakpoint-down(xs) { + width: $award-emoji-width-xs; + } } .emoji-search { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 530b1154550..dc1a73ed923 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -405,6 +405,8 @@ $status-icon-size: 22px; $award-emoji-menu-shadow: rgba(0, 0, 0, 0.175); $award-emoji-positive-add-bg: #fed159; $award-emoji-positive-add-lines: #bb9c13; +$award-emoji-width: 376px; +$award-emoji-width-xs: 300px; /* * Search Box |