bootswatch 4.0.0.beta2.1 → 4.0.0.beta3

data/{app/assets → assets}/stylesheets/bootswatch/lumen/_bootswatch.scss

@@ -294,13 +294,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
 // Indicators ==================================================================
 
 .close {
-  color: #fff;
   text-decoration: none;
   opacity: 0.4;
 
   &:hover,
   &:focus {
-    color: #fff;
     opacity: 1;
   }
 }
@@ -394,3 +392,10 @@ a.list-group-item {
   border: 1px solid $gray-200;
   box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.05);
 }
+
+.modal {
+
+  .close {
+    color: $black;
+  }
+}

data/{app/assets → assets}/stylesheets/bootswatch/lumen/_variables.scss

@@ -73,3 +73,7 @@ $jumbotron-bg:                      #fafafa !default;
 // Modals
 
 $modal-content-border-color:        rgba($black,.1) !default;
+
+// Close
+
+$close-color:                       $white !default;

data/{app/assets → assets}/stylesheets/bootswatch/lux/_bootswatch.scss

@@ -19,10 +19,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600" !d
       padding-top: .715rem;
       padding-bottom: .715rem;
     }
-
-    .nav-item + .nav-item {
-      margin-left: 3rem;
-    }
   }
 
   &-brand {
@@ -46,6 +42,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600" !d
   }
 }
 
+.nav-item {
+  margin-right: 3rem;
+}
+
 // Buttons =====================================================================
 
 .btn {
@@ -55,14 +55,31 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600" !d
   &-sm {
     font-size: 10px;
   }
+
+  &-warning {
+    &,
+    &:hover,
+    &:not([disabled]):not(.disabled):active,
+    &:focus {
+      color: $white;
+    }
+  }
 }
 
 .btn-outline-secondary {
   border-color: $gray-600;
   color: $gray-600;
 
-  &:hover {
-    background-color: $gray-600;
+  &:not([disabled]):not(.disabled):hover,
+  &:not([disabled]):not(.disabled):focus,
+  &:not([disabled]):not(.disabled):active {
+    background-color: $gray-400;
+    border-color: $gray-400;
+    color: $white;
+  }
+
+  &:not([disabled]):not(.disabled):focus {
+    box-shadow: 0 0 0 0.2rem rgba($gray-400, 0.5);
   }
 }
 
@@ -70,6 +87,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Nunito+Sans:400,600" !d
   border-width: 2px;
 }
 
+.border-secondary {
+  border: 1px solid $gray-400 !important;
+}
+
 // Typography ==================================================================
 
 body {
@@ -82,6 +103,10 @@ h1, h2, h3, h4, h5, h6 {
   letter-spacing: 3px;
 }
 
+.text-secondary {
+  color: $body-color !important;
+}
+
 // Tables ======================================================================
 
 th {
@@ -109,3 +134,18 @@ th {
 // Progress bars ===============================================================
 
 // Containers ==================================================================
+
+.list-group-item {
+  h1, h2, h3, h4, h5, h6,
+  .h1, .h2, .h3, .h4, .h5, .h6 {
+    color: inherit;
+  }
+}
+
+.card {
+
+  &-title,
+  &-header {
+    color: inherit;
+  }
+}

data/{app/assets → assets}/stylesheets/bootswatch/materia/_bootswatch.scss

@@ -116,7 +116,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"
 .btn {
   text-transform: uppercase;
   border: none;
-  box-shadow: 1px 1px 4px rgba(0,0,0,.4);
+  box-shadow: 0 1px 4px rgba(0,0,0,.4);
   transition: all 0.4s;
 
   &-link {
@@ -196,6 +196,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"
   }
 }
 
+.border-secondary {
+  border: 1px solid #dfdfdf !important;
+}
+
 // Typography ==================================================================
 
 body,
@@ -585,28 +589,10 @@ input[type="checkbox"],
     color: #fff;
   }
 
-  &-primary {
-    background-color: $primary;
-  }
-
-  &-success {
-    background-color: $success;
-  }
-
-  &-danger {
-    background-color: $danger;
-  }
-
-  &-warning {
-    background-color: $warning;
-  }
-
-  &-info {
-    background-color: $info;
-  }
-
-  &-dark {
-    background-color: $dark;
+  @each $color, $value in $theme-colors {
+    &-#{$color} {
+      background-color: $value;
+    }
   }
 
   a:not(.close):not(.btn),
@@ -630,6 +616,10 @@ input[type="checkbox"],
   &-light {
     background-color: $gray-200;
   }
+
+  &-warning {
+    color: $white;
+  }
 }
 
 .tag {
@@ -650,6 +640,21 @@ input[type="checkbox"],
   }
 }
 
