Fix proposal for variables naming

Orange-OpenSource · Nov 30, 2021 · 1e86830 · 1e86830
1 parent 3c6f353
commit 1e86830
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/scss/_orange-navbar.scss b/scss/_orange-navbar.scss
@@ -10,30 +10,30 @@
   display: none;
   padding-top: 0;
   padding-bottom: 0;
-  border-bottom: $navbar-orange-border-bottom-width solid $gray-700;
+  border-bottom: $navbar-orange-supra-border-bottom-width solid $gray-700;
 
   .container {
-    padding-right: $navbar-orange-padding-x;
-    padding-left: $navbar-orange-padding-x;
+    padding-right: $navbar-orange-supra-padding-x;
+    padding-left: $navbar-orange-supra-padding-x;
   }
 
   @include media-breakpoint-up(md) {
     display: flex;
   }
 
   .navbar-nav .nav-link {
-    padding: $navbar-orange-link-padding-top $navbar-orange-supra-padding-x $navbar-orange-link-padding-bottom;
+    padding: $navbar-orange-supra-link-padding-top $navbar-orange-supra-link-padding-x $navbar-orange-supra-link-padding-bottom;
     font-size: $font-size-sm;
     line-height: $line-height-sm;
 
     &.active::before {
-      right: $navbar-orange-supra-padding-x;
-      bottom: -$navbar-orange-border-bottom-width;
-      left: $navbar-orange-supra-padding-x;
+      right: $navbar-orange-supra-link-padding-x;
+      bottom: -$navbar-orange-supra-border-bottom-width;
+      left: $navbar-orange-supra-link-padding-x;
     }
 
     &.nav-icon {
-      padding: $navbar-orange-icon-padding-top $navbar-orange-icon-padding-x $navbar-orange-icon-padding-bottom;
+      padding: $navbar-orange-supra-icon-padding-top $navbar-orange-supra-icon-padding-x $navbar-orange-supra-icon-padding-bottom;
 
       svg,
       img {
@@ -49,15 +49,15 @@
       @extend .text-white;
       @extend .translate-middle;
       @extend .rounded-pill;
-      padding: $navbar-orange-badge-padding-y $navbar-orange-badge-padding-x;
-      margin-top: $navbar-orange-supra-margin-y;
+      padding: $navbar-orange-supra-badge-padding-y $navbar-orange-supra-badge-padding-x;
+      margin-top: $navbar-orange-supra-badge-margin-top;
       font-size: $font-size-base;
     }
   }
 
   .nav-item:last-of-type {
     .nav-icon {
-      padding-right: $navbar-orange-supra-padding-x;
+      padding-right: $navbar-orange-supra-link-padding-x;
     }
   }
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -1202,18 +1202,21 @@ $navbar-active-transition:             bottom $navbar-transition-duration $navba
 
 // Boosted mod: Orange navbar
 // scss-docs-start orange-navbar-variables
-$navbar-orange-padding-x:              .125rem !default;
-$navbar-orange-border-bottom-width:    1px !default;
-$navbar-orange-link-padding-top:       .75rem !default;
-$navbar-orange-link-padding-bottom:    .6875rem !default;
-$navbar-orange-icon-padding-top:       divide($spacer, 2) !default;
-$navbar-orange-icon-padding-x:         .9375rem !default;
-$navbar-orange-icon-padding-bottom:    .25rem !default;
-$navbar-orange-badge-padding-y:        .125rem !default;
-$navbar-orange-badge-padding-x:        .375rem !default;
-$navbar-orange-supra-padding-x:        map-get($spacers, 1) * 1.5 !default;
-$navbar-orange-supra-margin-y:         map-get($spacers, 4) * .1 !default; // 0.1875rem
-$navbar-orange-supra-icon-size:        1.5625rem !default;
+$navbar-orange-supra-padding-x:               .125rem !default;
+$navbar-orange-supra-border-bottom-width:     1px !default;
+
+$navbar-orange-supra-badge-padding-y:         .125rem !default;
+$navbar-orange-supra-badge-padding-x:         .375rem !default;
+$navbar-orange-supra-badge-margin-top:        map-get($spacers, 4) * .1 !default;
+
+$navbar-orange-supra-icon-padding-top:        divide($spacer, 2) !default;
+$navbar-orange-supra-icon-padding-x:          .9375rem !default;
+$navbar-orange-supra-icon-padding-bottom:     .25rem !default;
+$navbar-orange-supra-icon-size:               1.5625rem !default;
+
+$navbar-orange-supra-link-padding-top:        .75rem !default;
+$navbar-orange-supra-link-padding-x:          map-get($spacers, 1) * 1.5 !default;
+$navbar-orange-supra-link-padding-bottom:     .6875rem !default;
 // scss-docs-end orange-navbar-variables
 // End mod