bootswatch 4.0.0.beta2.1 → 4.0.0.beta3

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

@@ -385,28 +385,10 @@ 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;
+    }
   }
 }
 

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

@@ -99,28 +99,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro" !defau
     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/solar/_variables.scss

@@ -64,7 +64,9 @@ $table-hover-bg:              rgba($white,.075) !default;
 
 $table-border-color:          $component-active-bg !default;
 
-$table-dark-color:            $white !default;
+$table-dark-bg:               $gray-500 !default;
+$table-dark-border-color:     darken($gray-500, 3%) !default;
+$table-dark-color:            $body-bg !default;
 
 // Forms
 
@@ -122,9 +124,9 @@ $jumbotron-bg:                      $gray-800 !default;
 
 // Cards
 
-$card-border-color:                 $gray-800 !default;
-$card-cap-bg:                       $gray-800 !default;
-$card-bg:                           transparent !default;
+$card-border-color:                 rgba($gray-900, .95) !default;
+$card-cap-bg:                       rgba($gray-800, .25) !default;
+$card-bg:                           rgba($gray-200, .125) !default;
 
 // Popovers
 

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

@@ -154,3 +154,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700
 // Progress bars ===============================================================
 
 // Containers ==================================================================
+
+.card,
+.list-group-item {
+  h1, h2, h3, h4, h5, h6 {
+    color: inherit;
+  }
+}

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

@@ -9,10 +9,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !defa
 
 // Navbar ======================================================================
 
-.bg-primary {
-  background-color: $gray-200 !important;
-}
-
 .navbar {
   font-size: $font-size-sm;
 }
@@ -163,28 +159,10 @@ label,
     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/superhero/_variables.scss

@@ -58,8 +58,9 @@ $text-muted:                  rgba(255,255,255,.4) !default;
 $table-accent-bg:             rgba($white,.05) !default;
 $table-hover-bg:              rgba($white,.075) !default;
 
-$table-dark-bg:               $gray-200 !default;
+$table-dark-bg:               $light !default;
 $table-dark-border-color:     $gray-200 !default;
+$table-dark-color:            $body-bg !default;
 
 // Dropdowns
 

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

@@ -13,11 +13,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700" !defaul
 
 .btn {
 
-	&-secondary,
-	&-warning,
-	&-warning:hover {
-		color: $white;
-	}
+  &-secondary,
+  &-warning,
+  &-warning:hover {
+    color: $white;
+  }
 }
 
 // Typography ==================================================================

data/bootswatch.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'sass', '>= 3.5.2'
+  spec.add_runtime_dependency 'autoprefixer-rails', '>= 6.0.3'
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/bootswatch.rb

@@ -1,6 +1,72 @@
 require "bootswatch/version"
 
 module Bootswatch
-  class Engine < ::Rails::Engine
+  #thanks to bootstrap-rubygem
+  class << self
+    # Inspired by Kaminari
+    def load!
+      if rails?
+        register_rails_engine
+      elsif hanami?
+        register_hanami
+      elsif sprockets?
+        register_sprockets
+      end
+
+      configure_sass
+    end
+
+    # Paths
+    def gem_path
+      @gem_path ||= File.expand_path '..', File.dirname(__FILE__)
+    end
+
+    def stylesheets_path
+      File.join assets_path, 'stylesheets'
+    end
+
+    def javascripts_path
+      File.join assets_path, 'javascripts'
+    end
+
+    def assets_path
+      @assets_path ||= File.join gem_path, 'assets'
+    end
+
+    # Environment detection helpers
+    def sprockets?
+      defined?(::Sprockets)
+    end
+
+    def rails?
+      defined?(::Rails)
+    end
+
+    def hanami?
+      defined?(::Hanami)
+    end
+
+    private
+
+    def configure_sass
+      require 'sass'
+
+      ::Sass.load_paths << stylesheets_path
+    end
+
+    def register_rails_engine
+      require 'bootswatch/engine'
+    end
+
+    def register_sprockets
+      Sprockets.append_path(stylesheets_path)
+      Sprockets.append_path(javascripts_path)
+    end
+
+    def register_hanami
+      Hanami::Assets.sources << assets_path
+    end
   end
 end
+
+Bootswatch.load!

data/lib/bootswatch/engine.rb

@@ -0,0 +1,13 @@
+require 'autoprefixer-rails'
+
+module Bootswatch
+  module Rails
+    class Engine < ::Rails::Engine
+      initializer 'bootswatch.assets' do |app|
+        %w(stylesheets javascripts).each do |sub|
+          app.config.assets.paths << root.join('assets', sub).to_s
+        end
+      end
+    end
+  end
+end

data/lib/bootswatch/version.rb

@@ -1,3 +1,3 @@
 module Bootswatch
