bootswatch 4.0.0.beta2.1 → 4.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51a4d169bcf0660c2f9578212374cb9a3e8884ad
-  data.tar.gz: e193a18ed4d2134cc0096b94424f13b8fd644693
+SHA256:
+  metadata.gz: 188783a05fcd6b731d8f68a46a7e0dc2489552e4b7774cead0748e6bb5ecd482
+  data.tar.gz: c3e30c2f53320b5666cf16272ca2ae020854aa74c1337594fa2b6f923446cd42
 SHA512:
-  metadata.gz: 9730682da6b9d757f2451c1a314e7eeb368d70709440e97b6553d389d6fd541f909686057c865095e0e765bac18e2227977553be220f02faceecfd7cacc0a826
-  data.tar.gz: 3888e72be0ef80fc4dbb4aa2c346c0f78159c2a9535ae9d419fb72d483178f1ffad07e74d0524d1dd82060b1ea17e1871d0117c7b08bf4d331afc5efd9243b09
+  metadata.gz: d1e6a8ea1952b5f51d6d4b6c52a835a288f7b737af06e9ef215372a5626c34ee548e9b4326887667ae2dc64e2feda75551c40e74c5f7f66b722d290fd020dd43
+  data.tar.gz: ed4735dfb4639699b5e94dd750df0502af16c3421fffcbf2b6a25768a2e8f9e627001ff5f03f1ad5831de685643f981aeab38d5186deb9125b10fafed1052c9a

data/Rakefile

@@ -29,14 +29,14 @@ source_dir = "bootswatch-src/dist"
 namespace :stylesheets do
   desc "Cleaning stylesheets directory"
   task :clean do
-   rm_rf "app/assets/stylesheets/bootswatch"
+   rm_rf "assets/stylesheets/bootswatch"
   end
 
   desc "Copy #{source_dir}/themes/"
   task :copy do
     THEMES.each do |theme|
       src_dir = FileList["#{source_dir}/#{theme}/*.scss"]
-      tgt_dir = "app/assets/stylesheets/bootswatch/#{theme}/"
+      tgt_dir = "assets/stylesheets/bootswatch/#{theme}/"
       mkdir_p tgt_dir
       cp_r src_dir, tgt_dir
     end
@@ -49,7 +49,7 @@ end
 
 desc "Remove minified file .min"
 task :cleanup do
-  Dir.glob('app/assets/**/*.min.*').each do |file|
+  Dir.glob('assets/**/*.min.*').each do |file|
     rm file
   end
 end

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

@@ -60,6 +60,17 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, 0.05) !default;
 
 // Typography ==================================================================
 
+.bg-primary,
+.bg-success,
+.bg-info,
+.bg-warning,
+.bg-danger,
+.bg-dark {
+  h1, h2, h3, h4, h5, h6 {
+    color: $white;
+  }
+}
+
 // Tables ======================================================================
 
 // Forms =======================================================================

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

@@ -25,10 +25,6 @@ body {
 
 // Indicators ==================================================================
 
-.alert {
-  border: none;
-}
-
 // Progress bars ===============================================================
 
 .progress {

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

@@ -37,15 +37,13 @@ $danger:        $red !default;
 $light:         $gray-100 !default;
 $dark:          $gray-800 !default;
 
-// Body
+// Options
 
-$body-color:    $gray-800 !default;
+$enable-rounded: false !default;
 
-// Components
+// Body
 
-$border-radius:          0 !default;
-$border-radius-lg:       0 !default;
-$border-radius-sm:       0 !default;
+$body-color:    $gray-800 !default;
 
 // Fonts
 
@@ -61,6 +59,10 @@ $navbar-dark-hover-color:           rgba($white,1) !default;
 
 $navbar-light-hover-color:          rgba($black,.9) !default;
 
+// Alerts
+
+$alert-border-width:                0 !default;
+
 // Progress bars
 
 $progress-height:               8px !default;

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

@@ -165,33 +165,14 @@ legend,
     text-decoration: underline;
   }
 
-  &-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;
+    }
   }
 }
 
 .badge {
-
   &-warning {
     color: $white;
   }
@@ -210,7 +191,6 @@ legend,
 // Containers ==================================================================
 
 .list-group-item {
-
   &:hover {
     background-color: $gray-700;
     color: #fff;
@@ -229,14 +209,10 @@ legend,
   }
 }
 
-.card {
-  &-header {
-    background-color: $gray-800;
-  }
-
-  &-header,
-  &-title {
-    color: #fff;
+.card,
+.list-group-item {
+  h1, h2, h3, h4, h5, h6 {
+    color: inherit;
   }
 }
 

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

@@ -66,7 +66,9 @@ $table-border-color:            $gray-700 !default;
 
 $table-head-color:              $white !default;
 
-$table-inverse-color:           $white !default;
+$table-dark-bg:               $gray-500 !default;
+$table-dark-border-color:     darken($gray-500, 7.5%) !default;
+$table-dark-color:            $body-bg !default;
 
 // Buttons
 
@@ -76,7 +78,7 @@ $input-btn-padding-x:       1rem !default;
 
 $input-disabled-bg:              $gray-400 !default;
 
-$input-border-color:			 transparent !default;
+$input-border-color:             transparent !default;
 
 $input-group-addon-bg:           $gray-700 !default;
 
@@ -121,8 +123,6 @@ $jumbotron-bg:                   $gray-700 !default;
 
 // Cards
 
-$card-border-color:        $gray-700 !default;
-$card-cap-bg:              $gray-800 !default;
 $card-bg:                  $gray-700 !default;
 
 // Tooltips

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

@@ -9,8 +9,21 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
 
 // Navbar ======================================================================
 
+.bg-primary {
+  .navbar-nav .active > .nav-link {
+    color: $success !important;
+  }
+}
+
 .bg-dark {
   background-color: $success !important;
+  &.navbar-dark .navbar-nav {
+    .nav-link:focus,
+    .nav-link:hover,
+    .active > .nav-link {
+      color: $primary !important;
+    }
+  }
 }
 
 // Buttons =====================================================================
@@ -107,7 +120,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
   .nav-link,
   .nav-link.active,
   .nav-link.active:focus,
-  .nav-link.active:hover, 
+  .nav-link.active:hover,
   .nav-item.open .nav-link,
   .nav-item.open .nav-link:focus,
   .nav-item.open .nav-link:hover {
@@ -146,28 +159,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
     text-decoration: underline;
   }
 
-  &-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;
+    }
   }
 }
 

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

