bootstrap-italia 2.17.3 → 3.0.0-alpha.0

package/src/scss/components/_modal.scss

@@ -1,29 +1,54 @@
-// stylelint-disable function-disallowed-list
+// Component: modal
+//
+// Description: Component styles for modal
+//
 
-// .modal-open      - body class for killing the scroll
-// .modal           - container to scroll within
-// .modal-dialog    - positioning shell for the actual modal
-// .modal-content   - actual modal w/ bg and corners and stuff
+// Variables
+//
 
-// Container that the modal scrolls within
+// Properties
+//
+
+.modal {
+  --#{$prefix}modal-bg: var(--#{$prefix}color-background-inverse); // Controls the background for the modal, using color tokens.
+  --#{$prefix}modal-border-color: transparent; // Controls the border color for the modal.
+  --#{$prefix}modal-border-radius: var(--#{$prefix}radius-smooth); // Controls the border radius for the modal, using radius tokens.
+  --#{$prefix}modal-border-width: 0; // Controls the border width for the modal.
+  --#{$prefix}modal-box-shadow: var(--#{$prefix}elevation-medium); // Controls the box shadow for the modal, using elevation tokens.
+  --#{$prefix}modal-footer-bg: transparent; // Controls the footer background for the modal.
+  --#{$prefix}modal-footer-border-color: var(--#{$prefix}modal-header-border-color); // Controls the footer border color for the modal.
+  --#{$prefix}modal-footer-border-width: var(--#{$prefix}modal-header-border-width); // Controls the footer border width for the modal.
+  --#{$prefix}modal-footer-gap: var(--#{$prefix}spacing-s); // Controls the footer gap for the modal, using spacing tokens.
+  --#{$prefix}modal-header-border-color: var(--#{$prefix}color-border-subtle); // Controls the header border color for the modal, using color tokens.
+  --#{$prefix}modal-header-border-width: 0; // Controls the header border width for the modal.
+  --#{$prefix}modal-inner-border-radius: var(--#{$prefix}radius-smooth); // Controls the inner border radius for the modal, using radius tokens.
+  --#{$prefix}modal-margin: auto; // Controls the margin for the modal.
+  --#{$prefix}modal-padding: var(--#{$prefix}spacing-m); // Controls the padding for the modal, using spacing tokens.
+  --#{$prefix}modal-title-font-size: var(--#{$prefix}heading-5-font-size); // Controls the title font size for the modal, using font tokens.
+  --#{$prefix}modal-title-font-weight: var(--#{$prefix}heading-font-weight-weak); // Controls the title font weight for the modal, using font tokens.
+  --#{$prefix}modal-title-line-height: var(--#{$prefix}heading-line-height); // Controls the title line height for the modal, using font tokens.
+  --#{$prefix}modal-transition: transform 0.3s ease-in-out; // Controls the transition for the modal.
+  --#{$prefix}modal-width: 500px; // Controls the width for the modal.
+  --#{$prefix}modal-zindex: 1055; // Controls the z-index for the modal.
+}
+
+// Styles
+//
 
