1 files changed, 20 insertions, 13 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 2ec7c891197..7b8d9281148 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -34,11 +34,7 @@
   --mr-review-bar-height: #{$mr-review-bar-height};
 }
 
-@include media-breakpoint-up(md) {
-  .page-with-contextual-sidebar {
-    --application-bar-left: #{$contextual-sidebar-collapsed-width};
-  }
-
+@include media-breakpoint-up(sm) {
   .right-sidebar-collapsed {
     --application-bar-right: #{$right-sidebar-collapsed-width};
 
@@ -52,6 +48,12 @@
   }
 }
 
+@include media-breakpoint-up(md) {
+  .page-with-contextual-sidebar {
+    --application-bar-left: #{$contextual-sidebar-collapsed-width};
+  }
+}
+
 @include media-breakpoint-up(xl) {
   .page-with-contextual-sidebar {
     --application-bar-left: #{$contextual-sidebar-width};
@@ -330,14 +332,6 @@ li.note {
   height: 220px;
 }
 
-.footer-links {
-  margin-bottom: 20px;
-
-  a {
-    margin-right: 15px;
-  }
-}
-
 .card.card-body {
   margin-bottom: $gl-padding;
 
@@ -555,3 +549,16 @@ li.note {
 See https://gitlab.com/gitlab-org/gitlab/issues/36857 for more details.
 **/
 .gl-line-height-14 { line-height: $gl-line-height-14; }
+
+// TODO: To be removed once `split` option for new dropdowns is implemented.
+//  See issue at https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2263
+.gl-new-dropdown.split:nth-child(n+2) {
+  .gl-new-dropdown-toggle {
+    margin-left: 1px;
+
+    &.btn-tertiary,
+    &.disabled {
+      margin-left: -1px;
+    }
+  }
+}