diff --git a/.gitmodules b/.gitmodules
index 379cb4d..cff8c91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "bootswatch"]
path = bootswatch
- url = git@github.com:thomaspark/bootswatch.git
+ url = https://github.com/thomaspark/bootswatch.git
diff --git a/Rakefile b/Rakefile
index af5283a..49878b6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,17 +22,13 @@ THEMES = %w(
).freeze
-LESS_FILES = FileList["bootswatch/{#{THEMES.join(',')}}/*.less"]
+LESS_FILES = FileList["bootswatch/{#{THEMES.join(',')}}/_*.scss"]
SCSS_FILES = LESS_FILES.pathmap(
- 'vendor/assets/stylesheets/bootswatch/%-1d/_%n.scss'
+ 'vendor/assets/stylesheets/bootswatch/%-1d/%n.scss'
)
SCSS_FILES.zip(LESS_FILES).each do |target, source|
- directory File.dirname(target)
-
- file target => [File.dirname(target), source] do
- sh "./converter #{source} #{target}"
- end
+ sh "yes | cp #{source} #{target}"
end
desc 'Imprecisely convert LESS files to SCSS files'
diff --git a/bootswatch b/bootswatch
index d2246ac..a4a1888 160000
--- a/bootswatch
+++ b/bootswatch
@@ -1 +1 @@
-Subproject commit d2246acacb1c9ae45a70ab36f3ca980cded0c75b
+Subproject commit a4a1888523044ecc1eccfa93d6cc256c10e7401d
diff --git a/lib/bootswatch-rails/version.rb b/lib/bootswatch-rails/version.rb
index 998e26b..a563c4a 100644
--- a/lib/bootswatch-rails/version.rb
+++ b/lib/bootswatch-rails/version.rb
@@ -1,5 +1,5 @@
module Bootswatch
module Rails
- VERSION = '3.3.5'
+ VERSION = '3.3.7'
end
end
diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
index 6bbdf51..4186d7c 100644
--- a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
+++ b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
@@ -1,8 +1,8 @@
-// Cerulean 3.3.5
+// Cerulean 3.3.7
// Bootswatch
// -----------------------------------------------------
-@mixin btn-shadow($color) {
+@mixin btn-shadow($color){
@include gradient-vertical-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%));
filter: none;
border-bottom: 1px solid darken($color, 10%);
@@ -11,32 +11,31 @@
// Navbar =====================================================================
.navbar {
- @include btn-shadow($navbar-default-bg);
- filter: none;
- @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1));
-}
-
-.navbar .navbar-nav > li > a,
-.navbar-brand {
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
-}
+ &-default {
+ @include btn-shadow($navbar-default-bg);
+ filter: none;
+ @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1));
+
+ .badge {
+ background-color: #fff;
+ color: $navbar-default-bg;
+ }
+ }
-.navbar-default {
+ &-inverse {
+ @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%));
+ filter: none;
+ border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
- .badge {
- background-color: #fff;
- color: $navbar-default-bg;
+ .badge {
+ background-color: #fff;
+ color: $navbar-inverse-bg;
+ }
}
-}
-.navbar-inverse {
- @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%));
- filter: none;
- border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
-
- .badge {
- background-color: #fff;
- color: $navbar-inverse-bg;
+ .navbar-nav > li > a,
+ &-brand {
+ text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
}
}
@@ -68,7 +67,7 @@
}
.btn-default {
-
+
@include btn-shadow($btn-default-bg);
&:hover {
diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
index 3d4375c..db2f809 100644
--- a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
+++ b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
@@ -1,4 +1,5 @@
-// Cerulean 3.3.5
+$bootstrap-sass-asset-helper: false !default;
+// Cerulean 3.3.7
// Variables
// --------------------------------------------------
@@ -67,7 +68,7 @@ $line-height-computed: floor(($font-size-base * $line-height-base)) !default;
//** By default, this inherits from the ``.
$headings-font-family: $font-family-base !default;
$headings-font-weight: 500 !default;
-$headings-line-height: 1.1 !default;
+$headings-line-height: 1.2 !default;
$headings-color: #317EAC !default;
@@ -76,6 +77,7 @@ $headings-color: #317EAC !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
@@ -110,7 +112,7 @@ $component-active-color: #fff !default;
//** Global background color for active items (e.g., navs or dropdowns).
$component-active-bg: $brand-primary !default;
-//** Width of the `border` for generating carets that indicator dropdowns.
+//** Width of the `border` for generating carets that indicate dropdowns.
$caret-width-base: 4px !default;
//** Carets increase slightly in size for larger components.
$caret-width-large: 5px !default;
@@ -189,7 +191,7 @@ $input-color: $text-color !default;
//** `` border color
$input-border: #ccc !default;
-// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
//** Default `.form-control` border radius
// This has no effect on `