bootswatch-sass 3.3.1.4 → 3.3.2

data/assets/stylesheets/simplex/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Simplex 3.3.1
+// Simplex 3.3.2
 // Bootswatch
 // -----------------------------------------------------
 

data/assets/stylesheets/simplex/_variables.scss

@@ -1,4 +1,4 @@
-// Simplex 3.3.1
+// Simplex 3.3.2
 // Variables
 // --------------------------------------------------
 
@@ -99,7 +99,7 @@ $padding-small-horizontal:  10px;
 $padding-xs-vertical:       1px;
 $padding-xs-horizontal:     5px;
 
-$line-height-large:         1.33;
+$line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5;
 
 $border-radius-base:        4px;
@@ -187,6 +187,7 @@ $input-border:                   #ddd;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large;

data/assets/stylesheets/slate/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Slate 3.3.1
+// Slate 3.3.2
 // Bootswatch
 // -----------------------------------------------------
 

data/assets/stylesheets/slate/_variables.scss

@@ -1,4 +1,4 @@
-// Slate 3.3.1
+// Slate 3.3.2
 // Variables
 // --------------------------------------------------
 
@@ -99,7 +99,7 @@ $padding-small-horizontal:  10px;
 $padding-xs-vertical:       1px;
 $padding-xs-horizontal:     5px;
 
-$line-height-large:         1.33;
+$line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5;
 
 $border-radius-base:        4px;
@@ -187,6 +187,7 @@ $input-border:                   #ccc;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large;

data/assets/stylesheets/spacelab/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Spacelab 3.3.1
+// Spacelab 3.3.2
 // Bootswatch
 // -----------------------------------------------------
 

data/assets/stylesheets/spacelab/_variables.scss

@@ -1,4 +1,4 @@
-// Spacelab 3.3.1
+// Spacelab 3.3.2
 // Variables
 // --------------------------------------------------
 
@@ -99,7 +99,7 @@ $padding-small-horizontal:  10px;
 $padding-xs-vertical:       1px;
 $padding-xs-horizontal:     5px;
 
-$line-height-large:         1.33;
+$line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5;
 
 $border-radius-base:        4px;
@@ -187,6 +187,7 @@ $input-border:                   #ccc;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large;

data/assets/stylesheets/superhero/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Superhero 3.3.1
+// Superhero 3.3.2
 // Bootswatch
 // -----------------------------------------------------
 

data/assets/stylesheets/superhero/_variables.scss

@@ -1,4 +1,4 @@
-// Superhero 3.3.1
+// Superhero 3.3.2
 // Variables
 // --------------------------------------------------
 
@@ -99,7 +99,7 @@ $padding-small-horizontal:  10px;
 $padding-xs-vertical:       1px;
 $padding-xs-horizontal:     5px;
 
-$line-height-large:         1.33;
+$line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5;
 
 $border-radius-base:        0;
@@ -187,6 +187,7 @@ $input-border:                   transparent;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large;

data/assets/stylesheets/united/_bootswatch.scss

@@ -1,4 +1,4 @@
-// United 3.3.1
+// United 3.3.2
 // Bootswatch
 // -----------------------------------------------------
 

data/assets/stylesheets/united/_variables.scss

@@ -1,4 +1,4 @@
-// United 3.3.1
+// United 3.3.2
 // Variables
 // --------------------------------------------------
 
@@ -99,7 +99,7 @@ $padding-small-horizontal:  10px;
 $padding-xs-vertical:       1px;
 $padding-xs-horizontal:     5px;
 
-$line-height-large:         1.33;
+$line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5;
 
 $border-radius-base:        4px;
@@ -187,6 +187,7 @@ $input-border:                   #ccc;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large;

data/assets/stylesheets/yeti/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Yeti 3.3.1
+// Yeti 3.3.2
 // Bootswatch
 // -----------------------------------------------------
 

data/assets/stylesheets/yeti/_variables.scss

@@ -1,4 +1,4 @@
-// Yeti 3.3.1
+// Yeti 3.3.2
 // Variables
 // --------------------------------------------------
 
@@ -99,7 +99,7 @@ $padding-small-horizontal:  12px;
 $padding-xs-vertical:       4px;
 $padding-xs-horizontal:     6px;
 
-$line-height-large:         1.33;
+$line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5;
 
 $border-radius-base:        0;
@@ -187,6 +187,7 @@ $input-border:                   #ccc;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large;
@@ -757,10 +758,10 @@ $well-border:                 darken($well-bg, 7%);
 //
 //##
 
-$badge-color:                 #777;
+$badge-color:                 #fff;
 //** Linked badge text color on hover
 $badge-link-hover-color:      #fff;
-$badge-bg:                    $btn-default-bg;
+$badge-bg:                    $btn-primary-bg;
 
 //** Badge text color in active nav link
 $badge-active-color:          $link-color;

data/bootswatch-sass.gemspec

@@ -18,8 +18,8 @@ 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.4'
   spec.add_runtime_dependency 'rails', '>= 4.2.0'
