Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 14 deletions

diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 093c625d7bc..631c8c56ad5 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -146,13 +146,12 @@
 }
 
 @mixin top-level-item {
+  @include gl-h-7;
   @include gl-px-4;
-  @include gl-py-3;
   @include gl-display-flex;
   @include gl-align-items-center;
   @include gl-rounded-base;
   @include gl-w-auto;
-  @include gl-line-height-normal;
   transition: none;
   margin: $sidebar-top-item-tb-margin $sidebar-top-item-lr-margin;
 
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index c7e55289b11..ef39a4c31e8 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -1136,15 +1136,13 @@ kbd {
 }
 .nav-sidebar li > a,
 .nav-sidebar li > .fly-out-top-item-container {
+  height: 2rem;
   padding-left: 0.75rem;
   padding-right: 0.75rem;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
   display: flex;
   align-items: center;
   border-radius: 0.25rem;
   width: auto;
-  line-height: 1rem;
   margin: 1px 8px;
 }
 .nav-sidebar li.active > a {
@@ -1373,15 +1371,13 @@ kbd {
   margin-top: 0.25rem;
 }
 .nav-sidebar-inner-scroll > div.context-header a {
+  height: 2rem;
   padding-left: 0.75rem;
   padding-right: 0.75rem;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
   display: flex;
   align-items: center;
   border-radius: 0.25rem;
   width: auto;
-  line-height: 1rem;
   margin: 1px 8px;
   padding: 0.25rem;
   margin-bottom: 0.25rem;
diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss
index f24b6fb9e81..85512e04808 100644
--- a/app/assets/stylesheets/startup/startup-general.scss
+++ b/app/assets/stylesheets/startup/startup-general.scss
@@ -1136,15 +1136,13 @@ kbd {
 }
 .nav-sidebar li > a,
 .nav-sidebar li > .fly-out-top-item-container {
+  height: 2rem;
   padding-left: 0.75rem;
   padding-right: 0.75rem;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
   display: flex;
   align-items: center;
   border-radius: 0.25rem;
   width: auto;
-  line-height: 1rem;
   margin: 1px 8px;
 }
 .nav-sidebar li.active > a {
@@ -1373,15 +1371,13 @@ kbd {
   margin-top: 0.25rem;
 }
 .nav-sidebar-inner-scroll > div.context-header a {
+  height: 2rem;
   padding-left: 0.75rem;
   padding-right: 0.75rem;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
   display: flex;
   align-items: center;
   border-radius: 0.25rem;
   width: auto;
-  line-height: 1rem;
   margin: 1px 8px;
   padding: 0.25rem;
   margin-bottom: 0.25rem;