+.card {
+  box-shadow: 0 1px 4px rgba(0,0,0,.4);
+
+  &.border-primary,
+  &.border-secondary,
+  &.border-success,
+  &.border-info,
+  &.border-warning,
+  &.border-danger,
+  &.border-light,
+  &.border-dark {
+    border-width: 1px;
+  }
+}
+
 .alert-dismissible {
   .close {
     padding: 0.5rem 0.75rem;
@@ -664,6 +669,11 @@ input[type="checkbox"],
   }
 }
 
+.modal-content {
+  border-radius: 0.2rem;
+  box-shadow: 0 6px 36px rgba(0,0,0,.3);
+}
+
 .popover {
   border: none;
   box-shadow: 0 1px 4px rgba(0,0,0,.3);

data/{app/assets → assets}/stylesheets/bootswatch/materia/_variables.scss

@@ -83,6 +83,19 @@ $navbar-padding-y:                  1rem !default;
 $navbar-dark-color:                 rgba($white,.75) !default;
 $navbar-dark-hover-color:           $white !default;
 
+// Cards
+
+$card-border-width:                 0;
+$card-border-color:                 transparent;
+
+// Tooltips
+
+$tooltip-bg:                        $gray-700 !default;
+
+// Modals
+
+$modal-content-border-color:        transparent !default;
+
 // Progress bars
 
 $progress-height:               6px !default;
@@ -90,5 +103,5 @@ $progress-border-radius:        0 !default;
 
 // Close
 
-$close-font-size:             34px !default;
+$close-font-size:             2.125rem !default;
 $close-font-weight:           300 !default;

data/{app/assets → assets}/stylesheets/bootswatch/minty/_bootswatch.scss

@@ -167,12 +167,6 @@ legend {
   }
 }
 