-  VERSION  = '4.0.0.beta2.1'
+  VERSION  = '4.0.0.beta3'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2.1
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - mkhairi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.2
+- !ruby/object:Gem::Dependency
+  name: autoprefixer-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,50 +78,51 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/cerulean/_variables.scss
-- app/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/cosmo/_variables.scss
-- app/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/cyborg/_variables.scss
-- app/assets/stylesheets/bootswatch/darkly/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/darkly/_variables.scss
-- app/assets/stylesheets/bootswatch/flatly/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/flatly/_variables.scss
-- app/assets/stylesheets/bootswatch/journal/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/journal/_variables.scss
-- app/assets/stylesheets/bootswatch/litera/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/litera/_variables.scss
-- app/assets/stylesheets/bootswatch/lumen/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/lumen/_variables.scss
-- app/assets/stylesheets/bootswatch/lux/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/lux/_variables.scss
-- app/assets/stylesheets/bootswatch/materia/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/materia/_variables.scss
-- app/assets/stylesheets/bootswatch/minty/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/minty/_variables.scss
-- app/assets/stylesheets/bootswatch/pulse/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/pulse/_variables.scss
-- app/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/sandstone/_variables.scss
-- app/assets/stylesheets/bootswatch/simplex/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/simplex/_variables.scss
-- app/assets/stylesheets/bootswatch/sketchy/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/sketchy/_variables.scss
-- app/assets/stylesheets/bootswatch/slate/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/slate/_variables.scss
-- app/assets/stylesheets/bootswatch/solar/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/solar/_variables.scss
-- app/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/spacelab/_variables.scss
-- app/assets/stylesheets/bootswatch/superhero/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/superhero/_variables.scss
-- app/assets/stylesheets/bootswatch/united/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/united/_variables.scss
-- app/assets/stylesheets/bootswatch/yeti/_bootswatch.scss
-- app/assets/stylesheets/bootswatch/yeti/_variables.scss
+- assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
+- assets/stylesheets/bootswatch/cerulean/_variables.scss
+- assets/stylesheets/bootswatch/cosmo/_bootswatch.scss
+- assets/stylesheets/bootswatch/cosmo/_variables.scss
+- assets/stylesheets/bootswatch/cyborg/_bootswatch.scss
+- assets/stylesheets/bootswatch/cyborg/_variables.scss
+- assets/stylesheets/bootswatch/darkly/_bootswatch.scss
+- assets/stylesheets/bootswatch/darkly/_variables.scss
+- assets/stylesheets/bootswatch/flatly/_bootswatch.scss
+- assets/stylesheets/bootswatch/flatly/_variables.scss
+- assets/stylesheets/bootswatch/journal/_bootswatch.scss
+- assets/stylesheets/bootswatch/journal/_variables.scss
+- assets/stylesheets/bootswatch/litera/_bootswatch.scss
+- assets/stylesheets/bootswatch/litera/_variables.scss
+- assets/stylesheets/bootswatch/lumen/_bootswatch.scss
+- assets/stylesheets/bootswatch/lumen/_variables.scss
+- assets/stylesheets/bootswatch/lux/_bootswatch.scss
+- assets/stylesheets/bootswatch/lux/_variables.scss
+- assets/stylesheets/bootswatch/materia/_bootswatch.scss
+- assets/stylesheets/bootswatch/materia/_variables.scss
+- assets/stylesheets/bootswatch/minty/_bootswatch.scss
+- assets/stylesheets/bootswatch/minty/_variables.scss
+- assets/stylesheets/bootswatch/pulse/_bootswatch.scss
+- assets/stylesheets/bootswatch/pulse/_variables.scss
+- assets/stylesheets/bootswatch/sandstone/_bootswatch.scss
+- assets/stylesheets/bootswatch/sandstone/_variables.scss
+- assets/stylesheets/bootswatch/simplex/_bootswatch.scss
+- assets/stylesheets/bootswatch/simplex/_variables.scss
+- assets/stylesheets/bootswatch/sketchy/_bootswatch.scss
+- assets/stylesheets/bootswatch/sketchy/_variables.scss
+- assets/stylesheets/bootswatch/slate/_bootswatch.scss
+- assets/stylesheets/bootswatch/slate/_variables.scss
+- assets/stylesheets/bootswatch/solar/_bootswatch.scss
+- assets/stylesheets/bootswatch/solar/_variables.scss
+- assets/stylesheets/bootswatch/spacelab/_bootswatch.scss
+- assets/stylesheets/bootswatch/spacelab/_variables.scss
+- assets/stylesheets/bootswatch/superhero/_bootswatch.scss
+- assets/stylesheets/bootswatch/superhero/_variables.scss
+- assets/stylesheets/bootswatch/united/_bootswatch.scss
+- assets/stylesheets/bootswatch/united/_variables.scss
+- assets/stylesheets/bootswatch/yeti/_bootswatch.scss
+- assets/stylesheets/bootswatch/yeti/_variables.scss
 - bootswatch.gemspec
 - lib/bootswatch.rb
+- lib/bootswatch/engine.rb
 - lib/bootswatch/version.rb
 homepage: https://github.com/mkhairi/bootswatch-sass
 licenses:
@@ -115,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Bootswatches sass for rails.