@@ -58,9 +58,13 @@ $table-accent-bg:             $gray-800 !default;
 
 $table-border-color:          $gray-700 !default;
 
+$table-dark-bg:               $gray-500 !default;
+$table-dark-border-color:     darken($gray-500, 7.5%) !default;
+$table-dark-color:            $body-bg !default;
+
 // Forms
 
-$input-border-color:					transparent !default;
+$input-border-color:                    transparent !default;
 
 $input-group-addon-bg:                  $gray-700 !default;
 
@@ -90,6 +94,12 @@ $navbar-padding-y:                  1rem !default;
 $navbar-dark-color:                 $white !default;
 $navbar-dark-hover-color:           $success !default;
 
+$navbar-light-color:                rgba($white,.5) !default;
+$navbar-light-hover-color:          $white !default;
+$navbar-light-active-color:         $white !default;
+$navbar-light-disabled-color:       rgba($white,.3) !default;
+$navbar-light-toggler-border-color: rgba($white,.1) !default;
+
 // Pagination
 
 $pagination-color:                  $white !default;

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

@@ -9,27 +9,20 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
 
 // Navbar =======================================================================
 
-.bg-dark {
-  background-color: $success !important;
-
-  &.navbar-inverse .navbar-nav .nav-link:focus,
-  &.navbar-inverse .navbar-nav .nav-link:hover {
-    color: $primary !important;
+.bg-primary {
+  .navbar-nav .active > .nav-link {
+    color: $success !important;
   }
 }
 
-.navbar {
-
-  &-brand {
-    margin-right: 2rem;
-  }
-
-  &-nav .nav-item + .nav-item {
-    margin-left: 2rem;
-  }
-
-  &-nav .nav-link {
-    padding-top: 0.5rem;
+.bg-dark {
+  background-color: $success !important;
+  &.navbar-dark .navbar-nav {
+    .nav-link:focus,
+    .nav-link:hover,
+    .active > .nav-link {
+      color: $primary !important;
+    }
   }
 }
 
@@ -121,7 +114,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
 .nav-tabs {
   .nav-link.active,
   .nav-link.active:focus,
-  .nav-link.active:hover, 
+  .nav-link.active:hover,
   .nav-item.open .nav-link,
   .nav-item.open .nav-link:focus,
   .nav-item.open .nav-link:hover {
@@ -165,31 +158,16 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
     text-decoration: underline;
   }
 
-  &-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;
+    }
   }
 }
 
 // Progress bars ===============================================================
 
 // Containers ==================================================================
+.modal .close{
+  color: $black;
+}

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

@@ -12,7 +12,7 @@ $font-family-serif:      Georgia, Cambria, "Times New Roman", Times, serif !defa
 // Navbar ======================================================================
 
 .navbar {
-  font-size: 14px;
+  font-size: 0.875em;
 }
 
 .bg-dark {
@@ -35,17 +35,17 @@ $font-family-serif:      Georgia, Cambria, "Times New Roman", Times, serif !defa
 // Buttons =====================================================================
 
 .btn {
-  border-radius: 17.25px;
+  border-radius: 1.078em;
   font-family: $font-family-sans-serif;
-  font-size: 14px;
+  font-size: 0.875em;
 
   &-lg {
-    border-radius: 43px;
+    border-radius: 2.688em;
   }
 
   &-sm {
-    border-radius: 13.5px;
-    font-size: 11px;
+    border-radius: 0.844em;
+    font-size: 0.688em;
   }
 
   &-secondary,
@@ -67,7 +67,7 @@ blockquote {
 }
 
 footer {
-  font-size: 14px;
+  font-size: 0.875em;
 }
 
 .lead {
@@ -79,7 +79,7 @@ footer {
 
 table,
 .table {
-  font-size: 14px;
+  font-size: 0.875em;
 
   &-success,
   &-info,
@@ -151,11 +151,11 @@ table,
 .nav,
 .breadcrumb,
 .pagination {
-  font-size: 14px;
+  font-size: 0.875em;
 }
 
 .dropdown-menu {
-  font-size: 14px;
+  font-size: 0.875em;
 }
 
 // Indicators ==================================================================
@@ -163,7 +163,7 @@ table,
 .alert {
   border: none;
   color: $white;
-  font-size: 14px;
+  font-size: 0.875em;
 
   &, p {
     font-family: $font-family-sans-serif;
@@ -175,28 +175,10 @@ table,
     text-decoration: underline;
   }
 
-  &-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;
+    }
   }
 }
 
@@ -218,5 +200,5 @@ table,
 // Containers ==================================================================
 
 .list-group {
-  font-size: 14px;
+  font-size: 0.875em;
 }