diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
| commit | ed7065bbdb6f6fad3cc8fb369267fa811767c8a5 (patch) | |
| tree | b3fda377c51504a6d21da1742cac3de7fd668ef0 /app/assets/stylesheets/framework/variables.scss | |
| parent | 26c7d04cd06d1126e4a4a7a1c9308d12de77172e (diff) | |
| parent | 094d740886eaf62fd219dacd11aa9a966758a962 (diff) | |
| download | gitlab-ce-ed7065bbdb6f6fad3cc8fb369267fa811767c8a5.tar.gz | |
Merge branch 'master' into 56937-edit-knative-domain-after-it-has-been-deployed56937-edit-knative-domain-after-it-has-been-deployed
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 96dab609a13..dc1a73ed923 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -251,7 +251,7 @@ $gl-padding-top: 10px; $gl-sidebar-padding: 22px; $gl-bar-padding: 3px; $input-horizontal-padding: 12px; -$browserScrollbarSize: 10px; +$browser-scrollbar-size: 10px; /* * Misc @@ -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 |