-.pagination {
-  .page-link:hover {
-    text-decoration: none;
-  }
-}
-
 // Indicators ==================================================================
 
 .alert {
@@ -224,6 +218,7 @@ legend {
 
 // Containers ==================================================================
 
+.card,
 .list-group-item {
   h1, h2, h3, h4, h5, h6 {
     color: inherit;

data/{app/assets → assets}/stylesheets/bootswatch/pulse/_bootswatch.scss

@@ -4,12 +4,6 @@
 
 // Variables ===================================================================
 
-// Navbar ======================================================================
-
-.bg-dark {
-  // background-color: $gray-900 !important;
-}
-
 // Buttons =====================================================================
 
 .btn {

data/{app/assets → assets}/stylesheets/bootswatch/pulse/_variables.scss

@@ -37,6 +37,10 @@ $danger:        $red !default;
 $light:         $gray-200 !default;
 $dark:          $gray-900 !default;
 
+// Options
+
+$enable-rounded: false !default;
+
 // Body
 
 $body-color:                $gray-700 !default;
@@ -45,12 +49,6 @@ $body-color:                $gray-700 !default;
 
 $link-hover-color:          $primary !default;
 
-// Components
-
-$border-radius:               0 !default;
-$border-radius-lg:            0 !default;
-$border-radius-sm:            0 !default;
-
 // Fonts
 
 $font-size-base:              0.875rem !default;

data/{app/assets → assets}/stylesheets/bootswatch/sandstone/_bootswatch.scss

@@ -71,7 +71,6 @@ input,
   @include box-shadow(none);
 
   &:focus {
-    // border-color: $input-border;
     @include box-shadow(none);
   }
 }
@@ -96,6 +95,7 @@ input,
   .nav-link.disabled:focus {
     background-color: $gray-200;
     border-color: $gray-300;
+    color: $nav-link-disabled-color;
   }
 }
 

data/{app/assets → assets}/stylesheets/bootswatch/sandstone/_variables.scss

@@ -59,7 +59,8 @@ $dropdown-link-color:               $gray-600 !default;
 $dropdown-link-hover-color:         $dropdown-link-color !default;
 $dropdown-link-hover-bg:            $gray-200 !default;
 
-$dropdown-link-active-bg:       	$dropdown-link-hover-bg !default;
+$dropdown-link-active-color:        $dropdown-link-color !default;
+$dropdown-link-active-bg:           $dropdown-link-hover-bg !default;
 
 // Navs
 
@@ -67,6 +68,7 @@ $nav-link-padding-x:                0.9rem !default;
 $nav-link-disabled-color:           $gray-300 !default;
 
 $nav-tabs-border-color:             $gray-300 !default;
+$nav-tabs-link-hover-border-color:  $gray-300 !default;
 $nav-tabs-link-active-bg:           $white !default;
 
 $nav-pills-link-active-color:       $gray-600 !default;
@@ -97,8 +99,8 @@ $pagination-disabled-border-color:  $pagination-border-color !default;
 
 // Cards
 
-$card-border-color:                 $gray-300 !default;
-$card-cap-bg:                       $gray-200 !default;
+$card-border-color:                 rgba($gray-300, .75) !default;
+$card-cap-bg:                       rgba($gray-200, .25) !default;
 
 // Popovers
 

data/{app/assets → assets}/stylesheets/bootswatch/simplex/_variables.scss

@@ -47,8 +47,6 @@ $font-family-sans-serif:      "Open Sans", -apple-system, BlinkMacSystemFont, "S
 
 $font-size-base:              0.8125rem !default;
 
-$headings-color:              $gray-700 !default;
-
 // Dropdowns
 
 $dropdown-link-hover-color:         $white !default;

data/{app/assets → assets}/stylesheets/bootswatch/sketchy/_bootswatch.scss

@@ -110,6 +110,17 @@ table {
   }
 }
 
+.table-dark {
+  th,
+  td,
+  &.table-hover .table-active:hover > th,
+  &.table-hover .table-active:hover > td {
+    background-color: $gray-800;
+  }
+  
+}
+
+
 // Forms =======================================================================
 
 input,
@@ -144,9 +155,10 @@ select.form-control {
   &:checked:after {
     content: "x";
     position: absolute;
-    left: 4px;
-    top: -7px;
+    left: -0.64em;
+    top: -0.48em;
     font-size: 1.5rem;
+    line-height: 0.5;
     color: $gray-800;
   }
 
@@ -219,10 +231,6 @@ select.form-control {
     &:last-child {
       border-bottom: none;
     }
-
-    &:hover .list-group-item-heading {
-      color: $white;
-    }
   }
 }
 
@@ -323,7 +331,6 @@ select.form-control {
 // Containers ==================================================================
 
 .card {
-  border-color: transparent;
   border-radius: 5px 5px 5px 5px/25px 25px 25px 5px;
   overflow: hidden;
 
@@ -339,6 +346,7 @@ select.form-control {
 
   &-header {
     border-bottom-width: 2px;
+    border-color: inherit;
   }
 
   &-footer {

data/{app/assets → assets}/stylesheets/bootswatch/sketchy/_variables.scss

@@ -35,7 +35,7 @@ $info:          $cyan !default;
 $warning:       $yellow !default;
 $danger:        $red !default;
 $light:         $white !default;
-$dark:          $gray-700;
+$dark:          $gray-700 !default;
 
 // Links
 
@@ -144,12 +144,11 @@ $progress-bar-bg:                   $gray-400 !default;
 
 $list-group-border-color:           $gray-800 !default;
 
-$list-group-hover-bg:               $gray-800 !default;
+$list-group-hover-bg:               $gray-300 !default;
 $list-group-active-color:           $white !default;
 $list-group-active-bg:              $gray-800 !default;
 
 $list-group-action-color:           $gray-800 !default;
-$list-group-action-hover-color:     $white !default;
 
 // Breadcrumbs