+  spec.add_runtime_dependency 'sass-rails', '~> 5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/bootswatch-sass/engine.rb

@@ -4,7 +4,7 @@ module BootswatchSass
       %w(fonts javascripts stylesheets).each do |sub|
         app.config.assets.paths << root.join('assets', sub).to_s
       end
-      app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
+      app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff|woff2)$)
     end
   end
 end

data/lib/bootswatch-sass/version.rb

@@ -1,3 +1,3 @@
 module BootswatchSass
-  VERSION = '3.3.1.4'
+  VERSION = '3.3.2'
 end

data/test/dummy/Gemfile

@@ -0,0 +1,42 @@
+source 'https://rubygems.org'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.1.0'
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0', group: :doc
+
+# The gem we're building
+gem 'bootswatch-sass', :path => File.expand_path('../../../', __FILE__)
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug'
+
+  # Access an IRB console on exception pages or by using <%= console %> in views
+  gem 'web-console', '~> 2.0'
+end
+

data/test/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,5 @@
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require bootstrap
+//= require_tree ./application

data/test/dummy/app/assets/javascripts/application/main.js

@@ -0,0 +1,40 @@
+$(function() {
+  var $button = $('<div id="source-button" class="btn btn-primary btn-xs">&lt; &gt;</div>').click(function(){
+    var html = $(this).parent().html();
+    html = cleanSource(html);
+    $('#source-modal pre').text(html);
+    $('#source-modal').modal();
+  });
+
+  $('.bs-component [data-toggle="popover"]').popover();
+  $('.bs-component [data-toggle="tooltip"]').tooltip();
+
+  $('.bs-component').hover(function(){
+    $(this).append($button);
+    $button.show();
+  }, function(){
+    $button.hide();
+  });
+
+  function cleanSource(html) {
+    var lines = html.split(/\n/);
+
+    lines.shift();
+    lines.splice(-1, 1);
+
+    var indentSize = lines[0].length - lines[0].trim().length,
+      re = new RegExp(' {' + indentSize + '}');
+
+    lines = lines.map(function(line){
+      if (line.match(re)) {
+        line = line.substring(indentSize);
+      }
+
+      return line;
+    });
+
+    lines = lines.join('\n');
+
+    return lines;
+  }
+});

data/test/dummy/app/assets/stylesheets/application.css.scss

@@ -0,0 +1,6 @@
+/*
+ *= require_self
+ *= require_tree ./application
+ */
+
+@import "bootstrap";

data/test/dummy/app/assets/stylesheets/application/main.css.scss

@@ -0,0 +1,146 @@
+#home {
+  padding-top: 0;
+  .navbar-brand {
+    padding: 13.5px 15px 12.5px;
+    > img {
+      display: inline;
+      margin: 0 10px;
+      height: 100%;
+    }
+  }
+}
+
+.page-header {
+
+  h1 {
+    font-size: 4em;
+  }
+}
+
+.bs-component {
+  position: relative;
+
+  .modal {
+    position: relative;
+    top: auto;
+    right: auto;
+    left: auto;
+    bottom: auto;
+    z-index: 1;
+    display: block;
+
+    &-dialog {
+      width: 90%;
+    }
+  }
+
+  .popover {
+    position: relative;
+    display: inline-block;
+    width: 220px;
+    margin: 20px;
+  }
+}
+
+#source-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 100;
+  font-weight: bold;
+}
+
+.nav-tabs {
+  margin-bottom: 15px;
+}
+
+.progress {
+  margin-bottom: 10px;
+}
+
+footer {
+  margin: 5em 0;
+
+  li {
+    float: left;
+    margin-right: 1.5em;
+    margin-bottom: 1.5em;
+  }
+
+  p {
+    clear: left;
+    margin-bottom: 0;
+  }
+}
+
+.section-tout {
+  padding: 4em 0 3em;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  background-color: #eaf1f1;
+
+  .fa {
+    margin-right: 0.5em;
+  }
+
+  p {
+    margin-bottom: 3em;
+  }
+}
+
+.section-preview {
+  padding: 4em 0 4em;
+
+  .preview {
+
+    margin-bottom: 4em;
+    background-color: #eaf1f1;
+
+    .image {
+      position: relative;
+    }
+
+    .image:before {
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      content: '';
+      pointer-events: none;
+    }
+
+    .options {
+      padding: 1em 2em 2em;
+      border: 1px solid rgba(0, 0, 0, 0.05);
+      border-top: none;
+      text-align: center;
+
+      p {
+        margin-bottom: 2em;
+      }
+    }
+  }
+
+  .dropdown-menu {
+    text-align: left;
+  }
+
+  .lead {
+    margin-bottom: 2em;
+  }
+
+  @media (max-width: 767px) {
+
+    .image img {
+      width: 100%;
+    }
+  }
+}
+
+@media (max-width: 767px) {
+  #banner {
+    margin-bottom: 2em;
+    text-align: center
+  }
+}