Update Bootstrap to v4 stable & Bump version to 2.2.0

pratikborsadiya · Jan 19, 2018 · 2d9703f · 2d9703f
1 parent ad84ce5
commit 2d9703f
Show file tree

Hide file tree

Showing 25 changed files with 615 additions and 535 deletions.
diff --git a/docs/css/main.css b/docs/css/main.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vali-admin",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "An admin theme built with Bootstrap, sass and PugJs",
   "devDependencies": {
     "autoprefixer": "^7.1.0",

diff --git a/src/sass/1-tools/bootstrap-source/_alert.scss b/src/sass/1-tools/bootstrap-source/_alert.scss
@@ -46,6 +46,6 @@
 
 @each $color, $value in $theme-colors {
   .alert-#{$color} {
-    @include alert-variant(theme-color-level($color, -10), theme-color-level($color, -9), theme-color-level($color, 6));
+    @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level));
   }
 }
diff --git a/src/sass/1-tools/bootstrap-source/_bootstrap-grid.scss b/src/sass/1-tools/bootstrap-source/_bootstrap-grid.scss
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap Grid v4.0.0-beta.3 (https://getbootstrap.com)
- * Copyright 2011-2017 The Bootstrap Authors
- * Copyright 2011-2017 Twitter, Inc.
+ * Bootstrap Grid v4.0.0 (https://getbootstrap.com)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
@@ -23,13 +23,10 @@ html {
 @import "functions";
 @import "variables";
 
-//
-// Grid mixins
-//
-
 @import "mixins/breakpoints";
 @import "mixins/grid-framework";
 @import "mixins/grid";
 
 @import "grid";
+@import "utilities/display";
 @import "utilities/flex";
diff --git a/src/sass/1-tools/bootstrap-source/_bootstrap-reboot.scss b/src/sass/1-tools/bootstrap-source/_bootstrap-reboot.scss
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap Reboot v4.0.0-beta.3 (https://getbootstrap.com)
- * Copyright 2011-2017 The Bootstrap Authors
- * Copyright 2011-2017 Twitter, Inc.
+ * Bootstrap Reboot v4.0.0 (https://getbootstrap.com)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
  */

diff --git a/...s/1-tools/bootstrap-source/bootstrap.scss → .../1-tools/bootstrap-source/_bootstrap.scss b/...s/1-tools/bootstrap-source/bootstrap.scss → .../1-tools/bootstrap-source/_bootstrap.scss
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v4.0.0-beta.3 (https://getbootstrap.com)
- * Copyright 2011-2017 The Bootstrap Authors
- * Copyright 2011-2017 Twitter, Inc.
+ * Bootstrap v4.0.0 (https://getbootstrap.com)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 

diff --git a/src/sass/1-tools/bootstrap-source/_buttons.scss b/src/sass/1-tools/bootstrap-source/_buttons.scss
@@ -34,12 +34,12 @@
   }
 
   // Opinionated: add "hand" cursor to non-disabled .btn elements
-  &:not([disabled]):not(.disabled) {
+  &:not(:disabled):not(.disabled) {
     cursor: pointer;
   }
 
-  &:not([disabled]):not(.disabled):active,
-  &:not([disabled]):not(.disabled).active {
+  &:not(:disabled):not(.disabled):active,
+  &:not(:disabled):not(.disabled).active {
     background-image: none;
     @include box-shadow($btn-active-box-shadow);
 
@@ -51,7 +51,7 @@
 
 // Future-proof disabling of clicks on `<a>` elements
 a.btn.disabled,
-fieldset[disabled] a.btn {
+fieldset:disabled a.btn {
   pointer-events: none;
 }
 
@@ -68,11 +68,7 @@ fieldset[disabled] a.btn {
 
 @each $color, $value in $theme-colors {
   .btn-outline-#{$color} {
-    @if $color == "light" {
-      @include button-outline-variant($value, $gray-900);
-    } @else {
-      @include button-outline-variant($value, $white);
-    }
+    @include button-outline-variant($value);
   }
 }
 

diff --git a/src/sass/1-tools/bootstrap-source/_close.scss b/src/sass/1-tools/bootstrap-source/_close.scss
@@ -14,7 +14,7 @@
   }
 
   // Opinionated: add "hand" cursor to non-disabled .close elements
-  &:not([disabled]):not(.disabled) {
+  &:not(:disabled):not(.disabled) {
     cursor: pointer;
   }
 }

diff --git a/src/sass/1-tools/bootstrap-source/_custom-forms.scss b/src/sass/1-tools/bootstrap-source/_custom-forms.scss
@@ -117,6 +117,15 @@
       background-image: $custom-checkbox-indicator-icon-indeterminate;
     }
   }
+
+  .custom-control-input:disabled {
+    &:checked ~ .custom-control-label::before {
+      background-color: $custom-control-indicator-checked-disabled-bg;
+    }
+    &:indeterminate ~ .custom-control-label::before {
+      background-color: $custom-control-indicator-checked-disabled-bg;
+    }
+  }
 }
 
 // Radios
@@ -136,6 +145,12 @@
       background-image: $custom-radio-indicator-icon-checked;
     }
   }
+
+  .custom-control-input:disabled {
+    &:checked ~ .custom-control-label::before {
+      background-color: $custom-control-indicator-checked-disabled-bg;
+    }
+  }
 }
 
 
@@ -148,7 +163,7 @@
 .custom-select {
   display: inline-block;
   width: 100%;
-  height: $input-height;
+  height: $custom-select-height;
   padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
   line-height: $custom-select-line-height;
   color: $custom-select-color;

diff --git a/src/sass/1-tools/bootstrap-source/_input-group.scss b/src/sass/1-tools/bootstrap-source/_input-group.scss
@@ -11,9 +11,9 @@
   align-items: stretch;
   width: 100%;
 
-  .form-control,
-  .custom-select,
-  .custom-file {
+  > .form-control,
+  > .custom-select,
+  > .custom-file {
     position: relative; // For focus state's z-index
     flex: 1 1 auto;
     // Add width 1% and flex-basis auto to ensure that button will not wrap out
@@ -26,27 +26,29 @@
       z-index: 3;
     }
 
-    + .form-control {
+    + .form-control,
+    + .custom-select,
+    + .custom-file {
       margin-left: -$input-border-width;
     }
   }
 
-  .form-control,
-  .custom-select {
+  > .form-control,
+  > .custom-select {
     &:not(:last-child) { @include border-right-radius(0); }
     &:not(:first-child) { @include border-left-radius(0); }
   }
 
   // Custom file inputs have more complex markup, thus requiring different
   // border-radius overrides.
-  .custom-file {
+  > .custom-file {
     display: flex;
     align-items: center;
 
-    &:not(:last-child) .custom-file-control,
-    &:not(:last-child) .custom-file-control::before { @include border-right-radius(0); }
-    &:not(:first-child) .custom-file-control,
-    &:not(:first-child) .custom-file-control::before { @include border-left-radius(0); }
+    &:not(:last-child) .custom-file-label,
+    &:not(:last-child) .custom-file-label::before { @include border-right-radius(0); }
+    &:not(:first-child) .custom-file-label,
+    &:not(:first-child) .custom-file-label::before { @include border-left-radius(0); }
   }
 }
 
@@ -60,7 +62,6 @@
 .input-group-prepend,
 .input-group-append {
   display: flex;
-  align-items: center;
 
   // Ensure buttons are always above inputs for more visually pleasing borders.
   // This isn't needed for `.input-group-text` since it shares the same border-color
@@ -88,6 +89,8 @@
 // to prepend or append to an input.
 
 .input-group-text {
+  display: flex;
+  align-items: center;
   padding: $input-padding-y $input-padding-x;
   margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom
   font-size: $font-size-base; // Match inputs

diff --git a/src/sass/1-tools/bootstrap-source/_navbar.scss b/src/sass/1-tools/bootstrap-source/_navbar.scss
@@ -118,7 +118,7 @@
   }
 
   // Opinionated: add "hand" cursor to non-disabled .navbar-toggler elements
-  &:not([disabled]):not(.disabled) {
+  &:not(:disabled):not(.disabled) {
     cursor: pointer;
   }
 }
@@ -168,8 +168,8 @@
           }
 
           .nav-link {
-            padding-right: .5rem;
-            padding-left: .5rem;
+            padding-right: $navbar-nav-link-padding-x;
+            padding-left: $navbar-nav-link-padding-x;
           }
         }
 

diff --git a/src/sass/1-tools/bootstrap-source/_pagination.scss b/src/sass/1-tools/bootstrap-source/_pagination.scss
@@ -14,16 +14,21 @@
   background-color: $pagination-bg;
   border: $pagination-border-width solid $pagination-border-color;
 
-  @include hover-focus {
+  &:hover {
     color: $pagination-hover-color;
     text-decoration: none;
     background-color: $pagination-hover-bg;
     border-color: $pagination-hover-border-color;
   }
 
+  &:focus {
+    z-index: 2;
+    outline: 0;
+    box-shadow: $pagination-focus-box-shadow;
+  }
 
   // Opinionated: add "hand" cursor to non-disabled .page-link elements
-  &:not([disabled]):not(.disabled) {
+  &:not(:disabled):not(.disabled) {
     cursor: pointer;
   }
 }

diff --git a/src/sass/1-tools/bootstrap-source/_popover.scss b/src/sass/1-tools/bootstrap-source/_popover.scss
@@ -8,13 +8,13 @@
   // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
   // So reset our font and text properties to avoid inheriting weird values.
   @include reset-text();
-  font-size: $font-size-sm;
+  font-size: $popover-font-size;
   // Allow breaking very long words so they don't overflow the popover's bounds
   word-wrap: break-word;
   background-color: $popover-bg;
   background-clip: padding-box;
   border: $popover-border-width solid $popover-border-color;
-  @include border-radius($border-radius-lg);
+  @include border-radius($popover-border-radius);
   @include box-shadow($popover-box-shadow);
 
   .arrow {

diff --git a/src/sass/1-tools/bootstrap-source/_print.scss b/src/sass/1-tools/bootstrap-source/_print.scss
@@ -20,9 +20,10 @@
       box-shadow: none !important;
     }
 
-    a,
-    a:visited {
-      text-decoration: underline;
+    a {
+      &:not(.btn) {
+        text-decoration: underline;
+      }
     }
 
     // Bootstrap specific; comment the following selector out
@@ -82,6 +83,19 @@
 
     // Bootstrap specific changes start
 
+    // Specify a size and min-width to make printing closer across browsers.
+    // We don't set margin here because it breaks `size` in Chrome. We also
+    // don't use `!important` on `size` as it breaks in Chrome.
+    @page {
+      size: $print-page-size;
+    }
+    body {
+      min-width: $print-body-min-width !important;
+    }
+    .container {
+      min-width: $print-body-min-width !important;
+    }
+
     // Bootstrap components
     .navbar {
       display: none;

diff --git a/src/sass/1-tools/bootstrap-source/_reboot.scss b/src/sass/1-tools/bootstrap-source/_reboot.scss
@@ -279,29 +279,6 @@ svg:not(:root) {
 }
 
 
-// Avoid 300ms click delay on touch devices that support the `touch-action` CSS property.
-//
-// In particular, unlike most other browsers, IE11+Edge on Windows 10 on touch devices and IE Mobile 10-11
-// DON'T remove the click delay when `<meta name="viewport" content="width=device-width">` is present.
-// However, they DO support removing the click delay via `touch-action: manipulation`.
-// See:
-// * https://getbootstrap.com/docs/4.0/content/reboot/#click-delay-optimization-for-touch
-// * https://caniuse.com/#feat=css-touch-action
-// * https://patrickhlauke.github.io/touch/tests/results/#suppressing-300ms-delay
-
-a,
-area,
-button,
-[role="button"],
-input:not([type="range"]),
-label,
-select,
-summary,
-textarea {
-  touch-action: manipulation;
-}
-
-
 //
 // Tables
 //

diff --git a/src/sass/1-tools/bootstrap-source/_tooltip.scss b/src/sass/1-tools/bootstrap-source/_tooltip.scss
@@ -7,7 +7,7 @@
   // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
   // So reset our font and text properties to avoid inheriting weird values.
   @include reset-text();
-  font-size: $font-size-sm;
+  font-size: $tooltip-font-size;
   // Allow breaking very long words so they don't overflow the tooltip's bounds
   word-wrap: break-word;
   opacity: 0;
@@ -111,5 +111,5 @@
   color: $tooltip-color;
   text-align: center;
   background-color: $tooltip-bg;
-  @include border-radius($border-radius);
+  @include border-radius($tooltip-border-radius);
 }