-// Shell div to position the modal with bottom padding
 .modal-dialog {
   position: relative;
   width: auto;
   margin: var(--#{$prefix}modal-margin);
-  // allow clicks to pass through for custom click handling to close modal
-  pointer-events: none;
+  pointer-events: none; // Allow clicks to pass through for custom click handling to close modal
 
   // When fading in the modal, animate it to slide down
-
   .modal.show & {
-    transform: $modal-show-transform;
+    transform: none;
   }
 
   // When trying to close, animate focus to scale
   .modal.modal-static & {
-    transform: $modal-scale-transform;
+    transform: scale(1.02);
   }
 }
 
@@ -46,31 +71,37 @@
   min-height: calc(100% - var(--#{$prefix}modal-margin) * 2);
 }
 
+// Modal body
+// Where all modal content resides (sibling of .modal-header and .modal-footer)
+.modal-body {
+  position: relative;
+  // Enable `flex-grow: 1` so that the body take up as much space as possible
+  // when there should be a fixed height on `.modal-dialog`.
+  flex: 1 1 auto;
+  padding: var(--#{$prefix}modal-padding);
+  color: var(--#{$prefix}color-text-base);
+}
+
 // Actual modal
 .modal-content {
   position: relative;
   display: flex;
   flex-direction: column;
   width: 100%; // Ensure `.modal-content` extends the full width of the parent `.modal-dialog`
-  // counteract the pointer-events: none; in the .modal-dialog
-  color: var(--#{$prefix}modal-color);
-  pointer-events: auto;
+  border: var(--#{$prefix}modal-border-width) solid var(--#{$prefix}modal-border-color);
+  outline: 0; // Remove focus outline from opened modal
   background-color: var(--#{$prefix}modal-bg);
+  pointer-events: auto; // counteract the pointer-events: none; in the .modal-dialog
   background-clip: padding-box;
-  border: var(--#{$prefix}modal-border-width) solid var(--#{$prefix}modal-border-color);
   @include border-radius(var(--#{$prefix}modal-border-radius));
   @include box-shadow(var(--#{$prefix}modal-box-shadow));
-  // Remove focus outline from opened modal
-  outline: 0;
 }
 
 // Modal background
 .modal-backdrop {
-  // scss-docs-start modal-backdrop-css-vars
   --#{$prefix}backdrop-zindex: #{$zindex-modal-backdrop};
   --#{$prefix}backdrop-bg: #{$modal-backdrop-bg};
   --#{$prefix}backdrop-opacity: #{$modal-backdrop-opacity};
-  // scss-docs-end modal-backdrop-css-vars
 
   @include overlay-backdrop(var(--#{$prefix}backdrop-zindex), var(--#{$prefix}backdrop-bg), var(--#{$prefix}backdrop-opacity));
 }
@@ -82,20 +113,34 @@
   flex-shrink: 0;
   align-items: center;
   justify-content: space-between; // Put modal header elements (title and dismiss) on opposite ends
-  padding: var(--#{$prefix}modal-header-padding);
+  padding: var(--#{$prefix}modal-padding) var(--#{$prefix}modal-padding) 0;
   border-bottom: var(--#{$prefix}modal-header-border-width) solid var(--#{$prefix}modal-header-border-color);
-  @include border-top-radius(var(--#{$prefix}modal-inner-border-radius));
+}
+
+// Modal footer
+.modal-footer {
+  position: relative;
+  display: flex;
+  flex-shrink: 0;
+  flex-wrap: wrap;
+  gap: var(--#{$prefix}modal-footer-gap);
+  align-items: center; // vertically center
+  justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items
+  padding: 0 var(--#{$prefix}modal-padding) var(--#{$prefix}modal-padding);
+  border-top: var(--#{$prefix}modal-footer-border-width) solid var(--#{$prefix}modal-footer-border-color);
+  background-color: var(--#{$prefix}modal-footer-bg);
+  @include border-bottom-radius(var(--#{$prefix}modal-border-radius));
 
-  .btn-close {
-    padding: calc(var(--#{$prefix}modal-header-padding-y) * 0.5) calc(var(--#{$prefix}modal-header-padding-x) * 0.5);
-    margin: calc(-0.5 * var(--#{$prefix}modal-header-padding-y)) calc(-0.5 * var(--#{$prefix}modal-header-padding-x))
-      calc(-0.5 * var(--#{$prefix}modal-header-padding-y)) auto;
+  &.modal-footer-shadow {
+    box-shadow: 0 15px 25px 5px rgb(0, 0, 0, 0.3);
   }
 }
 
 // Title text within header
 .modal-title {
   margin-bottom: 0;
+  font-size: var(--#{$prefix}modal-title-font-size);
+  font-weight: var(--#{$prefix}modal-title-font-weight);
   line-height: var(--#{$prefix}modal-title-line-height);
 }
 
@@ -109,29 +154,27 @@
   // Automatically set modal's width for larger viewports
   .modal-dialog {
     max-width: var(--#{$prefix}modal-width);
-    margin-right: auto;
-    margin-left: auto;
   }
 
   .modal-sm {
-    --#{$prefix}modal-width: #{$modal-sm};
+    --#{$prefix}modal-width: 300px;
   }
 }
 
 @include media-breakpoint-up(lg) {
   .modal-lg,
   .modal-xl {
-    --#{$prefix}modal-width: #{$modal-lg};
+    --#{$prefix}modal-width: 800px;
   }
 }
 
 @include media-breakpoint-up(xl) {
   .modal-xl {
-    --#{$prefix}modal-width: #{$modal-xl};
+    --#{$prefix}modal-width: 1140px;
   }
 }
 
-// scss-docs-start modal-fullscreen-loop
+// Fullscreen modal loop
 @each $breakpoint in map-keys($grid-breakpoints) {
   $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
   $postfix: if($infix != '', $infix + '-down', '');
@@ -160,34 +203,8 @@
     }
   }
 }
-
-// scss-docs-end modal-fullscreen-loop
-
+/* stylelint-disable-next-line no-duplicate-selectors */
 .modal {
-  // scss-docs-start modal-css-vars
-  --#{$prefix}modal-zindex: #{$zindex-modal};
-  --#{$prefix}modal-width: #{$modal-md};
-  --#{$prefix}modal-padding: #{$modal-inner-padding};
-  --#{$prefix}modal-margin: #{$modal-dialog-margin};
-  --#{$prefix}modal-color: #{$modal-content-color};
-  --#{$prefix}modal-bg: #{$modal-content-bg};
-  --#{$prefix}modal-border-color: #{$modal-content-border-color};
-  --#{$prefix}modal-border-width: #{$modal-content-border-width};
-  --#{$prefix}modal-border-radius: #{$modal-content-border-radius};
-  --#{$prefix}modal-box-shadow: #{$modal-content-box-shadow-xs};
-  --#{$prefix}modal-inner-border-radius: #{$modal-content-inner-border-radius};
-  --#{$prefix}modal-header-padding-x: #{$modal-header-padding-x};
-  --#{$prefix}modal-header-padding-y: #{$modal-header-padding-y};
-  --#{$prefix}modal-header-padding: #{$modal-header-padding}; // Todo in v6: Split this padding into x and y
-  --#{$prefix}modal-header-border-color: #{$modal-header-border-color};
-  --#{$prefix}modal-header-border-width: #{$modal-header-border-width};
-  --#{$prefix}modal-title-line-height: #{$modal-title-line-height};
-  --#{$prefix}modal-footer-gap: #{$modal-footer-margin-between};
-  --#{$prefix}modal-footer-bg: #{$modal-footer-bg};
-  --#{$prefix}modal-footer-border-color: #{$modal-footer-border-color};
-  --#{$prefix}modal-footer-border-width: #{$modal-footer-border-width};
-  // scss-docs-end modal-css-vars
-
   position: fixed;
   top: 0;
   left: 0;
@@ -195,142 +212,108 @@
   display: none;
   width: 100%;
   height: 100%;
+  // We deliberately don't use `-webkit-overflow-scrolling: touch;` due to a
+  // gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342
+  // See also https://github.com/twbs/bootstrap/issues/17695
+  padding-right: 0 !important;
   overflow-x: hidden;
   overflow-y: auto;
   // Prevent Chrome on Windows from adding a focus outline. For details, see
   // https://github.com/twbs/bootstrap/pull/10951.
   outline: 0;
-  // We deliberately don't use `-webkit-overflow-scrolling: touch;` due to a
-  // gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342
-  // See also https://github.com/twbs/bootstrap/issues/17695
-  padding-right: 0 !important;
-  .modal-dialog {
-    margin: $modal-margin;
-    .modal-content {
-      border: none;
-      box-shadow: $dialog-shadow;
-      .modal-header {
-        padding: $modal-padding;
-        padding-bottom: 0;
-        .close {
-          padding: $modal-padding-close;
-        }
-        h5 {
-          color: $modal-heading-color;
-        }
-      }
-      .modal-body {
-        padding: $modal-padding;
-        padding-bottom: 0;
-      }
-      .modal-footer {
-        padding: $modal-padding * 0.5 $modal-padding;
-      }
-    }
-  }
-  //alert variation
+
+  // Modal alert variation
   &.alert-modal {
     .modal-dialog {
       .modal-content {
         .modal-header {
-          justify-content: left;
           align-items: start;
+          justify-content: left;
           .icon {
-            fill: $modal-icon-color;
-            margin-right: $modal-icon-distance;
             flex-shrink: 0;
+            margin-right: $modal-icon-distance;
+            fill: $modal-icon-color;
           }
         }
       }
     }
   }
-  // link list variation
+
+  // Modal link list variation
   &.it-dialog-link-list {
     .modal-dialog {
       .modal-content {
         .modal-header {
-          border-bottom: $modal-heading-border;
-          padding-bottom: $modal-padding;
-          h5 {
-            text-transform: none;
-            font-weight: 700;
-            letter-spacing: inherit;
-
-            span {
-              color: $primary;
-              margin-right: $v-gap * 0.5;
-            }
-          }
+          --#{$prefix}modal-header-border-color: var(--#{$prefix}color-border-subtle);
+          --#{$prefix}modal-header-border-width: 1px;
+          padding-bottom: var(--#{$prefix}modal-padding);
         }
         .modal-body {
           .link-list-wrapper {
             .link-list {
               margin-bottom: 0;
-              padding-bottom: $modal-padding;
+              padding-bottom: var(--#{$prefix}modal-padding);
             }
           }
         }
       }
     }
   }
-  //Popconfirm variation
+
+  // Modal popconfirm variation
   &.popconfirm-modal {
     .modal-dialog {
-      max-width: $modal-popconfirm-max-width;
       margin-right: auto;
       margin-left: auto;
-      .modal-content {
-        border-radius: $border-radius;
-      }
-      .modal-header {
-        padding-top: $v-gap * 2;
-        margin-bottom: -$v-gap * 0.5;
-      }
+
       .modal-body {
-        padding-top: $v-gap * 2;
         p {
-          font-size: $modal-popconfirm-p-size-mobile;
-          margin-bottom: $v-gap * 1.5;
+          font-size: var(--#{$prefix}caption-font-size);
+          line-height: var(--#{$prefix}caption-line-height);
         }
       }
       .modal-footer {
-        padding-bottom: $v-gap * 3;
+        justify-content: flex-start;
       }
     }
   }
-  // scrollable variation
+
+  // Modal scrollable variation
   &.it-dialog-scrollable {
     .modal-dialog {
-      margin: $v-gap * 13 $modal-margin;
       .modal-content {
         display: flex;
         flex-direction: column;
-        height: calc(100vh - #{$v-gap * 26});
+        height: calc(100vh - 208px);
+        @include border-radius(0);
+
         .modal-header {
-          padding-bottom: $modal-padding;
-          background: $modal-sticky-bg;
           flex-shrink: 0;
+          padding-bottom: var(--#{$prefix}modal-padding);
         }
+
         .modal-body {
           padding-top: 0;
-          padding-bottom: $modal-padding;
           overflow-y: auto;
         }
+
         .modal-footer {
+          padding-top: var(--#{$prefix}modal-padding);
           flex-shrink: 0;
-          background: $modal-sticky-bg;
         }
       }
+
       &.modal-dialog-left {
         height: 100vh;
-        margin: 0 $v-gap * 3 0 0;
+        margin: 0 var(--#{$prefix}spacing-m) 0 0;
         .modal-content {
           height: 100vh;
         }
       }
+
       &.modal-dialog-right {
         height: 100vh;
-        margin: 0 0 0 $v-gap * 3;
+        margin: 0 0 0 var(--#{$prefix}spacing-m);
         float: right;
         .modal-content {
           height: 100vh;
@@ -338,10 +321,11 @@
       }
     }
   }
-  // transition left
+
+  // Fade transition - left
   &.fade {
     .modal-dialog {
-      @include transition($modal-transition);
+      @include transition(var(--#{$prefix}modal-transition));
       &.modal-dialog-left {
         transform: translateX(-100%);
         transition: transform 0.3s ease-in-out;
@@ -370,28 +354,12 @@
   }
 }
 
-//small - tablet
-@include media-breakpoint-up(sm) {
-  .modal {
-    //Popconfirm variation
-    &.popconfirm-modal {
-      .modal-dialog {
-        .modal-body {
-          p {
-            font-size: $modal-popconfirm-p-size;
-          }
-        }
-      }
-    }
-  }
-}
-
-//Tablet vertical
+// Device tablet vertical
 @include media-breakpoint-up(md) {
   .modal {
     .modal-dialog {
-      margin-left: auto;
       margin-right: auto;
+      margin-left: auto;
       &.modal-dialog-left {
         margin: 0;
         .modal-content {
@@ -416,60 +384,3 @@
     }
   }
 }
-
-//Tablet horizontal / small desktop
-@include media-breakpoint-up(lg) {
-  //modal
-
-  //alert variation
-  .alert-modal {
-    .modal-dialog {
-      .modal-content {
-        .modal-body {
-          p {
-            padding-left: $modal-alert-p-distance;
-          }
-        }
-      }
-    }
-  }
-}
-
-.modal-content,
-.modal-header {
-  @include border-radius($reset-border-radius);
-}
-
-// Modal body
-// Where all modal content resides (sibling of .modal-header and .modal-footer)
-.modal-body {
-  position: relative;
-  // Enable `flex-grow: 1` so that the body take up as much space as possible
-  // when there should be a fixed height on `.modal-dialog`.
-  flex: 1 1 auto;
-  padding: var(--#{$prefix}modal-padding);
-  color: $color-text-base;
-}
-
-.modal-footer {
-  position: relative;
-  display: flex;
-  flex-shrink: 0;
-  flex-wrap: wrap;
-  align-items: center; // vertically center
-  justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items
-  padding: calc(var(--#{$prefix}modal-padding) - var(--#{$prefix}modal-footer-gap) * 0.5);
-  background-color: var(--#{$prefix}modal-footer-bg);
-  border-top: var(--#{$prefix}modal-footer-border-width) solid var(--#{$prefix}modal-footer-border-color);
-  @include border-bottom-radius(var(--#{$prefix}modal-inner-border-radius));
-
-  // Place margin between footer elements
-  // This solution is far from ideal because of the universal selector usage,
-  // but is needed to fix https://github.com/twbs/bootstrap/issues/24800
-  > * {
-    margin: calc(var(--#{$prefix}modal-footer-gap) * 0.5); // Todo in v6: replace with gap on parent class
-  }
-  &.modal-footer-shadow {
-    box-shadow: 0 15px 25px 5px rgb(0, 0, 0, 0.3);
-  }
-}

package/src/scss/components/_nav.scss

@@ -1,46 +1,50 @@
-// Base class
+// Component: nav
+//
+// Description: Component styles for nav
+//
+
+// Variables
+//
+
+// Properties
 //
-// Kickstart any navigation component with a set of style resets. Works with
-// `<nav>`s, `<ul>`s or `<ol>`s.
 
 .nav {
-  // scss-docs-start nav-css-vars
-  --#{$prefix}nav-link-padding-x: #{$nav-link-padding-x};
-  --#{$prefix}nav-link-padding-y: #{$nav-link-padding-y};
-  @include rfs($nav-link-font-size, --#{$prefix}nav-link-font-size);
-  --#{$prefix}nav-link-font-weight: #{$nav-link-font-weight};
-  --#{$prefix}nav-link-color: #{$nav-link-color};
-  --#{$prefix}nav-link-hover-color: #{$nav-link-hover-color};
-  --#{$prefix}nav-link-disabled-color: #{$nav-link-disabled-color};
-  // scss-docs-end nav-css-vars
+  --#{$prefix}nav-link-disabled-color: var(--#{$prefix}color-text-disabled); // Controls the disabled link color for the nav, using color tokens.
+  --#{$prefix}nav-link-padding-x: var(--#{$prefix}spacing-s); // Controls the horizontal padding for nav links, using spacing tokens.
+  --#{$prefix}nav-link-padding-y: var(--#{$prefix}spacing-s); // Controls the vertical padding for nav links, using spacing tokens.
+}
 
+// Styles
+//
+/* stylelint-disable-next-line no-duplicate-selectors */
+.nav {
   display: flex;
   flex-wrap: wrap;
-  padding-left: 0;
   margin-bottom: 0;
+  padding-left: 0;
   list-style: none;
 }
 
 .nav-link {
   display: block;
-  padding: var(--#{$prefix}nav-link-padding-y) var(--#{$prefix}nav-link-padding-x);
-  @include font-size(var(--#{$prefix}nav-link-font-size));
-  font-weight: var(--#{$prefix}nav-link-font-weight);
-  color: var(--#{$prefix}nav-link-color);
-  text-decoration: if($link-decoration == none, null, none);
-  @include transition($nav-link-transition);
-
-  &:hover,
-  &:focus {
-    color: var(--#{$prefix}nav-link-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+  color: var(--#{$prefix}navbar-link-color);
+  font-size: var(--#{$prefix}navbar-link-font-size);
+  font-weight: var(--#{$prefix}navbar-link-font-weight);
+  line-height: var(--#{$prefix}navbar-link-line-height);
+  text-decoration: none;
+
+  &:hover {
+    color: var(--#{$prefix}navbar-link-color);
+    text-decoration: underline;
+    text-underline-offset: 2px;
   }
 
   // Disabled state lightens text
   &.disabled {
-    color: var(--#{$prefix}nav-link-disabled-color);
+    opacity: var(--#{$prefix}navbar-disable-item-opacity);
+    cursor: not-allowed;
     pointer-events: none;
-    cursor: default;
   }
 }
 
@@ -50,43 +54,43 @@
 
 .nav-tabs {
   // scss-docs-start nav-tabs-css-vars
-  --#{$prefix}nav-tabs-border-width: #{$nav-tabs-border-width};
   --#{$prefix}nav-tabs-border-color: #{$nav-tabs-border-color};
   --#{$prefix}nav-tabs-border-radius: #{$nav-tabs-border-radius};
-  --#{$prefix}nav-tabs-link-hover-border-color: #{$nav-tabs-link-hover-border-color};
-  --#{$prefix}nav-tabs-link-active-color: #{$nav-tabs-link-active-color};
+  --#{$prefix}nav-tabs-border-width: #{$nav-tabs-border-width};
   --#{$prefix}nav-tabs-link-active-bg: #{$nav-tabs-link-active-bg};
+  --#{$prefix}nav-tabs-link-active-color: #{$nav-tabs-link-active-color};
   --#{$prefix}nav-tabs-link-active-border-color: #{$nav-tabs-link-active-border-color};
+  --#{$prefix}nav-tabs-link-hover-border-color: #{$nav-tabs-link-hover-border-color};
   // scss-docs-end nav-tabs-css-vars
 
   border-bottom: var(--#{$prefix}nav-tabs-border-width) solid var(--#{$prefix}nav-tabs-border-color);
 
   .nav-link {
     margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list
-    background: none;
     border: var(--#{$prefix}nav-tabs-border-width) solid transparent;
+    background: none;
     @include border-top-radius(var(--#{$prefix}nav-tabs-border-radius));
 
     &:hover,
     &:focus {
+      border-color: var(--#{$prefix}nav-tabs-link-hover-border-color);
       // Prevents active .nav-link tab overlapping focus outline of previous/next .nav-link
       isolation: isolate;
-      border-color: var(--#{$prefix}nav-tabs-link-hover-border-color);
     }
 
     &.disabled,
     &:disabled {
-      color: var(--#{$prefix}nav-link-disabled-color);
-      background-color: transparent;
       border-color: transparent;
+      background-color: transparent;
+      color: var(--#{$prefix}nav-link-disabled-color);
     }
   }
 
   .nav-link.active,
   .nav-item.show .nav-link {
-    color: var(--#{$prefix}nav-tabs-link-active-color);
-    background-color: var(--#{$prefix}nav-tabs-link-active-bg);
     border-color: var(--#{$prefix}nav-tabs-link-active-border-color);
+    background-color: var(--#{$prefix}nav-tabs-link-active-bg);
+    color: var(--#{$prefix}nav-tabs-link-active-color);
   }
 
   .dropdown-menu {
@@ -102,21 +106,19 @@
 //
 
 .nav-pills {
-  // scss-docs-start nav-pills-css-vars
   --#{$prefix}nav-pills-border-radius: #{$nav-pills-border-radius};
-  --#{$prefix}nav-pills-link-active-color: #{$nav-pills-link-active-color};
   --#{$prefix}nav-pills-link-active-bg: #{$nav-pills-link-active-bg};
-  // scss-docs-end nav-pills-css-vars
+  --#{$prefix}nav-pills-link-active-color: #{$nav-pills-link-active-color};
 
   .nav-link {
-    background: none;
     border: 0;
+    background: none;
     @include border-radius(var(--#{$prefix}nav-pills-border-radius));
 
     &:disabled {
-      color: var(--#{$prefix}nav-link-disabled-color);
-      background-color: transparent;
       border-color: transparent;
+      background-color: transparent;
+      color: var(--#{$prefix}nav-link-disabled-color);
     }
   }