diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-09 06:10:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-09 06:10:21 +0300 |
commit | b3105472e25eafa9ac48f926f20ad95ccfd44086 (patch) | |
tree | 65d89ecfa1281cad20fb7eed4d133f1729144083 /app/assets | |
parent | 3f8e9ba69efda3ef8f3989c5c4d56e422367200a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/wiki.scss | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 0eecf7bddc1..04799a6b8f8 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -601,6 +601,7 @@ .gutter-toggle { width: 100%; height: $sidebar-toggle-height; + margin-top: 0; margin-left: 0; border-bottom: 1px solid $border-color; border-radius: 0; diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss index ed2c7662a98..2c47c01b89a 100644 --- a/app/assets/stylesheets/page_bundles/wiki.scss +++ b/app/assets/stylesheets/page_bundles/wiki.scss @@ -150,10 +150,6 @@ .wiki-sidebar-header { padding: 0 $gl-padding $gl-padding; - - .gutter-toggle { - margin-top: 0; - } } } |