Skip to content
This repository was archived by the owner on Jan 8, 2023. It is now read-only.

Update to 3.3.7 #83

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "bootswatch"]
path = bootswatch
url = git@github.com:thomaspark/bootswatch.git
url = https://github.com/thomaspark/bootswatch.git
10 changes: 3 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion bootswatch
Submodule bootswatch updated 295 files
2 changes: 1 addition & 1 deletion lib/bootswatch-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Bootswatch
module Rails
VERSION = '3.3.5'
VERSION = '3.3.7'
end
end
49 changes: 24 additions & 25 deletions vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
Original file line number Diff line number Diff line change
@@ -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%);
Expand All @@ -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);
}
}

Expand Down Expand Up @@ -68,7 +67,7 @@
}

.btn-default {

@include btn-shadow($btn-default-bg);

&:hover {
Expand Down
41 changes: 23 additions & 18 deletions vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Cerulean 3.3.5
$bootstrap-sass-asset-helper: false !default;
// Cerulean 3.3.7
// Variables
// --------------------------------------------------

Expand Down Expand Up @@ -67,7 +68,7 @@ $line-height-computed: floor(($font-size-base * $line-height-base)) !default;
//** By default, this inherits from the `<body>`.
$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;


Expand All @@ -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.
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -189,7 +191,7 @@ $input-color: $text-color !default;
//** `<input>` 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 `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
$input-border-radius: $border-radius-base !default;
Expand Down Expand Up @@ -257,7 +259,7 @@ $dropdown-link-disabled-color: $gray-light !default;
//** Text color for headers within dropdown menus.
$dropdown-header-color: $gray-light !default;

//** Deprecated `@dropdown-caret-color` as of v3.1.0
//** Deprecated `$dropdown-caret-color` as of v3.1.0
$dropdown-caret-color: #000 !default;


Expand All @@ -282,32 +284,32 @@ $zindex-modal: 1050 !default;
//## Define the breakpoints at which your layout will change, adapting to different screen sizes.

// Extra small screen / phone
//** Deprecated `@screen-xs` as of v3.0.1
//** Deprecated `$screen-xs` as of v3.0.1
$screen-xs: 480px !default;
//** Deprecated `@screen-xs-min` as of v3.2.0
//** Deprecated `$screen-xs-min` as of v3.2.0
$screen-xs-min: $screen-xs !default;
//** Deprecated `@screen-phone` as of v3.0.1
//** Deprecated `$screen-phone` as of v3.0.1
$screen-phone: $screen-xs-min !default;

// Small screen / tablet
//** Deprecated `@screen-sm` as of v3.0.1
//** Deprecated `$screen-sm` as of v3.0.1
$screen-sm: 768px !default;
$screen-sm-min: $screen-sm !default;
//** Deprecated `@screen-tablet` as of v3.0.1
//** Deprecated `$screen-tablet` as of v3.0.1
$screen-tablet: $screen-sm-min !default;

// Medium screen / desktop
//** Deprecated `@screen-md` as of v3.0.1
//** Deprecated `$screen-md` as of v3.0.1
$screen-md: 992px !default;
$screen-md-min: $screen-md !default;
//** Deprecated `@screen-desktop` as of v3.0.1
//** Deprecated `$screen-desktop` as of v3.0.1
$screen-desktop: $screen-md-min !default;

// Large screen / wide desktop
//** Deprecated `@screen-lg` as of v3.0.1
//** Deprecated `$screen-lg` as of v3.0.1
$screen-lg: 1200px !default;
$screen-lg-min: $screen-lg !default;
//** Deprecated `@screen-lg-desktop` as of v3.0.1
//** Deprecated `$screen-lg-desktop` as of v3.0.1
$screen-lg-desktop: $screen-lg-min !default;

// So media queries don't overlap when required, provide a maximum
Expand Down Expand Up @@ -337,17 +339,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;

// Small screen / tablet
$container-tablet: (720px + $grid-gutter-width) !default;
//** For `@screen-sm-min` and up.
//** For `$screen-sm-min` and up.
$container-sm: $container-tablet !default;

// Medium screen / desktop
$container-desktop: (940px + $grid-gutter-width) !default;
//** For `@screen-md-min` and up.
//** For `$screen-md-min` and up.
$container-md: $container-desktop !default;

// Large screen / wide desktop
$container-large-desktop: (1140px + $grid-gutter-width) !default;
//** For `@screen-lg-min` and up.
//** For `$screen-lg-min` and up.
$container-lg: $container-large-desktop !default;


Expand Down Expand Up @@ -387,7 +389,7 @@ $navbar-default-toggle-icon-bar-bg: #fff !default;
$navbar-default-toggle-border-color: darken($navbar-default-bg, 10%) !default;


// Inverted navbar
//=== Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color: #fff !default;
$navbar-inverse-bg: $brand-info !default;
Expand Down Expand Up @@ -488,6 +490,7 @@ $jumbotron-color: inherit !default;
$jumbotron-bg: $gray-lighter !default;
$jumbotron-heading-color: inherit !default;
$jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
$jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;


//== Form states and alerts
Expand Down Expand Up @@ -861,5 +864,7 @@ $blockquote-border-color: $gray-lighter !default;
$page-header-border-color: $gray-lighter !default;
//** Width of horizontal description list titles
$dl-horizontal-offset: $component-offset-horizontal !default;
//** Point at which .dl-horizontal becomes horizontal
$dl-horizontal-breakpoint: $grid-float-breakpoint !default;
//** Horizontal line color.
$hr-border: $gray-lighter !default;
86 changes: 47 additions & 39 deletions vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
// Cosmo 3.3.5
// Cosmo 3.3.7
// Bootswatch
// -----------------------------------------------------

@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");
$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" !default;
@import url($web-font-path);

// Navbar =====================================================================

.navbar-inverse {
.navbar {

.badge {
background-color: #fff;
color: $brand-primary;
&-inverse {

.badge {
background-color: #fff;
color: $brand-primary;
}
}
}

// Buttons ====================================================================


// Typography =================================================================

body {
Expand Down Expand Up @@ -198,48 +201,53 @@ table,

// Containers =================================================================

.panel-heading,
.panel-footer {
border-top-right-radius: 0;
border-top-left-radius: 0;
}

.panel-default {
.close {
color: $text-color;
}
}

a.list-group-item-success {
&.active {
background-color: $state-success-bg;
.panel {
&-heading,
&-footer {
border-top-right-radius: 0;
border-top-left-radius: 0;
}

&.active:hover,
&.active:focus {
background-color: darken($state-success-bg, 5%);
&-default {
.close {
color: $text-color;
}
}
}

a.list-group-item-warning {
&.active {
background-color: $state-warning-bg;
}
a.list-group-item {

&.active:hover,
&.active:focus {
background-color: darken($state-warning-bg, 5%);
&-success {
&.active {
background-color: $state-success-bg;
}

&.active:hover,
&.active:focus {
background-color: darken($state-success-bg, 5%);
}
}
}

a.list-group-item-danger {
&.active {
background-color: $state-danger-bg;
&-warning {
&.active {
background-color: $state-warning-bg;
}

&.active:hover,
&.active:focus {
background-color: darken($state-warning-bg, 5%);
}
}

&.active:hover,
&.active:focus {
background-color: darken($state-danger-bg, 5%);
&-danger {
&.active {
background-color: $state-danger-bg;
}

&.active:hover,
&.active:focus {
background-color: darken($state-danger-bg, 5%);
}
}
}

Expand Down
Loading