diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-28 12:08:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-28 12:08:10 +0000 |
| commit | a83a97f60432c6c352af80d55339e9fe45b63307 (patch) | |
| tree | 40a0ef7fb93580a5ef4b5417c27efab9b2d13b72 /app/assets/stylesheets | |
| parent | 4c788f43cbcd70bcceb4e40891d329952aa016d0 (diff) | |
| download | gitlab-ce-a83a97f60432c6c352af80d55339e9fe45b63307.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 1b35f7ac93b..bf474251572 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -405,7 +405,6 @@ img.emoji { .prepend-top-20 { margin-top: 20px; } .prepend-top-32 { margin-top: 32px; } .prepend-left-5 { margin-left: 5px; } -.prepend-left-8 { margin-left: 8px; } .prepend-left-10 { margin-left: 10px; } .prepend-left-15 { margin-left: 15px; } .prepend-left-default { margin-left: $gl-padding; } diff --git a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss index 10f0a6aa089..2b82b2226c6 100644 --- a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss +++ b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss @@ -221,7 +221,7 @@ } @function calc-btn-hover-padding($original-padding, $original-border: 1px) { - @return calc(#{$original-padding + $original-border} - var(--ide-btn-hover-border-width, $original-border)); + @return calc(#{$original-padding + $original-border} - var(--ide-btn-hover-border-width, #{$original-border})); } .btn:not(.btn-link):not([disabled]):hover { |