From 4ae0a7ecd466af14ce6eb65ebf015c54ed858029 Mon Sep 17 00:00:00 2001 From: 1v Date: Thu, 3 Nov 2016 16:28:19 +0100 Subject: [PATCH 1/6] Update to 3.3.7 --- .gitmodules | 2 +- .../bootswatch/cerulean/_bootswatch.scss | 38 +- .../bootswatch/cerulean/_variables.scss | 3 +- .../bootswatch/cosmo/_bootswatch.scss | 83 +++-- .../bootswatch/cyborg/_bootswatch.scss | 64 ++-- .../bootswatch/darkly/_bootswatch.scss | 109 +++--- .../bootswatch/flatly/_bootswatch.scss | 105 +++--- .../bootswatch/journal/_bootswatch.scss | 41 ++- .../bootswatch/journal/_variables.scss | 4 +- .../bootswatch/lumen/_bootswatch.scss | 174 ++++----- .../bootswatch/paper/_bootswatch.scss | 346 +++++++----------- .../bootswatch/paper/_variables.scss | 60 +-- .../bootswatch/readable/_bootswatch.scss | 85 ++--- .../bootswatch/sandstone/_bootswatch.scss | 77 ++-- .../bootswatch/sandstone/_variables.scss | 38 +- .../bootswatch/simplex/_bootswatch.scss | 13 +- .../bootswatch/slate/_bootswatch.scss | 110 +++--- .../bootswatch/spacelab/_bootswatch.scss | 129 ++++--- .../bootswatch/superhero/_bootswatch.scss | 116 +++--- .../bootswatch/superhero/_variables.scss | 70 ++-- .../bootswatch/united/_bootswatch.scss | 24 +- .../bootswatch/united/_variables.scss | 1 + .../bootswatch/yeti/_bootswatch.scss | 182 ++++----- .../bootswatch/yeti/_variables.scss | 1 + 24 files changed, 910 insertions(+), 965 deletions(-) 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/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss index 6bbdf51..f0c5564 100644 --- a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss @@ -14,29 +14,29 @@ @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); -} -.navbar-default { + .navbar-default { - .badge { - background-color: #fff; - color: $navbar-default-bg; + .badge { + background-color: #fff; + color: $navbar-default-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%); + .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; + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } + } + + .navbar-nav > li > a, + .navbar-brand { + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); } } @@ -68,7 +68,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..3acc532 100644 --- a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss @@ -387,7 +387,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; @@ -488,6 +488,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 diff --git a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss index 7463023..54a16b7 100644 --- a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss @@ -2,21 +2,23 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"); +@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"); // Navbar ===================================================================== -.navbar-inverse { +.navbar { - .badge { - background-color: #fff; - color: $brand-primary; + .navbar-inverse { + + .badge { + background-color: #fff; + color: $brand-primary; + } } } // Buttons ==================================================================== - // Typography ================================================================= body { @@ -198,48 +200,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 { + .panel-heading, + .panel-footer { + border-top-right-radius: 0; + border-top-left-radius: 0; } - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); + .panel-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%); + a.list-group-item-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; + a.list-group-item-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%); + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } diff --git a/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss index 6bad400..04d41ce 100644 --- a/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Roboto:400,700"); +@import url("https://fonts.googleapis.com/css?family=Roboto:400,700"); // Navbar ===================================================================== @@ -191,38 +191,38 @@ a.list-group-item { &.active:focus { border-color: $list-group-border; } -} - -a.list-group-item-success { - &.active { - background-color: $state-success-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); - } -} - -a.list-group-item-warning { - &.active { - background-color: $state-warning-bg; - } - &.active:hover, - &.active:focus { - background-color: darken($state-warning-bg, 5%); - } -} - -a.list-group-item-danger { - &.active { - background-color: $state-danger-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-danger-bg, 5%); + a.list-group-item-success { + &.active { + background-color: $state-success-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-success-bg, 5%); + } + } + + a.list-group-item-warning { + &.active { + background-color: $state-warning-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-warning-bg, 5%); + } + } + + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } diff --git a/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss index 1043ac7..819c3ba 100644 --- a/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss @@ -2,40 +2,40 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Lato:400,700,400italic"); +@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); // Navbar ===================================================================== .navbar { border-width: 0; -} -.navbar-default { + .navbar-default { - .badge { - background-color: #fff; - color: $navbar-default-bg; + .badge { + background-color: #fff; + color: $navbar-default-bg; + } } -} -.navbar-inverse { + .navbar-inverse { - .badge { - background-color: #fff; - color: $navbar-inverse-bg; + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } } -} -.navbar-brand { - line-height: 1; -} + .navbar-brand { + line-height: 1; + } -.navbar-form { - .form-control { - background-color: white; + .navbar-form { + .form-control { + background-color: white; - &:focus { - border-color: white; + &:focus { + border-color: white; + } } } } @@ -116,15 +116,14 @@ table, border: none; } -} - -.table-bordered > thead > tr > th, -.table-bordered > tbody > tr > th, -.table-bordered > tfoot > tr > th, -.table-bordered > thead > tr > td, -.table-bordered > tbody > tr > td, -.table-bordered > tfoot > tr > td { - border: 1px solid $table-border-color; + .table-bordered > thead > tr > th, + .table-bordered > tbody > tr > th, + .table-bordered > tfoot > tr > th, + .table-bordered > thead > tr > td, + .table-bordered > tbody > tr > td, + .table-bordered > tfoot > tr > td { + border: 1px solid $table-border-color; + } } // Forms ====================================================================== @@ -303,38 +302,38 @@ a.list-group-item { &.active:focus { border-color: $list-group-border; } -} - -a.list-group-item-success { - &.active { - background-color: $state-success-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); - } -} -a.list-group-item-warning { - &.active { - background-color: $state-warning-bg; - } + a.list-group-item-success { + &.active { + background-color: $state-success-bg; + } - &.active:hover, - &.active:focus { - background-color: darken($state-warning-bg, 5%); + &.active:hover, + &.active:focus { + background-color: darken($state-success-bg, 5%); + } } -} -a.list-group-item-danger { - &.active { - background-color: $state-danger-bg; + a.list-group-item-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%); + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } diff --git a/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss index 04b0b9d..ae5cd59 100644 --- a/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss @@ -2,32 +2,32 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Lato:400,700,400italic"); +@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); // Navbar ===================================================================== .navbar { border-width: 0; -} -.navbar-default { + .navbar-default { - .badge { - background-color: #fff; - color: $navbar-default-bg; + .badge { + background-color: #fff; + color: $navbar-default-bg; + } } -} -.navbar-inverse { + .navbar-inverse { - .badge { - background-color: #fff; - color: $navbar-inverse-bg; + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } } -} -.navbar-brand { - line-height: 1; + .navbar-brand { + line-height: 1; + } } // Buttons ==================================================================== @@ -106,15 +106,14 @@ table, border: none; } -} - -.table-bordered > thead > tr > th, -.table-bordered > tbody > tr > th, -.table-bordered > tfoot > tr > th, -.table-bordered > thead > tr > td, -.table-bordered > tbody > tr > td, -.table-bordered > tfoot > tr > td { - border: 1px solid $table-border-color; + .table-bordered > thead > tr > th, + .table-bordered > tbody > tr > th, + .table-bordered > tfoot > tr > th, + .table-bordered > thead > tr > td, + .table-bordered > tbody > tr > td, + .table-bordered > tfoot > tr > td { + border: 1px solid $table-border-color; + } } // Forms ====================================================================== @@ -276,44 +275,46 @@ a.list-group-item { &.active:focus { border-color: $list-group-border; } -} - -a.list-group-item-success { - &.active { - background-color: $state-success-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); - } -} -a.list-group-item-warning { - &.active { - background-color: $state-warning-bg; - } + a.list-group-item-success { + &.active { + background-color: $state-success-bg; + } - &.active:hover, - &.active:focus { - background-color: darken($state-warning-bg, 5%); + &.active:hover, + &.active:focus { + background-color: darken($state-success-bg, 5%); + } } -} -a.list-group-item-danger { - &.active { - background-color: $state-danger-bg; + a.list-group-item-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%); + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } -.panel-default { - .close { - color: $text-color; +.panel { + .panel-default { + .close { + color: $text-color; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss index 895e107..c06b004 100644 --- a/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=News+Cycle:400,700"); +@import url("https://fonts.googleapis.com/css?family=News+Cycle:400,700"); // Navbar ===================================================================== @@ -10,21 +10,21 @@ font-size: 18px; font-family: $font-family-sans-serif; font-weight: $headings-font-weight; -} -.navbar-default { + .navbar-default { - .badge { - background-color: #000; - color: #fff; + .badge { + background-color: #000; + color: #fff; + } } -} -.navbar-inverse { + .navbar-inverse { - .badge { - background-color: #fff; - color: $navbar-inverse-bg; + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } } } @@ -128,12 +128,17 @@ } } -.panel-primary, -.panel-success, -.panel-warning, -.panel-danger, -.panel-info { - .panel-title { - color: #fff; +.panel { + + .panel-primary, + .panel-success, + .panel-warning, + .panel-danger, + .panel-info { + .panel-title { + color: #fff; + } } + + } diff --git a/vendor/assets/stylesheets/bootswatch/journal/_variables.scss b/vendor/assets/stylesheets/bootswatch/journal/_variables.scss index d3e22e5..f9587d9 100644 --- a/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/journal/_variables.scss @@ -387,13 +387,13 @@ $navbar-default-toggle-icon-bar-bg: #ccc !default; $navbar-default-toggle-border-color: #ddd !default; -// Inverted navbar +//=== Inverted navbar // Reset inverted navbar basics $navbar-inverse-color: #fff !default; $navbar-inverse-bg: $brand-primary !default; $navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default; -//=== Inverted navbar links +// Inverted navbar links $navbar-inverse-link-color: #fff !default; $navbar-inverse-link-hover-color: #fff !default; $navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 6.5%) !default; diff --git a/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss index 5e21b49..8e85e3a 100644 --- a/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss @@ -2,9 +2,9 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); +@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); -@mixin shadow($width: 4px) { +.shadow ($width: 4px) { border-width: 0 1px $width 1px; } @@ -33,68 +33,68 @@ border-bottom-width: 2px; @include box-shadow(none); } -} -.btn-lg, -.btn-group-lg > .btn { - padding: ($padding-large-vertical + 2) $padding-large-horizontal $padding-large-vertical; - line-height: 15px; -} + .btn-lg, + .btn-group-lg > .btn { + padding: ($padding-large-vertical + 2) $padding-large-horizontal $padding-large-vertical; + line-height: 15px; + } -.btn-sm, -.btn-group-sm > .btn { - padding: ($padding-small-vertical + 2) $padding-small-horizontal $padding-small-vertical; -} + .btn-sm, + .btn-group-sm > .btn { + padding: ($padding-small-vertical + 2) $padding-small-horizontal $padding-small-vertical; + } -.btn-xs, -.btn-group-xs > .btn { - padding: ($padding-xs-vertical + 2) $padding-xs-horizontal $padding-xs-vertical; -} + .btn-xs, + .btn-group-xs > .btn { + padding: ($padding-xs-vertical + 2) $padding-xs-horizontal $padding-xs-vertical; + } -.btn-default:hover, -.btn-default:focus, -.btn-group.open .dropdown-toggle.btn-default { - background-color: $btn-default-bg; - border-color: $btn-default-border; -} + .btn-default:hover, + .btn-default:focus, + .btn-group.open .dropdown-toggle.btn-default { + background-color: $btn-default-bg; + border-color: $btn-default-border; + } -.btn-primary:hover, -.btn-primary:focus, -.btn-group.open .dropdown-toggle.btn-primary { - background-color: $btn-primary-bg; - border-color: $btn-primary-border; -} + .btn-primary:hover, + .btn-primary:focus, + .btn-group.open .dropdown-toggle.btn-primary { + background-color: $btn-primary-bg; + border-color: $btn-primary-border; + } -.btn-success:hover, -.btn-success:focus, -.btn-group.open .dropdown-toggle.btn-success { - background-color: $btn-success-bg; - border-color: $btn-success-border; -} + .btn-success:hover, + .btn-success:focus, + .btn-group.open .dropdown-toggle.btn-success { + background-color: $btn-success-bg; + border-color: $btn-success-border; + } -.btn-info:hover, -.btn-info:focus, -.btn-group.open .dropdown-toggle.btn-info { - background-color: $btn-info-bg; - border-color: $btn-info-border; -} + .btn-info:hover, + .btn-info:focus, + .btn-group.open .dropdown-toggle.btn-info { + background-color: $btn-info-bg; + border-color: $btn-info-border; + } -.btn-warning:hover, -.btn-warning:focus, -.btn-group.open .dropdown-toggle.btn-warning { - background-color: $btn-warning-bg; - border-color: $btn-warning-border; -} + .btn-warning:hover, + .btn-warning:focus, + .btn-group.open .dropdown-toggle.btn-warning { + background-color: $btn-warning-bg; + border-color: $btn-warning-border; + } -.btn-danger:hover, -.btn-danger:focus, -.btn-group.open .dropdown-toggle.btn-danger { - background-color: $btn-danger-bg; - border-color: $btn-danger-border; -} + .btn-danger:hover, + .btn-danger:focus, + .btn-group.open .dropdown-toggle.btn-danger { + background-color: $btn-danger-bg; + border-color: $btn-danger-border; + } -.btn-group.open .dropdown-toggle { - @include box-shadow(none); + .btn-group.open .dropdown-toggle { + @include box-shadow(none); + } } .navbar-btn { @@ -438,10 +438,10 @@ label { .progress { border: 1px solid $navbar-default-border; @include box-shadow(inset 0 2px 0 rgba(0, 0, 0, 0.1)); -} -.progress-bar { - @include box-shadow(inset 0 -4px 0 rgba(0, 0, 0, 0.15)); + .progress-bar { + @include box-shadow(inset 0 -4px 0 rgba(0, 0, 0, 0.15)); + } } // Containers ================================================================= @@ -458,38 +458,38 @@ a.list-group-item { &.active:focus { border-color: $list-group-border; } -} - -a.list-group-item-success { - &.active { - background-color: $state-success-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); - } -} -a.list-group-item-warning { - &.active { - background-color: $state-warning-bg; - } + a.list-group-item-success { + &.active { + background-color: $state-success-bg; + } - &.active:hover, - &.active:focus { - background-color: darken($state-warning-bg, 5%); + &.active:hover, + &.active:focus { + background-color: darken($state-success-bg, 5%); + } } -} -a.list-group-item-danger { - &.active { - background-color: $state-danger-bg; + a.list-group-item-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%); + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } @@ -501,11 +501,11 @@ a.list-group-item-danger { .panel { border: 1px solid $navbar-default-border; @include shadow(); -} -.panel-default { - .close { - color: $text-color; + .panel-default { + .close { + color: $text-color; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss index 4be7393..880ec4e 100644 --- a/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss @@ -2,30 +2,30 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Roboto:300,400,500,700"); +@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"); // Navbar ===================================================================== .navbar { border: none; @include box-shadow(0 1px 2px rgba(0,0,0,.3)); -} -.navbar-brand { - font-size: 24px; -} + .navbar-brand { + font-size: 24px; + } -.navbar-inverse { - .form-control { - color: #fff; - @include placeholder($navbar-inverse-link-color); + .navbar-inverse { + .form-control { + color: #fff; + @include placeholder($navbar-inverse-link-color); - &[type=text], - &[type=password] { - @include box-shadow(inset 0 -1px 0 $navbar-inverse-link-color); + &[type=text], + &[type=password] { + @include box-shadow(inset 0 -1px 0 $navbar-inverse-link-color); - &:focus { - @include box-shadow(inset 0 -2px 0 #fff); + &:focus { + @include box-shadow(inset 0 -2px 0 #fff); + } } } } @@ -33,113 +33,32 @@ // Buttons ==================================================================== -.btn-default { - background-size: 200%; - background-position: 50%; - - &:hover, - &:active:hover, - &:focus { - background-color: darken($btn-default-bg, 6%); - } - - &:active { - background-color: darken($btn-default-bg, 6%); - @include gradient-radial(darken($btn-default-bg, 6%) 10%, $btn-default-bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); - } -} - -.btn-primary { - background-size: 200%; - background-position: 50%; - - &:hover, - &:active:hover, - &:focus { - background-color: darken($btn-primary-bg, 6%); - } - - &:active { - background-color: darken($btn-primary-bg, 6%); - @include gradient-radial(darken($btn-primary-bg, 6%) 10%, $btn-primary-bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); - } -} +#btn($class,$bg) { + .btn-@{class} { + background-size: 200%; + background-position: 50%; -.btn-success { - background-size: 200%; - background-position: 50%; - - &:hover, - &:active:hover, - &:focus { - background-color: darken($btn-success-bg, 6%); - } - - &:active { - background-color: darken($btn-success-bg, 6%); - @include gradient-radial(darken($btn-success-bg, 6%) 10%, $btn-success-bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); - } -} - -.btn-info { - background-size: 200%; - background-position: 50%; - - &:hover, - &:active:hover, - &:focus { - background-color: darken($btn-info-bg, 6%); - } - - &:active { - background-color: darken($btn-info-bg, 6%); - @include gradient-radial(darken($btn-info-bg, 6%) 10%, $btn-info-bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); - } -} - -.btn-warning { - background-size: 200%; - background-position: 50%; - - &:hover, - &:active:hover, - &:focus { - background-color: darken($btn-warning-bg, 6%); - } + &:hover, + &:active:hover, + &:focus { + background-color: darken($bg, 6%); + } - &:active { - background-color: darken($btn-warning-bg, 6%); - @include gradient-radial(darken($btn-warning-bg, 6%) 10%, $btn-warning-bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); + &:active { + background-color: darken($bg, 6%); + @include gradient-radial(darken($bg, 6%) 10%, $bg 11%); + background-size: 1000%; + @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); + } } } -.btn-danger { - background-size: 200%; - background-position: 50%; - - &:hover, - &:active:hover, - &:focus { - background-color: darken($btn-danger-bg, 6%); - } - - &:active { - background-color: darken($btn-danger-bg, 6%); - @include gradient-radial(darken($btn-danger-bg, 6%) 10%, $btn-danger-bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); - } -} +#btn(default,$btn-default-bg); +#btn(primary,$btn-primary-bg); +#btn(success,$btn-success-bg); +#btn(info,$btn-info-bg); +#btn(warning,$btn-warning-bg); +#btn(danger,$btn-danger-bg); .btn { text-transform: uppercase; @@ -147,20 +66,20 @@ border-bottom: none; @include box-shadow(1px 1px 2px rgba(0,0,0,.3)); @include transition(all 0.2s); -} -.btn-link { - @include box-shadow(none); + .btn-link { + @include box-shadow(none); - &:hover, - &:focus { - color: $brand-primary; - text-decoration: none; + &:hover, + &:focus { + color: $brand-primary; + text-decoration: none; + } } -} -.btn-default.disabled { - border: 1px solid $btn-default-border; + .btn-default.disabled { + border: 1px solid $btn-default-border; + } } .btn-group { @@ -170,14 +89,14 @@ .btn-group + .btn-group { margin-left: 0; } -} -.btn-group-vertical { - > .btn + .btn, - > .btn + .btn-group, - > .btn-group + .btn, - > .btn-group + .btn-group { - margin-top: 0; + .btn-group-vertical { + > .btn + .btn, + > .btn + .btn-group, + > .btn-group + .btn, + > .btn-group + .btn-group { + margin-top: 0; + } } } @@ -249,12 +168,14 @@ input[type=number], border-bottom: 1px dotted #ddd; } - &.input-sm { - font-size: $font-size-small; - } + &.input { + &.input-sm { + font-size: $font-size-small; + } - &.input-lg { - font-size: $font-size-large; + &.input-lg { + font-size: $font-size-large; + } } } @@ -279,12 +200,14 @@ select.form-control { display: none; } - &.input-sm { - font-size: $font-size-small; - } + &.input { + &.input-sm { + font-size: $font-size-small; + } - &.input-lg { - font-size: $font-size-large; + &.input-lg { + font-size: $font-size-large; + } } &:focus { @@ -344,11 +267,7 @@ input[type="radio"], left: 0; top: 0; background-color: $brand-primary; - - -webkit-transform: scale(0); - -ms-transform: scale(0); // IE9 only - -o-transform: scale(0); - transform: scale(0); + @include scale(0); } &:after { @@ -356,10 +275,7 @@ input[type="radio"], } &:checked:before { - -webkit-transform: scale(0.5); - -ms-transform: scale(0.5); // IE9 only - -o-transform: scale(0.5); - transform: scale(0.5); + @include scale(0.5); } &:disabled:checked:before { @@ -522,6 +438,22 @@ input[type="checkbox"], border: none; color: #fff; + .alert-success { + background-color: $brand-success; + } + + .alert-info { + background-color: $brand-info; + } + + .alert-warning { + background-color: $brand-warning; + } + + .alert-danger { + background-color: $brand-danger; + } + a:not(.close), .alert-link { color: #fff; @@ -533,22 +465,6 @@ input[type="checkbox"], } } -.alert-success { - background-color: $brand-success; -} - -.alert-info { - background-color: $brand-info; -} - -.alert-warning { - background-color: $brand-warning; -} - -.alert-danger { - background-color: $brand-danger; -} - .badge { padding: 3px 6px 5px; } @@ -560,44 +476,43 @@ input[type="checkbox"], border-radius: 0; @include box-shadow(none); -} -.progress-bar { - @include box-shadow(none); + .progress-bar { + @include box-shadow(none); - &:last-child { - border-radius: 0 3px 3px 0; - } - - &:last-child { - &:before { - display: block; - content: ""; - position: absolute; - width: 100%; - height: 100%; - left: 0; - right: 0; - z-index: -1; - background-color: lighten($progress-bar-bg, 35%); + &:last-child { + border-radius: 0 3px 3px 0; } - } -} -.progress-bar-success:last-child.progress-bar:before { - background-color: lighten($brand-success, 35%); -} + &:last-child { + &:before { + display: block; + content: ""; + position: absolute; + width: 100%; + height: 100%; + left: 0; + right: 0; + z-index: -1; + background-color: lighten($progress-bar-bg, 35%); + } + } -.progress-bar-info:last-child.progress-bar:before { - background-color: lighten($brand-info, 45%); -} + &-bar-success:last-child.progress-bar:before { + background-color: lighten($brand-success, 35%); + } -.progress-bar-warning:last-child.progress-bar:before { - background-color: lighten($brand-warning, 35%); -} + &-bar-info:last-child.progress-bar:before { + background-color: lighten($brand-info, 45%); + } + &-bar-warning:last-child.progress-bar:before { + background-color: lighten($brand-warning, 35%); + } -.progress-bar-danger:last-child.progress-bar:before { - background-color: lighten($brand-danger, 25%); + &-bar-danger:last-child.progress-bar:before { + background-color: lighten($brand-danger, 25%); + } + } } // Progress bars ============================================================== @@ -616,12 +531,15 @@ input[type="checkbox"], } } -.list-group-item { - padding: 15px; -} +.list-group { -.list-group-item-text { - color: $gray-light; + .list-group-item { + padding: 15px; + } + + .list-group-item-text { + color: $gray-light; + } } .well { @@ -633,14 +551,14 @@ input[type="checkbox"], border: none; border-radius: 2px; @include box-shadow(0 1px 4px rgba(0,0,0,.3)); -} -.panel-heading { - border-bottom: none; -} + .panel-heading { + border-bottom: none; + } -.panel-footer { - border-top: none; + .panel-footer { + border-top: none; + } } .popover { @@ -648,9 +566,11 @@ input[type="checkbox"], @include box-shadow(0 1px 4px rgba(0,0,0,.3)); } -.carousel-caption { - h1, h2, h3, h4, h5, h6 { - color: inherit; +.carousel { + .carousel-caption { + h1, h2, h3, h4, h5, h6 { + color: inherit; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/paper/_variables.scss b/vendor/assets/stylesheets/bootswatch/paper/_variables.scss index 98bbf65..244eede 100644 --- a/vendor/assets/stylesheets/bootswatch/paper/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/paper/_variables.scss @@ -126,7 +126,7 @@ $table-cell-padding: 8px !default; $table-condensed-cell-padding: 5px !default; //** Default background color used for all tables. -$table-bg: hsla(0, 100%, 100%, 0) !default; +$table-bg: transparent !default; //** Background color used for `.table-striped`. $table-bg-accent: #f9f9f9 !default; //** Background color used for `.table-hover`. @@ -149,23 +149,23 @@ $btn-default-border: #eee !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; -$btn-primary-border: hsla(0, 100%, 100%, 0) !default; +$btn-primary-border: transparent !default; $btn-success-color: #fff !default; $btn-success-bg: $brand-success !default; -$btn-success-border: hsla(0, 100%, 100%, 0) !default; +$btn-success-border: transparent !default; $btn-info-color: #fff !default; $btn-info-bg: $brand-info !default; -$btn-info-border: hsla(0, 100%, 100%, 0) !default; +$btn-info-border: transparent !default; $btn-warning-color: #fff !default; $btn-warning-bg: $brand-warning !default; -$btn-warning-border: hsla(0, 100%, 100%, 0) !default; +$btn-warning-border: transparent !default; $btn-danger-color: #fff !default; $btn-danger-bg: $brand-danger !default; -$btn-danger-border: hsla(0, 100%, 100%, 0) !default; +$btn-danger-border: transparent !default; $btn-link-disabled-color: $gray-light !default; @@ -180,14 +180,14 @@ $btn-border-radius-small: $border-radius-small !default; //## //** `` background color -$input-bg: hsla(0, 100%, 100%, 0) !default; +$input-bg: transparent !default; //** `` background color -$input-bg-disabled: hsla(0, 100%, 100%, 0) !default; +$input-bg-disabled: transparent !default; //** Text color for ``s $input-color: $gray !default; //** `` border color -$input-border: hsla(0, 100%, 100%, 0) !default; +$input-border: transparent !default; // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4 //** Default `.form-control` border radius @@ -218,7 +218,7 @@ $legend-color: $gray-dark !default; $legend-border-color: #e5e5e5 !default; //** Background color for textual input addons -$input-group-addon-bg: hsla(0, 100%, 100%, 0) !default; +$input-group-addon-bg: transparent !default; //** Border color for textual input addons $input-group-addon-border-color: $input-border !default; @@ -365,52 +365,52 @@ $navbar-collapse-max-height: 340px !default; $navbar-default-color: $gray-light !default; $navbar-default-bg: #fff !default; -$navbar-default-border: hsla(0, 100%, 100%, 0) !default; +$navbar-default-border: transparent !default; // Navbar links $navbar-default-link-color: $gray !default; $navbar-default-link-hover-color: $gray-dark !default; -$navbar-default-link-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-link-hover-bg: transparent !default; $navbar-default-link-active-color: $gray-dark !default; $navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) !default; $navbar-default-link-disabled-color: #ccc !default; -$navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-link-disabled-bg: transparent !default; // Navbar brand label $navbar-default-brand-color: $navbar-default-link-color !default; $navbar-default-brand-hover-color: $navbar-default-link-hover-color !default; -$navbar-default-brand-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-brand-hover-bg: transparent !default; // Navbar toggle -$navbar-default-toggle-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-toggle-hover-bg: transparent !default; $navbar-default-toggle-icon-bar-bg: rgba(0,0,0,0.5) !default; -$navbar-default-toggle-border-color: hsla(0, 100%, 100%, 0) !default; +$navbar-default-toggle-border-color: transparent !default; //=== Inverted navbar // Reset inverted navbar basics $navbar-inverse-color: $gray-light !default; $navbar-inverse-bg: $brand-primary !default; -$navbar-inverse-border: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-border: transparent !default; // Inverted navbar links $navbar-inverse-link-color: lighten($brand-primary, 30%) !default; $navbar-inverse-link-hover-color: #fff !default; -$navbar-inverse-link-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-link-hover-bg: transparent !default; $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default; $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default; $navbar-inverse-link-disabled-color: #444 !default; -$navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-link-disabled-bg: transparent !default; // Inverted navbar brand label $navbar-inverse-brand-color: $navbar-inverse-link-color !default; $navbar-inverse-brand-hover-color: #fff !default; -$navbar-inverse-brand-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-brand-hover-bg: transparent !default; // Inverted navbar toggle\ -$navbar-inverse-toggle-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-toggle-hover-bg: transparent !default; $navbar-inverse-toggle-icon-bar-bg: rgba(0,0,0,0.5) !default; -$navbar-inverse-toggle-border-color: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-toggle-border-color: transparent !default; //== Navs @@ -425,13 +425,13 @@ $nav-disabled-link-color: $gray-light !default; $nav-disabled-link-hover-color: $gray-light !default; //== Tabs -$nav-tabs-border-color: hsla(0, 100%, 100%, 0) !default; +$nav-tabs-border-color: transparent !default; $nav-tabs-link-hover-border-color: $gray-lighter !default; -$nav-tabs-active-link-hover-bg: hsla(0, 100%, 100%, 0) !default; +$nav-tabs-active-link-hover-bg: transparent !default; $nav-tabs-active-link-hover-color: $gray !default; -$nav-tabs-active-link-hover-border-color: hsla(0, 100%, 100%, 0) !default; +$nav-tabs-active-link-hover-border-color: transparent !default; $nav-tabs-justified-link-border-color: $nav-tabs-border-color !default; $nav-tabs-justified-active-link-border-color: $body-bg !default; @@ -539,9 +539,9 @@ $popover-bg: #fff !default; //** Popover maximum width $popover-max-width: 276px !default; //** Popover border color -$popover-border-color: hsla(0, 100%, 100%, 0) !default; +$popover-border-color: transparent !default; //** Popover fallback border color -$popover-fallback-border-color: hsla(0, 100%, 100%, 0) !default; +$popover-fallback-border-color: transparent !default; //** Popover title background color $popover-title-bg: darken($popover-bg, 3%) !default; @@ -597,7 +597,7 @@ $modal-title-line-height: $line-height-base !default; //** Background color of modal content area $modal-content-bg: #fff !default; //** Modal content border color -$modal-content-border-color: hsla(0, 100%, 100%, 0) !default; +$modal-content-border-color: transparent !default; //** Modal content border color **for IE8** $modal-content-fallback-border-color: #999 !default; @@ -606,7 +606,7 @@ $modal-backdrop-bg: #000 !default; //** Modal backdrop opacity $modal-backdrop-opacity: .5 !default; //** Modal header border color -$modal-header-border-color: hsla(0, 100%, 100%, 0) !default; +$modal-header-border-color: transparent !default; //** Modal footer border color $modal-footer-border-color: $modal-header-border-color !default; @@ -760,7 +760,7 @@ $thumbnail-caption-padding: 9px !default; //## $well-bg: #f9f9f9 !default; -$well-border: hsla(0, 100%, 100%, 0) !default; +$well-border: transparent !default; //== Badges diff --git a/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss index 2cf580b..3f4c569 100644 --- a/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss @@ -2,49 +2,49 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Raleway:400,700"); +@import url("https://fonts.googleapis.com/css?family=Raleway:400,700"); // Navbar ===================================================================== .navbar { font-family: $headings-font-family; -} -.navbar-nav, -.navbar-form { - margin-left: 0; - margin-right: 0; -} + .navbar-nav, + .navbar-form { + margin-left: 0; + margin-right: 0; + } -.navbar-nav > li > a { - $margin-vertical: (($navbar-height - 2*$padding-base-vertical - $line-height-computed - 2px) / 2); - margin: $margin-vertical 6px; - padding: $padding-base-vertical $padding-base-horizontal; - border: 1px solid transparent; - border-radius: $border-radius-base; + .navbar-nav > li > a { + $margin-vertical: (($navbar-height - 2*$padding-base-vertical - $line-height-computed - 2px) / 2); + margin: $margin-vertical 6px; + padding: $padding-base-vertical $padding-base-horizontal; + border: 1px solid transparent; + border-radius: $border-radius-base; - &:hover { - border: 1px solid #ddd; + &:hover { + border: 1px solid #ddd; + } } -} -.navbar-nav > .active > a, -.navbar-nav > .active > a:hover { - border: 1px solid #ddd; -} + .navbar-nav > .active > a, + .navbar-nav > .active > a:hover { + border: 1px solid #ddd; + } -.navbar-default .navbar-nav > .active > a:hover { - color: $navbar-default-link-hover-color; -} + .navbar-default .navbar-nav > .active > a:hover { + color: $navbar-default-link-hover-color; + } -.navbar-inverse .navbar-nav > .active > a:hover { - color: $navbar-inverse-link-hover-color; -} + .navbar-inverse .navbar-nav > .active > a:hover { + color: $navbar-inverse-link-hover-color; + } -.navbar-brand { - padding-top: (($navbar-height - 2*$font-size-large) / 2); - padding-bottom: (($navbar-height - 2*$font-size-large) / 2); - line-height: 1.9; + .navbar-brand { + padding-top: (($navbar-height - 2*$font-size-large) / 2); + padding-bottom: (($navbar-height - 2*$font-size-large) / 2); + line-height: 1.9; + } } @media (min-width: $grid-float-breakpoint) { @@ -96,11 +96,11 @@ legend { .pagination { font-family: $headings-font-family; -} -.pagination-lg > li > a, -.pagination-lg > li > span { - padding: 14px 24px; + .pagination-lg > li > a, + .pagination-lg > li > span { + padding: 14px 24px; + } } .pager { @@ -146,11 +146,12 @@ legend { .label { font-family: $headings-font-family; font-weight: normal; -} -.label-default { - border: 1px solid #ddd; - color: $text-color; + .label-default { + border: 1px solid #ddd; + color: $text-color; + } + } .badge { @@ -166,11 +167,11 @@ legend { .panel { @include box-shadow(none); -} -.panel-default { - .close { - color: $text-color; + .panel-default { + .close { + color: $text-color; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss index 1e7040d..4bafe7f 100644 --- a/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Roboto:400,500"); +@import url("https://fonts.googleapis.com/css?family=Roboto:400,500"); // Navbar ===================================================================== @@ -13,42 +13,35 @@ text-transform: uppercase; } -@mixin sandstone() { - font-size: 11px; - line-height: 22px; - font-weight: 500; - text-transform: uppercase; -} - .navbar { .nav > li > a { - @include sandstone(); + .sandstone; } -} -.navbar-form input, -.navbar-form .form-control { - border: none; + .navbar-form input, + .navbar-form .form-control { + border: none; + } } // Buttons ==================================================================== .btn { border: none; - @include sandstone(); + .sandstone; &:hover { border-color: transparent; } -} -.btn-lg { - line-height: 26px; -} + .btn-lg { + line-height: 26px; + } -.btn-default { - &:hover { - background-color: $navbar-default-link-active-bg; + .btn-default { + &:hover { + background-color: $navbar-default-link-active-bg; + } } } @@ -71,7 +64,7 @@ input, // Navs ======================================================================= .nav { - @include sandstone(); + .sandstone; .open > a, .open > a:hover, @@ -113,7 +106,7 @@ input, } .breadcrumb { - @include sandstone(); + .sandstone; border: 1px solid $gray-light; @@ -123,11 +116,11 @@ input, } .pagination { - @include sandstone(); + .sandstone; } .pager { - @include sandstone(); + .sandstone; li > a { color: $gray; @@ -136,7 +129,7 @@ input, .dropdown-menu { & > li > a { - @include sandstone(); + .sandstone; } } @@ -151,7 +144,7 @@ input, } .tooltip { - @include sandstone(); + .sandstone; } // Progress bars ============================================================== @@ -160,16 +153,18 @@ input, border-radius: 10px; background-color: $gray-light; @include box-shadow(none); -} -.progress-bar { - @include box-shadow(none); + .progress-bar { + @include box-shadow(none); + } } // Containers ================================================================= -.list-group-item { - padding: 16px 24px; +.list-group { + .list-group-item { + padding: 16px 24px; + } } .well { @@ -181,19 +176,19 @@ input, .panel-heading, .panel-title { - @include sandstone(); + .sandstone; color: #fff; } .panel-footer { - @include sandstone(); + .sandstone; } -} -.panel-default { - .panel-heading, - .panel-title, - .panel-footer { - color: $gray; + .panel-default { + .panel-heading, + .panel-title, + .panel-footer { + color: $gray; + } } -} \ No newline at end of file +} diff --git a/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss b/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss index e22c7e9..e0fb27c 100644 --- a/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss @@ -145,27 +145,27 @@ $btn-font-weight: normal !default; $btn-default-color: #fff !default; $btn-default-bg: $gray-darker !default; -$btn-default-border: hsla(0, 100%, 100%, 0) !default; +$btn-default-border: transparent !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; -$btn-primary-border: hsla(0, 100%, 100%, 0) !default; +$btn-primary-border: transparent !default; $btn-success-color: #fff !default; $btn-success-bg: $brand-success !default; -$btn-success-border: hsla(0, 100%, 100%, 0) !default; +$btn-success-border: transparent !default; $btn-info-color: #fff !default; $btn-info-bg: $brand-info !default; -$btn-info-border: hsla(0, 100%, 100%, 0) !default; +$btn-info-border: transparent !default; $btn-warning-color: #fff !default; $btn-warning-bg: $brand-warning !default; -$btn-warning-border: hsla(0, 100%, 100%, 0) !default; +$btn-warning-border: transparent !default; $btn-danger-color: #fff !default; $btn-danger-bg: $brand-danger !default; -$btn-danger-border: hsla(0, 100%, 100%, 0) !default; +$btn-danger-border: transparent !default; $btn-link-disabled-color: $gray-light !default; @@ -199,7 +199,7 @@ $input-border-radius-large: $border-radius-large !default; $input-border-radius-small: $border-radius-small !default; //** Border color for inputs on focus -$input-border-focus: hsla(0, 100%, 100%, 0) !default; +$input-border-focus: transparent !default; //** Placeholder text color $input-color-placeholder: $gray-light !default; @@ -370,21 +370,21 @@ $navbar-default-border: $gray-darker !default; // Navbar links $navbar-default-link-color: $gray !default; $navbar-default-link-hover-color: #fff !default; -$navbar-default-link-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-link-hover-bg: transparent !default; $navbar-default-link-active-color: #fff !default; $navbar-default-link-active-bg: darken($navbar-default-bg, 2%) !default; $navbar-default-link-disabled-color: #ccc !default; -$navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-link-disabled-bg: transparent !default; // Navbar brand label $navbar-default-brand-color: #fff !default; $navbar-default-brand-hover-color: #fff !default; -$navbar-default-brand-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-brand-hover-bg: transparent !default; // Navbar toggle $navbar-default-toggle-hover-bg: $navbar-default-link-active-bg !default; $navbar-default-toggle-icon-bar-bg: $navbar-default-link-color !default; -$navbar-default-toggle-border-color: hsla(0, 100%, 100%, 0) !default; +$navbar-default-toggle-border-color: transparent !default; //=== Inverted navbar @@ -396,21 +396,21 @@ $navbar-inverse-border: $brand-success !default; // Inverted navbar links $navbar-inverse-link-color: darken($brand-success, 15%) !default; $navbar-inverse-link-hover-color: #fff !default; -$navbar-inverse-link-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-link-hover-bg: transparent !default; $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default; $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 4%) !default; $navbar-inverse-link-disabled-color: #444 !default; -$navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-link-disabled-bg: transparent !default; // Inverted navbar brand label $navbar-inverse-brand-color: #fff !default; $navbar-inverse-brand-hover-color: #fff !default; -$navbar-inverse-brand-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-brand-hover-bg: transparent !default; // Inverted navbar toggle $navbar-inverse-toggle-hover-bg: $navbar-inverse-link-active-bg !default; $navbar-inverse-toggle-icon-bar-bg: $navbar-inverse-link-color !default; -$navbar-inverse-toggle-border-color: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-toggle-border-color: transparent !default; //== Navs @@ -625,19 +625,19 @@ $alert-link-font-weight: bold !default; $alert-success-bg: $brand-success !default; $alert-success-text: #fff !default; -$alert-success-border: hsla(0, 100%, 100%, 0) !default; +$alert-success-border: transparent !default; $alert-info-bg: $brand-info !default; $alert-info-text: #fff !default; -$alert-info-border: hsla(0, 100%, 100%, 0) !default; +$alert-info-border: transparent !default; $alert-warning-bg: $brand-warning !default; $alert-warning-text: #fff !default; -$alert-warning-border: hsla(0, 100%, 100%, 0) !default; +$alert-warning-border: transparent !default; $alert-danger-bg: $brand-danger !default; $alert-danger-text: #fff !default; -$alert-danger-border: hsla(0, 100%, 100%, 0) !default; +$alert-danger-border: transparent !default; //== Progress bars diff --git a/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss index 12f11d1..b78318c 100644 --- a/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Open+Sans:400,700"); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); @mixin btn-shadow($color) { @include gradient-vertical-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); @@ -12,11 +12,14 @@ // Navbar ===================================================================== -.navbar-inverse { +.navbar { - .badge { - background-color: #fff; - color: $brand-primary; + .navbar-inverse { + + .badge { + background-color: #fff; + color: $brand-primary; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss index ccbc4c0..e978fb1 100644 --- a/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss @@ -20,36 +20,36 @@ border: 1px solid rgba(0, 0, 0, 0.6); text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); - .nav .open > a { - border-color: transparent; + .navbar-inverse { + @include btn-shadow($navbar-inverse-bg); + + .badge { + background-color: $navbar-inverse-link-active-bg; + } } -} -.navbar-inverse { - @include btn-shadow($navbar-inverse-bg); + .navbar-nav > li > a { + border-right: 1px solid rgba(0, 0, 0, 0.2); + border-left: 1px solid rgba(255, 255, 255, 0.1); - .badge { - background-color: $navbar-inverse-link-active-bg; + &:hover { + @include btn-shadow-inverse($navbar-default-bg); + border-left-color: transparent; + } } -} -.navbar-nav > li > a { - border-right: 1px solid rgba(0, 0, 0, 0.2); - border-left: 1px solid rgba(255, 255, 255, 0.1); + .nav .open > a { + border-color: transparent; + } - &:hover { - @include btn-shadow-inverse($navbar-default-bg); + .navbar-nav > li.active > a { border-left-color: transparent; } -} - -.navbar-nav > li.active > a { - border-left-color: transparent; -} -.navbar-form { - margin-left: 5px; - margin-right: 5px; + .navbar-form { + margin-left: 5px; + margin-right: 5px; + } } // Buttons ==================================================================== @@ -154,17 +154,17 @@ h1, h2, h3, h4, h5, h6 { .info { color: #fff; } -} -.table-bordered tbody { + .table-bordered tbody { - tr.success, - tr.warning, - tr.danger { + tr.success, + tr.warning, + tr.danger { - td, - &:hover td { - border-color: $table-border-color; + td, + &:hover td { + border-color: $table-border-color; + } } } } @@ -390,38 +390,38 @@ a.list-group-item { &.active:focus { border-color: $list-group-border; } -} -a.list-group-item-success { - &.active { - background-color: $state-success-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); - } -} - -a.list-group-item-warning { - &.active { - background-color: $state-warning-bg; - } + a.list-group-item-success { + &.active { + background-color: $state-success-bg; + } - &.active:hover, - &.active:focus { - background-color: darken($state-warning-bg, 5%); + &.active:hover, + &.active:focus { + background-color: darken($state-success-bg, 5%); + } } -} -a.list-group-item-danger { - &.active { - background-color: $state-danger-bg; + a.list-group-item-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%); + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } diff --git a/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss index 3821984..41bcfbb 100644 --- a/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); @mixin btn-shadow($color) { @include gradient-vertical-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%)); @@ -17,10 +17,32 @@ @include btn-shadow($navbar-default-bg); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); + .navbar-inverse { + @include btn-shadow($navbar-inverse-bg); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); + + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } + } + .badge { text-shadow: none; } + .navbar-nav > li > a, + .navbar-nav > li > a:hover { + padding-top: ($navbar-padding-vertical + 2px); + padding-bottom: ($navbar-padding-vertical - 2px); + @include transition(color ease-in-out .2s); + } + + .navbar-brand, + .navbar-brand:hover { + @include transition(color ease-in-out .2s); + } + .caret, .caret:hover { @include transition(border-color ease-in-out .2s); @@ -29,94 +51,68 @@ .dropdown-menu { text-shadow: none; } - } -.navbar-inverse { - @include btn-shadow($navbar-inverse-bg); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - - .badge { - background-color: #fff; - color: $navbar-inverse-bg; - } -} - -.navbar-nav > li > a, -.navbar-nav > li > a:hover { - padding-top: ($navbar-padding-vertical + 2px); - padding-bottom: ($navbar-padding-vertical - 2px); - @include transition(color ease-in-out .2s); -} - -.navbar-brand, -.navbar-brand:hover { - @include transition(color ease-in-out .2s); -} - - // Buttons ==================================================================== .btn { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - &:active, - &.active { - background-image: none; - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + .btn-default { + @include btn-shadow($btn-default-bg); + + &:hover { + @include btn-shadow(darken($btn-default-bg, 4%)); + } } -} -.btn-default { - @include btn-shadow($btn-default-bg); + .btn-primary { + @include btn-shadow($btn-primary-bg); - &:hover { - @include btn-shadow(darken($btn-default-bg, 4%)); + &:hover { + @include btn-shadow(darken($btn-primary-bg, 4%)); + } } -} -.btn-primary { - @include btn-shadow($btn-primary-bg); + .btn-success { + @include btn-shadow($btn-success-bg); - &:hover { - @include btn-shadow(darken($btn-primary-bg, 4%)); + &:hover { + @include btn-shadow(darken($btn-success-bg, 4%)); + } } -} -.btn-success { - @include btn-shadow($btn-success-bg); + .btn-info { + @include btn-shadow($btn-info-bg); - &:hover { - @include btn-shadow(darken($btn-success-bg, 4%)); + &:hover { + @include btn-shadow(darken($btn-info-bg, 4%)); + } } -} -.btn-info { - @include btn-shadow($btn-info-bg); + .btn-warning { + @include btn-shadow($btn-warning-bg); - &:hover { - @include btn-shadow(darken($btn-info-bg, 4%)); + &:hover { + @include btn-shadow(darken($btn-warning-bg, 4%)); + } } -} -.btn-warning { - @include btn-shadow($btn-warning-bg); + .btn-danger { + @include btn-shadow($btn-danger-bg); - &:hover { - @include btn-shadow(darken($btn-warning-bg, 4%)); + &:hover { + @include btn-shadow(darken($btn-danger-bg, 4%)); + } } -} - -.btn-danger { - @include btn-shadow($btn-danger-bg); - &:hover { - @include btn-shadow(darken($btn-danger-bg, 4%)); + &:active, + &.active { + background-image: none; + @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } } - - // Typography ================================================================= // Tables ===================================================================== @@ -131,8 +127,11 @@ // Containers ================================================================= -.panel-primary { - .panel-title { - color: #fff; +.panel { + + .panel-primary { + .panel-title { + color: #fff; + } } } \ No newline at end of file diff --git a/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss index 79c102a..d4cb58f 100644 --- a/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Lato:300,400,700"); +@import url("https://fonts.googleapis.com/css?family=Lato:300,400,700"); // Navbar ===================================================================== @@ -10,21 +10,21 @@ @include box-shadow(none); border: none; font-size: 12px; -} -.navbar-default { + .navbar-default { - .badge { - background-color: #fff; - color: $navbar-default-bg; + .badge { + background-color: #fff; + color: $navbar-default-bg; + } } -} -.navbar-inverse { + .navbar-inverse { - .badge { - background-color: #fff; - color: $navbar-inverse-bg; + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } } } @@ -33,17 +33,17 @@ .btn { font-weight: 300; -} -.btn-default { - &:hover { - background-color: darken($btn-default-bg, 3%); + .btn-default { + &:hover { + background-color: darken($btn-default-bg, 3%); + } } -} -.btn-sm, -.btn-xs { - font-size: 12px; + .btn-sm, + .btn-xs { + font-size: 12px; + } } // Typography ================================================================= @@ -289,48 +289,48 @@ a.list-group-item { &.active:focus { border: none; } -} - -a.list-group-item-success { - &.active { - background-color: $state-success-bg; - } - - &.active:hover, - &.active:focus { - background-color: darken($state-success-bg, 5%); - } -} -a.list-group-item-warning { - &.active { - background-color: $state-warning-bg; - } + a.list-group-item-success { + &.active { + background-color: $state-success-bg; + } - &.active:hover, - &.active:focus { - background-color: darken($state-warning-bg, 5%); + &.active:hover, + &.active:focus { + background-color: darken($state-success-bg, 5%); + } } -} -a.list-group-item-danger { - &.active { - background-color: $state-danger-bg; + a.list-group-item-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%); + a.list-group-item-danger { + &.active { + background-color: $state-danger-bg; + } + + &.active:hover, + &.active:focus { + background-color: darken($state-danger-bg, 5%); + } } } .panel { border: none; -} -.panel-default > .panel-heading { - background-color: $table-bg-hover; - color: $text-color; + .panel-default > .panel-heading { + background-color: $table-bg-hover; + color: $text-color; + } } .thumbnail { @@ -340,15 +340,17 @@ a.list-group-item-danger { .modal { padding: 0; -} -.modal-header, -.modal-footer { - background-color: $table-bg-hover; - border: none; - border-radius: 0; + .modal-header, + .modal-footer { + background-color: $table-bg-hover; + border: none; + border-radius: 0; + } } -.popover-title { - border: none; +.popover { + .popover-title { + border: none; + } } diff --git a/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss b/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss index 59a274d..c3ccc9e 100644 --- a/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss @@ -126,7 +126,7 @@ $table-cell-padding: 6px !default; $table-condensed-cell-padding: 3px !default; //** Default background color used for all tables. -$table-bg: hsla(0, 100%, 100%, 0) !default; +$table-bg: transparent !default; //** Background color used for `.table-striped`. $table-bg-accent: $gray-light !default; //** Background color used for `.table-hover`. @@ -134,7 +134,7 @@ $table-bg-hover: darken($gray-light, 3%) !default; $table-bg-active: $table-bg-hover !default; //** Border color for table and cell borders. -$table-border-color: $gray-light !default; +$table-border-color: $gray-light !default; //== Buttons @@ -145,27 +145,27 @@ $btn-font-weight: normal !default; $btn-default-color: #fff !default; $btn-default-bg: $gray-light !default; -$btn-default-border: hsla(0, 100%, 100%, 0) !default; +$btn-default-border: transparent !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; -$btn-primary-border: hsla(0, 100%, 100%, 0) !default; +$btn-primary-border: transparent !default; $btn-success-color: #fff !default; $btn-success-bg: $brand-success !default; -$btn-success-border: hsla(0, 100%, 100%, 0) !default; +$btn-success-border: transparent !default; $btn-info-color: #fff !default; $btn-info-bg: $brand-info !default; -$btn-info-border: hsla(0, 100%, 100%, 0) !default; +$btn-info-border: transparent !default; $btn-warning-color: #fff !default; $btn-warning-bg: $brand-warning !default; -$btn-warning-border: hsla(0, 100%, 100%, 0) !default; +$btn-warning-border: transparent !default; $btn-danger-color: #fff !default; $btn-danger-bg: $brand-danger !default; -$btn-danger-border: hsla(0, 100%, 100%, 0) !default; +$btn-danger-border: transparent !default; $btn-link-disabled-color: $gray-light !default; @@ -187,7 +187,7 @@ $input-bg-disabled: $gray-lighter !default; //** Text color for ``s $input-color: $body-bg !default; //** `` border color -$input-border: hsla(0, 100%, 100%, 0) !default; +$input-border: transparent !default; // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4 //** Default `.form-control` border radius @@ -199,7 +199,7 @@ $input-border-radius-large: $border-radius-large !default; $input-border-radius-small: $border-radius-small !default; //** Border color for inputs on focus -$input-border-focus: hsla(0, 100%, 100%, 0) !default; +$input-border-focus: transparent !default; //** Placeholder text color $input-color-placeholder: #ccc !default; @@ -220,7 +220,7 @@ $legend-border-color: $gray-light !default; //** Background color for textual input addons $input-group-addon-bg: $btn-default-bg !default; //** Border color for textual input addons -$input-group-addon-border-color: hsla(0, 100%, 100%, 0) !default; +$input-group-addon-border-color: transparent !default; //** Disabled cursor for form controls and buttons. $cursor-disabled: not-allowed !default; @@ -233,9 +233,9 @@ $cursor-disabled: not-allowed !default; //** Background for the dropdown menu. $dropdown-bg: $gray-light !default; //** Dropdown menu `border-color`. -$dropdown-border: hsla(0, 100%, 100%, 0) !default; +$dropdown-border: transparent !default; //** Dropdown menu `border-color` **for IE8**. -$dropdown-fallback-border: hsla(0, 100%, 100%, 0) !default; +$dropdown-fallback-border: transparent !default; //** Divider color for between dropdown items. $dropdown-divider-bg: $body-bg !default; @@ -365,7 +365,7 @@ $navbar-collapse-max-height: 340px !default; $navbar-default-color: $text-color !default; $navbar-default-bg: $gray-light !default; -$navbar-default-border: hsla(0, 100%, 100%, 0) !default; +$navbar-default-border: transparent !default; // Navbar links $navbar-default-link-color: $text-color !default; @@ -374,24 +374,24 @@ $navbar-default-link-hover-bg: $dropdown-link-hover-bg !default; $navbar-default-link-active-color: $navbar-default-link-color !default; $navbar-default-link-active-bg: $dropdown-link-hover-bg !default; $navbar-default-link-disabled-color: #ccc !default; -$navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-link-disabled-bg: transparent !default; // Navbar brand label $navbar-default-brand-color: $navbar-default-link-color !default; $navbar-default-brand-hover-color: $navbar-default-link-color !default; -$navbar-default-brand-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-default-brand-hover-bg: transparent !default; // Navbar toggle $navbar-default-toggle-hover-bg: $navbar-default-link-hover-bg !default; $navbar-default-toggle-icon-bar-bg: $text-color !default; -$navbar-default-toggle-border-color: hsla(0, 100%, 100%, 0) !default; +$navbar-default-toggle-border-color: transparent !default; //=== Inverted navbar // Reset inverted navbar basics $navbar-inverse-color: $text-color !default; $navbar-inverse-bg: $brand-primary !default; -$navbar-inverse-border: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-border: transparent !default; // Inverted navbar links $navbar-inverse-link-color: $text-color !default; @@ -400,17 +400,17 @@ $navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 5%) !defa $navbar-inverse-link-active-color: $navbar-inverse-link-color !default; $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 5%) !default; $navbar-inverse-link-disabled-color: #444 !default; -$navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-link-disabled-bg: transparent !default; // Inverted navbar brand label $navbar-inverse-brand-color: $navbar-inverse-link-color !default; $navbar-inverse-brand-hover-color: $navbar-inverse-link-color !default; -$navbar-inverse-brand-hover-bg: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-brand-hover-bg: transparent !default; // Inverted navbar toggle $navbar-inverse-toggle-hover-bg: $navbar-inverse-link-hover-bg !default; $navbar-inverse-toggle-icon-bar-bg: $text-color !default; -$navbar-inverse-toggle-border-color: hsla(0, 100%, 100%, 0) !default; +$navbar-inverse-toggle-border-color: transparent !default; //== Navs @@ -425,7 +425,7 @@ $nav-disabled-link-color: $gray-light !default; $nav-disabled-link-hover-color: $gray-light !default; //== Tabs -$nav-tabs-border-color: hsla(0, 100%, 100%, 0) !default; +$nav-tabs-border-color: transparent !default; $nav-tabs-link-hover-border-color: $gray-light !default; @@ -448,19 +448,19 @@ $nav-pills-active-link-hover-color: $component-active-color !default; $pagination-color: $text-color !default; $pagination-bg: $gray-light !default; -$pagination-border: hsla(0, 100%, 100%, 0) !default; +$pagination-border: transparent !default; $pagination-hover-color: $text-color !default; $pagination-hover-bg: $table-bg-hover !default; -$pagination-hover-border: hsla(0, 100%, 100%, 0) !default; +$pagination-hover-border: transparent !default; $pagination-active-color: $text-color !default; $pagination-active-bg: $brand-primary !default; -$pagination-active-border: hsla(0, 100%, 100%, 0) !default; +$pagination-active-border: transparent !default; $pagination-disabled-color: darken($table-bg-hover, 10%) !default; $pagination-disabled-bg: $gray-light !default; -$pagination-disabled-border: hsla(0, 100%, 100%, 0) !default; +$pagination-disabled-border: transparent !default; //== Pager @@ -497,19 +497,19 @@ $jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default; $state-success-text: $text-color !default; $state-success-bg: $brand-success !default; -$state-success-border: hsla(0, 100%, 100%, 0) !default; +$state-success-border: transparent !default; $state-info-text: $text-color !default; $state-info-bg: $brand-info !default; -$state-info-border: hsla(0, 100%, 100%, 0) !default; +$state-info-border: transparent !default; $state-warning-text: $text-color !default; $state-warning-bg: $brand-warning !default; -$state-warning-border: hsla(0, 100%, 100%, 0) !default; +$state-warning-border: transparent !default; $state-danger-text: $text-color !default; $state-danger-bg: $brand-danger !default; -$state-danger-border: hsla(0, 100%, 100%, 0) !default; +$state-danger-border: transparent !default; //== Tooltips @@ -539,9 +539,9 @@ $popover-bg: $gray-light !default; //** Popover maximum width $popover-max-width: 276px !default; //** Popover border color -$popover-border-color: hsla(0, 100%, 100%, 0) !default; +$popover-border-color: transparent !default; //** Popover fallback border color -$popover-fallback-border-color: hsla(0, 100%, 100%, 0) !default; +$popover-fallback-border-color: transparent !default; //** Popover title background color $popover-title-bg: $table-bg-hover !default; @@ -554,9 +554,9 @@ $popover-arrow-color: $popover-bg !default; //** Popover outer arrow width $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; //** Popover outer arrow color -$popover-arrow-outer-color: hsla(0, 100%, 100%, 0) !default; +$popover-arrow-outer-color: transparent !default; //** Popover outer arrow fallback color -$popover-arrow-outer-fallback-color: hsla(0, 100%, 100%, 0) !default; +$popover-arrow-outer-fallback-color: transparent !default; //== Labels @@ -757,7 +757,7 @@ $thumbnail-caption-padding: 9px !default; //== Wells // -//## +//## $well-bg: $gray-light !default; $well-border: transparent !default; diff --git a/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss index 053190f..dc66789 100644 --- a/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss @@ -2,27 +2,29 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Ubuntu:400,700"); +@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700"); // Navbar ===================================================================== -.navbar-default { +.navbar { - .badge { - background-color: #fff; - color: $navbar-default-bg; + .navbar-default { + + .badge { + background-color: #fff; + color: $navbar-default-bg; + } } -} -.navbar-inverse { + .navbar-inverse { - .badge { - background-color: #fff; - color: $navbar-inverse-bg; + .badge { + background-color: #fff; + color: $navbar-inverse-bg; + } } } - @media (max-width: $grid-float-breakpoint-max) { .navbar { diff --git a/vendor/assets/stylesheets/bootswatch/united/_variables.scss b/vendor/assets/stylesheets/bootswatch/united/_variables.scss index 1f451ae..8832765 100644 --- a/vendor/assets/stylesheets/bootswatch/united/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/united/_variables.scss @@ -490,6 +490,7 @@ $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 // //## Define colors for form feedback states and, by default, alerts. diff --git a/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss index 7829a3d..1beb274 100644 --- a/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); // Navbar ===================================================================== @@ -15,75 +15,78 @@ background-color: #b3b3b3; } + .navbar-collapse { + border-top-color: $dropdown-divider-bg; + @include box-shadow(none); + } + .btn { padding-top: 6px; padding-bottom: 6px; } - .dropdown-menu { - border: none; + .navbar-form { + margin-top: 7px; + margin-bottom: 5px; - > li > a, - > li > a:focus { - background-color: transparent; - font-size: 13px; - font-weight: 300; + .form-control { + height: auto; + padding: $padding-xs-vertical $padding-xs-horizontal; } } - .dropdown-header { - color: rgba(255, 255, 255, 0.5); - } + .dropdown { -} + .dropdown-menu { + border: none; -.navbar-form { - margin-top: 7px; - margin-bottom: 5px; + > li > a, + > li > a:focus { + background-color: transparent; + font-size: 13px; + font-weight: 300; + } + } - .form-control { - height: auto; - padding: $padding-xs-vertical $padding-xs-horizontal; - } -} + .dropdown-header { + color: rgba(255, 255, 255, 0.5); + } -.navbar-collapse { - border-top-color: $dropdown-divider-bg; - @include box-shadow(none); -} + } -.navbar-default { + .navbar-default { - .dropdown-menu { - background-color: $navbar-default-bg; + .dropdown-menu { + background-color: $navbar-default-bg; - > li > a, - > li > a:focus { - color: $navbar-default-color; - } + > li > a, + > li > a:focus { + color: $navbar-default-color; + } - > li > a:hover, - > .active > a, - > .active > a:hover { - background-color: $navbar-default-link-hover-bg; + > li > a:hover, + > .active > a, + > .active > a:hover { + background-color: $navbar-default-link-hover-bg; + } } } -} -.navbar-inverse { + .navbar-inverse { - .dropdown-menu { - background-color: $navbar-inverse-bg; + .dropdown-menu { + background-color: $navbar-inverse-bg; - > li > a, - > li > a:focus { - color: $navbar-inverse-color; - } + > li > a, + > li > a:focus { + color: $navbar-inverse-color; + } - > li > a:hover, - > .active > a, - > .active > a:hover { - background-color: $navbar-inverse-link-hover-bg; + > li > a:hover, + > .active > a, + > .active > a:hover { + background-color: $navbar-inverse-link-hover-bg; + } } } } @@ -92,18 +95,18 @@ .btn { padding: $padding-base-vertical $padding-base-horizontal; -} -.btn-lg { - padding: $padding-large-vertical $padding-large-horizontal; -} + .btn-lg { + padding: $padding-large-vertical $padding-large-horizontal; + } -.btn-sm { - padding: $padding-small-vertical $padding-small-horizontal; -} + .btn-sm { + padding: $padding-small-vertical $padding-small-horizontal; + } -.btn-xs { - padding: $padding-xs-vertical $padding-xs-horizontal; + .btn-xs { + padding: $padding-xs-vertical $padding-xs-horizontal; + } } .btn-group { @@ -313,15 +316,15 @@ input[type="checkbox"] { border-radius: 3px; } } -} -.pagination-lg > li > a { - padding-left: 22px; - padding-right: 22px; -} + .pagination-lg > li > a { + padding-left: 22px; + padding-right: 22px; + } -.pagination-sm > li > a { - padding: 0 5px; + .pagination-sm > li > a { + padding: 0 5px; + } } .pager { @@ -364,11 +367,11 @@ input[type="checkbox"] { padding-right: 1em; border-radius: 0; font-weight: 300; -} -.label-default { - background-color: $btn-default-bg; - color: $btn-default-color; + .label-default { + background-color: $btn-default-bg; + color: $btn-default-color; + } } .badge { @@ -387,21 +390,24 @@ input[type="checkbox"] { // Containers ================================================================= -.dropdown-menu { - padding: 0; - margin-top: 0; - font-size: $font-size-small; +.dropdown { - > li > a { - padding: 12px 15px; + .dropdown-menu { + padding: 0; + margin-top: 0; + font-size: $font-size-small; + + > li > a { + padding: 12px 15px; + } } -} -.dropdown-header { - padding-left: 15px; - padding-right: 15px; - font-size: 9px; - text-transform: uppercase; + .dropdown-header { + padding-left: 15px; + padding-right: 15px; + font-size: 9px; + text-transform: uppercase; + } } .popover { @@ -410,15 +416,17 @@ input[type="checkbox"] { font-weight: 300; } -.panel-heading, -.panel-footer { - border-top-right-radius: 0; - border-top-left-radius: 0; -} +.panel { + .panel-heading, + .panel-footer { + border-top-right-radius: 0; + border-top-left-radius: 0; + } -.panel-default { - .close { - color: $text-color; + .panel-default { + .close { + color: $text-color; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss b/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss index 67f69e9..f3a2ef5 100644 --- a/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss @@ -490,6 +490,7 @@ $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 // //## Define colors for form feedback states and, by default, alerts. From d8eaecbdfce01edf59644f7c508681d00d626745 Mon Sep 17 00:00:00 2001 From: 1v Date: Thu, 3 Nov 2016 16:28:53 +0100 Subject: [PATCH 2/6] Bump version to 3.3.7 --- lib/bootswatch-rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 08af447a98034cd063c65d7914c8521c24e33372 Mon Sep 17 00:00:00 2001 From: 1v Date: Thu, 3 Nov 2016 16:56:28 +0100 Subject: [PATCH 3/6] Update submodule --- bootswatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootswatch b/bootswatch index d2246ac..4f96596 160000 --- a/bootswatch +++ b/bootswatch @@ -1 +1 @@ -Subproject commit d2246acacb1c9ae45a70ab36f3ca980cded0c75b +Subproject commit 4f965965b6e8a39502e571fea51523ca31d798d7 From 87f7068df992ee2db2c0e3885bcdf54eb55e6672 Mon Sep 17 00:00:00 2001 From: 1v Date: Thu, 3 Nov 2016 17:00:36 +0100 Subject: [PATCH 4/6] Update submodule --- bootswatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootswatch b/bootswatch index 4f96596..a4a1888 160000 --- a/bootswatch +++ b/bootswatch @@ -1 +1 @@ -Subproject commit 4f965965b6e8a39502e571fea51523ca31d798d7 +Subproject commit a4a1888523044ecc1eccfa93d6cc256c10e7401d From b9455e38e7066ef379070e3634ddaea749324040 Mon Sep 17 00:00:00 2001 From: 1v Date: Thu, 3 Nov 2016 17:01:42 +0100 Subject: [PATCH 5/6] Update assets --- .../bootswatch/cerulean/_bootswatch.scss | 9 +- .../bootswatch/cerulean/_variables.scss | 8 +- .../bootswatch/cosmo/_bootswatch.scss | 9 +- .../bootswatch/cosmo/_variables.scss | 6 +- .../bootswatch/cyborg/_bootswatch.scss | 20 ++- .../bootswatch/cyborg/_variables.scss | 18 +-- .../bootswatch/darkly/_bootswatch.scss | 13 +- .../bootswatch/darkly/_variables.scss | 8 +- .../bootswatch/flatly/_bootswatch.scss | 11 +- .../bootswatch/flatly/_variables.scss | 8 +- .../bootswatch/journal/_bootswatch.scss | 9 +- .../bootswatch/journal/_variables.scss | 6 +- .../bootswatch/lumen/_bootswatch.scss | 25 ++-- .../bootswatch/lumen/_variables.scss | 14 +- .../bootswatch/paper/_bootswatch.scss | 135 +++++++++++++----- .../bootswatch/paper/_variables.scss | 16 ++- .../bootswatch/readable/_bootswatch.scss | 11 +- .../bootswatch/readable/_variables.scss | 6 +- .../bootswatch/sandstone/_bootswatch.scss | 9 +- .../bootswatch/sandstone/_variables.scss | 6 +- .../bootswatch/simplex/_bootswatch.scss | 9 +- .../bootswatch/simplex/_variables.scss | 6 +- .../bootswatch/slate/_bootswatch.scss | 79 +++++----- .../bootswatch/slate/_variables.scss | 12 +- .../bootswatch/spacelab/_bootswatch.scss | 13 +- .../bootswatch/spacelab/_variables.scss | 6 +- .../bootswatch/superhero/_bootswatch.scss | 48 ++++--- .../bootswatch/superhero/_variables.scss | 10 +- .../bootswatch/united/_bootswatch.scss | 9 +- .../bootswatch/united/_variables.scss | 8 +- .../bootswatch/yeti/_bootswatch.scss | 20 ++- .../bootswatch/yeti/_variables.scss | 6 +- 32 files changed, 388 insertions(+), 185 deletions(-) diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss index f0c5564..3401ddd 100644 --- a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss @@ -1,4 +1,4 @@ -// Cerulean 3.3.5 +// Cerulean 3.3.7 // Bootswatch // ----------------------------------------------------- @@ -11,11 +11,10 @@ // Navbar ===================================================================== .navbar { - @include btn-shadow($navbar-default-bg); - filter: none; - @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1)); - .navbar-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; diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss index 3acc532..c67033b 100644 --- a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss @@ -1,4 +1,4 @@ -// Cerulean 3.3.5 +// Cerulean 3.3.7 // Variables // -------------------------------------------------- @@ -67,7 +67,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; @@ -110,7 +110,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; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss index 54a16b7..469b47c 100644 --- a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss @@ -1,8 +1,13 @@ -// Cosmo 3.3.5 +// Cosmo 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://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"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== diff --git a/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss b/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss index e2f6234..c7fba4d 100644 --- a/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss @@ -1,4 +1,4 @@ -// Cosmo 3.3.5 +// Cosmo 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss index 04d41ce..b013e25 100644 --- a/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss @@ -1,8 +1,13 @@ -// Cyborg 3.3.5 +// Cyborg 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== @@ -35,6 +40,13 @@ color: $brand-info; } +.bg-success, +.bg-info, +.bg-warning, +.bg-danger { + color: #fff; +} + // Tables ===================================================================== table, @@ -131,10 +143,6 @@ legend { color: #fff; } -.input-group-addon { - background-color: $btn-default-bg; -} - // Navs ======================================================================= .nav-tabs, diff --git a/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss b/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss index a30b8c9..aeb0a89 100644 --- a/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss @@ -1,4 +1,4 @@ -// Cyborg 3.3.5 +// Cyborg 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -218,7 +218,7 @@ $legend-color: $text-color !default; $legend-border-color: $gray-dark !default; //** Background color for textual input addons -$input-group-addon-bg: $gray-lighter !default; +$input-group-addon-bg: $btn-default-bg !default; //** Border color for textual input addons $input-group-addon-border-color: $input-border !default; @@ -521,7 +521,7 @@ $tooltip-max-width: 200px !default; //** Tooltip text color $tooltip-color: #fff !default; //** Tooltip background color -$tooltip-bg: #000 !default; +$tooltip-bg: lighten($body-bg, 15%) !default; $tooltip-opacity: .9 !default; //** Tooltip arrow width @@ -535,13 +535,13 @@ $tooltip-arrow-color: $tooltip-bg !default; //## //** Popover body background color -$popover-bg: lighten($body-bg, 10%) !default; +$popover-bg: $tooltip-bg !default; //** Popover maximum width $popover-max-width: 276px !default; //** Popover border color $popover-border-color: rgba(0,0,0,.2) !default; //** Popover fallback border color -$popover-fallback-border-color: #999 !default; +$popover-fallback-border-color: $popover-bg !default; //** Popover title background color $popover-title-bg: darken($popover-bg, 3%) !default; @@ -554,9 +554,9 @@ $popover-arrow-color: $popover-bg !default; //** Popover outer arrow width $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; //** Popover outer arrow color -$popover-arrow-outer-color: fadein($popover-border-color, 5%) !default; +$popover-arrow-outer-color: $popover-border-color !default; //** Popover outer arrow fallback color -$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default; +$popover-arrow-outer-fallback-color: $popover-fallback-border-color !default; //== Labels @@ -862,5 +862,7 @@ $blockquote-border-color: $gray-dark !default; $page-header-border-color: $gray-dark !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-dark !default; diff --git a/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss index 819c3ba..52ef52b 100644 --- a/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss @@ -1,8 +1,13 @@ -// Darkly 3.3.5 +// Darkly 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== @@ -144,6 +149,10 @@ textarea { } } +.form-control-feedback { + color: $input-color; +} + .has-warning { .help-block, .control-label, diff --git a/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss b/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss index aa38f98..011b5f1 100644 --- a/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss @@ -1,4 +1,4 @@ -// Darkly 3.3.5 +// Darkly 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -363,7 +363,7 @@ $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default; $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default; $navbar-collapse-max-height: 340px !default; -$navbar-default-color: #777 !default; +$navbar-default-color: #fff !default; $navbar-default-bg: $brand-primary !default; $navbar-default-border: transparent !default; @@ -862,5 +862,7 @@ $blockquote-border-color: $gray !default; $page-header-border-color: transparent !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 !default; diff --git a/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss index ae5cd59..8c173ea 100644 --- a/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss @@ -1,8 +1,13 @@ -// Flatly 3.3.5 +// Flatly 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== @@ -119,7 +124,7 @@ table, // Forms ====================================================================== .form-control, -input, { +input { border-width: 2px; @include box-shadow(none); diff --git a/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss b/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss index 833c691..a9fc092 100644 --- a/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss @@ -1,4 +1,4 @@ -// Flatly 3.3.5 +// Flatly 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -363,7 +363,7 @@ $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default; $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default; $navbar-collapse-max-height: 340px !default; -$navbar-default-color: #777 !default; +$navbar-default-color: #fff !default; $navbar-default-bg: $brand-primary !default; $navbar-default-border: transparent !default; @@ -862,5 +862,7 @@ $blockquote-border-color: $gray-lighter !default; $page-header-border-color: transparent !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; diff --git a/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss index c06b004..1e672e9 100644 --- a/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss @@ -1,8 +1,13 @@ -// Journal 3.3.5 +// Journal 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=News+Cycle:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== diff --git a/vendor/assets/stylesheets/bootswatch/journal/_variables.scss b/vendor/assets/stylesheets/bootswatch/journal/_variables.scss index f9587d9..a83cfbc 100644 --- a/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/journal/_variables.scss @@ -1,4 +1,4 @@ -// Journal 3.3.5 +// Journal 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss index 8e85e3a..8175030 100644 --- a/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss @@ -1,8 +1,13 @@ -// Lumen 3.3.5 +// Lumen 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); +$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); .shadow ($width: 4px) { border-width: 0 1px $width 1px; @@ -190,13 +195,15 @@ table, } } - > thead > tr > th, - > tbody > tr > th, - > tfoot > tr > th, - > thead > tr > td, - > tbody > tr > td, - > tfoot > tr > td { - border-color: transparent; + &:not(.table-bordered) { + > thead > tr > th, + > tbody > tr > th, + > tfoot > tr > th, + > thead > tr > td, + > tbody > tr > td, + > tfoot > tr > td { + border-color: transparent; + } } } diff --git a/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss b/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss index 8b25801..02d59bb 100644 --- a/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss @@ -1,4 +1,4 @@ -// Lumen 3.3.5 +// Lumen 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -134,7 +134,7 @@ $table-bg-hover: #f5f5f5 !default; $table-bg-active: $table-bg-hover !default; //** Border color for table and cell borders. -$table-border-color: #ddd !default; +$table-border-color: $gray-lighter !default; //== Buttons @@ -597,9 +597,9 @@ $modal-title-line-height: $line-height-base !default; //** Background color of modal content area $modal-content-bg: #fff !default; //** Modal content border color -$modal-content-border-color: rgba(0,0,0,.2) !default; +$modal-content-border-color: rgba(0,0,0,.05) !default; //** Modal content border color **for IE8** -$modal-content-fallback-border-color: #999 !default; +$modal-content-fallback-border-color: $gray-lighter !default; //** Modal backdrop background color $modal-backdrop-bg: #000 !default; @@ -670,7 +670,7 @@ $progress-bar-info-bg: $brand-info !default; //** Background color on `.list-group-item` $list-group-bg: #fff !default; //** `.list-group-item` border color -$list-group-border: #ddd !default; +$list-group-border: $gray-lighter !default; //** List group border radius $list-group-border-radius: $border-radius-base !default; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss index 880ec4e..e26c71b 100644 --- a/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss @@ -1,8 +1,41 @@ -// Paper 3.3.5 +// Paper 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); + +// Effects ================================================================= + +@mixin ripple() { + position: relative; + + &:after { + content: ""; + display: block; + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + @include gradient-radial(#000 10%, transparent 10.01%); + background-size: 1000% 1000%; + background-position: 50%; + opacity: 0; + pointer-events: none; + transition: background .5s, opacity 1s; + } + + &:active:after { + background-size: 0% 0%; + opacity: .2; + transition: 0s; + } +} // Navbar ===================================================================== @@ -15,13 +48,13 @@ } .navbar-inverse { - .form-control { - color: #fff; - @include placeholder($navbar-inverse-link-color); + .navbar-form { - &[type=text], - &[type=password] { + input[type=text], + input[type=password] { + color: #fff; @include box-shadow(inset 0 -1px 0 $navbar-inverse-link-color); + @include placeholder($navbar-inverse-link-color); &:focus { @include box-shadow(inset 0 -2px 0 #fff); @@ -35,20 +68,17 @@ #btn($class,$bg) { .btn-@{class} { - background-size: 200%; - background-position: 50%; + &:focus { + background-color: $bg; + } &:hover, - &:active:hover, - &:focus { + &:active:hover { background-color: darken($bg, 6%); } &:active { - background-color: darken($bg, 6%); - @include gradient-radial(darken($bg, 6%) 10%, $bg 11%); - background-size: 1000%; - @include box-shadow(2px 2px 2px rgba(0,0,0,.3)); + @include box-shadow(2px 2px 4px rgba(0,0,0,.4)); } } } @@ -59,26 +89,35 @@ #btn(info,$btn-info-bg); #btn(warning,$btn-warning-bg); #btn(danger,$btn-danger-bg); +#btn(link,#fff); .btn { text-transform: uppercase; - border-right: none; - border-bottom: none; - @include box-shadow(1px 1px 2px rgba(0,0,0,.3)); - @include transition(all 0.2s); + border: none; + @include box-shadow(1px 1px 4px rgba(0,0,0,.4)); + @include transition(all 0.4s); + @include ripple(); .btn-link { + border-radius: $btn-border-radius-base; @include box-shadow(none); + color: $btn-default-color; &:hover, &:focus { - color: $brand-primary; + @include box-shadow(none); + color: $btn-default-color; text-decoration: none; } } - .btn-default.disabled { - border: 1px solid $btn-default-border; + .btn-default { + + &.disabled { + background-color: rgba(0, 0, 0, 0.1); + color: rgba(0, 0, 0, 0.4); + opacity: 1; + } } } @@ -105,7 +144,6 @@ body { -webkit-font-smoothing: antialiased; letter-spacing: .1px; - text-rendering: optimizeLegibility; } p { @@ -116,7 +154,6 @@ input, button { -webkit-font-smoothing: antialiased; letter-spacing: .1px; - text-rendering: optimizeLegibility; } a { @@ -238,9 +275,9 @@ input[type="radio"], .radio input[type="radio"], .radio-inline input[type="radio"] { position: relative; - margin-top: 5px; + margin-top: 6px; margin-right: 4px; - vertical-align: -4px; + vertical-align: top; border: none; background-color: transparent; -webkit-appearance: none; @@ -257,7 +294,6 @@ input[type="radio"], display: block; width: 18px; height: 18px; - margin-top: -3px; border-radius: 50%; @include transition(240ms); } @@ -265,12 +301,14 @@ input[type="radio"], &:before { position: absolute; left: 0; - top: 0; + top: -3px; background-color: $brand-primary; @include scale(0); } &:after { + position: relative; + top: -3px; border: 2px solid $gray; } @@ -296,8 +334,8 @@ input[type="checkbox"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: relative; - vertical-align: -4px; border: none; + margin-bottom: -4px; -webkit-appearance: none; appearance: none; cursor: pointer; @@ -306,6 +344,10 @@ input[type="checkbox"], outline: none; } + &:focus:after { + border-color: $brand-primary; + } + &:after { content: ""; display: block; @@ -350,8 +392,12 @@ input[type="checkbox"], .has-warning { input:not([type=checkbox]), .form-control, + input.form-control[readonly], + input[type=text][readonly], + [type=text].form-control[readonly], input:not([type=checkbox]):focus, .form-control:focus { + border-bottom: none; @include box-shadow(inset 0 -2px 0 $brand-warning); } } @@ -359,8 +405,12 @@ input[type="checkbox"], .has-error { input:not([type=checkbox]), .form-control, + input.form-control[readonly], + input[type=text][readonly], + [type=text].form-control[readonly], input:not([type=checkbox]):focus, .form-control:focus { + border-bottom: none; @include box-shadow(inset 0 -2px 0 $brand-danger); } } @@ -368,12 +418,32 @@ input[type="checkbox"], .has-success { input:not([type=checkbox]), .form-control, + input.form-control[readonly], + input[type=text][readonly], + [type=text].form-control[readonly], input:not([type=checkbox]):focus, .form-control:focus { + border-bottom: none; @include box-shadow(inset 0 -2px 0 $brand-success); } } +// Remove the Bootstrap feedback styles for input addons +.input-group-addon { + .has-warning &, .has-error &, .has-success & { + color: $input-color; + border-color: $input-group-addon-border-color; + background-color: $input-group-addon-bg; + } +} + +.form-group-lg { + select, + select.form-control { + line-height: 1.5; + } +} + // Navs ======================================================================= .nav-tabs { @@ -454,7 +524,7 @@ input[type="checkbox"], background-color: $brand-danger; } - a:not(.close), + a:not(.close):not(.btn), .alert-link { color: #fff; font-weight: bold; @@ -466,7 +536,7 @@ input[type="checkbox"], } .badge { - padding: 3px 6px 5px; + padding: 4px 6px 4px; } .progress { @@ -572,5 +642,4 @@ input[type="checkbox"], color: inherit; } } -} - +} \ No newline at end of file diff --git a/vendor/assets/stylesheets/bootswatch/paper/_variables.scss b/vendor/assets/stylesheets/bootswatch/paper/_variables.scss index 244eede..097c063 100644 --- a/vendor/assets/stylesheets/bootswatch/paper/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/paper/_variables.scss @@ -1,4 +1,4 @@ -// Paper 3.3.5 +// Paper 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -143,9 +143,9 @@ $table-border-color: #ddd !default; $btn-font-weight: normal !default; -$btn-default-color: $text-color !default; +$btn-default-color: #444 !default; $btn-default-bg: #fff !default; -$btn-default-border: #eee !default; +$btn-default-border: transparent !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; @@ -485,7 +485,7 @@ $pager-disabled-color: $pagination-disabled-color !default; $jumbotron-padding: 30px !default; $jumbotron-color: inherit !default; -$jumbotron-bg: #f9f9f9 !default; +$jumbotron-bg: #f5f5f5 !default; $jumbotron-heading-color: $headings-color !default; $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default; $jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default; @@ -554,7 +554,7 @@ $popover-arrow-color: $popover-bg !default; //** Popover outer arrow width $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; //** Popover outer arrow color -$popover-arrow-outer-color: fadein($popover-border-color, 7.5%) !default; +$popover-arrow-outer-color: fadein($popover-border-color, 12%) !default; //** Popover outer arrow fallback color $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default; @@ -759,7 +759,7 @@ $thumbnail-caption-padding: 9px !default; // //## -$well-bg: #f9f9f9 !default; +$well-bg: #f5f5f5 !default; $well-border: transparent !default; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss index 3f4c569..590b277 100644 --- a/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss @@ -1,8 +1,13 @@ -// Readable 3.3.5 +// Readable 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Raleway:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== @@ -55,7 +60,7 @@ } } -@media (max-width: $grid-float-breakpoint - 1) { +@media (max-width: ($grid-float-breakpoint - 1)) { .navbar { .navbar-nav > li > a { margin: 0; diff --git a/vendor/assets/stylesheets/bootswatch/readable/_variables.scss b/vendor/assets/stylesheets/bootswatch/readable/_variables.scss index 02876e4..8ab7aae 100644 --- a/vendor/assets/stylesheets/bootswatch/readable/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/readable/_variables.scss @@ -1,4 +1,4 @@ -// Readable 3.3.5 +// Readable 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -862,5 +862,7 @@ $blockquote-border-color: $brand-primary !default; $page-header-border-color: #ddd !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; diff --git a/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss index 4bafe7f..9ca7432 100644 --- a/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss @@ -1,8 +1,13 @@ -// Sandstone 3.3.5 +// Sandstone 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:400,500"); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== diff --git a/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss b/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss index e0fb27c..e15111b 100644 --- a/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss @@ -1,4 +1,4 @@ -// Sandstone 3.3.5 +// Sandstone 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,7 @@ $component-active-color: $gray !default; //** Global background color for active items (e.g., navs or dropdowns). $component-active-bg: $gray-lighter !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; @@ -862,5 +862,7 @@ $blockquote-border-color: $gray-light !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; diff --git a/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss index b78318c..d89ed7b 100644 --- a/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss @@ -1,8 +1,13 @@ -// Simplex 3.3.5 +// Simplex 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); @mixin btn-shadow($color) { @include gradient-vertical-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); diff --git a/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss b/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss index 03daf0d..8fc8ec0 100644 --- a/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss @@ -1,4 +1,4 @@ -// Simplex 3.3.5 +// Simplex 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss index e978fb1..8577521 100644 --- a/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss @@ -1,4 +1,4 @@ -// Slate 3.3.5 +// Slate 3.3.7 // Bootswatch // ----------------------------------------------------- @@ -8,47 +8,66 @@ } @mixin btn-shadow-inverse($color) { - @include gradient-vertical-three-colors(darken($color, 24%), darken($color, 18%), 40%, darken($color, 14%)); + @include gradient-vertical-three-colors(darken($color, 24%), darken($color, 18%), 40%, darken($color, 16%)); filter: none; } // Navbar ===================================================================== .navbar { + .navbar-default, + .navbar-inverse { + border: 1px solid rgba(0, 0, 0, 0.6); + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); - @include btn-shadow($navbar-default-bg); - border: 1px solid rgba(0, 0, 0, 0.6); - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); + @media (min-width: $grid-float-breakpoint) { + .navbar-nav > li > a { + border-right: 1px solid rgba(0, 0, 0, 0.2); + border-left: 1px solid rgba(255, 255, 255, 0.1); - .navbar-inverse { - @include btn-shadow($navbar-inverse-bg); + &:hover { + border-left-color: transparent; + } + } - .badge { - background-color: $navbar-inverse-link-active-bg; + .nav .open > a { + border-color: transparent; + } + + .navbar-nav > li.active > a { + border-left-color: transparent; + } + + .navbar-form { + margin-left: 5px; + margin-right: 5px; + } } } - .navbar-nav > li > a { - border-right: 1px solid rgba(0, 0, 0, 0.2); - border-left: 1px solid rgba(255, 255, 255, 0.1); + .navbar-default { + @include btn-shadow($navbar-default-bg); - &:hover { - @include btn-shadow-inverse($navbar-default-bg); - border-left-color: transparent; + .navbar-nav > li > a { + &:hover { + @include btn-shadow-inverse($navbar-default-bg); + } } } - .nav .open > a { - border-color: transparent; - } + .navbar-inverse { + @include btn-shadow($navbar-inverse-bg); - .navbar-nav > li.active > a { - border-left-color: transparent; - } + .badge { + background-color: $navbar-inverse-link-active-bg; + } + + .navbar-nav > li > a { - .navbar-form { - margin-left: 5px; - margin-right: 5px; + &:hover { + @include btn-shadow-inverse($navbar-inverse-bg); + } + } } } @@ -201,8 +220,7 @@ textarea { } .input-group-addon { - background-color: $body-bg; - border: none; + border-color: $input-group-addon-border-color; } } @@ -227,8 +245,7 @@ textarea { } .input-group-addon { - background-color: $body-bg; - border: none; + border-color: $input-group-addon-border-color; } } @@ -253,8 +270,7 @@ textarea { } .input-group-addon { - background-color: $body-bg; - border: none; + border-color: $input-group-addon-border-color; } } @@ -263,9 +279,8 @@ legend { } .input-group-addon { - border-color: rgba(0, 0, 0, 0.6); - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); @include btn-shadow($btn-default-bg); + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); color: $btn-default-color; } diff --git a/vendor/assets/stylesheets/bootswatch/slate/_variables.scss b/vendor/assets/stylesheets/bootswatch/slate/_variables.scss index 9904dce..47ff7dd 100644 --- a/vendor/assets/stylesheets/bootswatch/slate/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/slate/_variables.scss @@ -1,4 +1,4 @@ -// Slate 3.3.5 +// Slate 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,7 @@ $component-active-color: #fff !default; //** Global background color for active items (e.g., navs or dropdowns). $component-active-bg: transparent !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; @@ -187,7 +187,7 @@ $input-bg-disabled: $gray-lighter !default; //** Text color for ``s $input-color: $gray-darker !default; //** `` border color -$input-border: #ccc !default; +$input-border: #000 !default; // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4 //** Default `.form-control` border radius @@ -218,9 +218,9 @@ $legend-color: $text-color !default; $legend-border-color: darken($gray-darker, 5%) !default; //** Background color for textual input addons -$input-group-addon-bg: $gray-lighter !default; +$input-group-addon-bg: $gray-dark !default; //** Border color for textual input addons -$input-group-addon-border-color: $input-border !default; +$input-group-addon-border-color: rgba(0, 0, 0, 0.6) !default; //** Disabled cursor for form controls and buttons. $cursor-disabled: not-allowed !default; @@ -862,5 +862,7 @@ $blockquote-border-color: $gray-light !default; $page-header-border-color: darken($gray-darker, 5%) !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: darken($gray-darker, 5%) !default; diff --git a/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss index 41bcfbb..b1f9063 100644 --- a/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss @@ -1,8 +1,13 @@ -// Spacelab 3.3.5 +// Spacelab 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); @mixin btn-shadow($color) { @include gradient-vertical-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%)); @@ -106,6 +111,10 @@ } } + .btn-link { + text-shadow: none; + } + &:active, &.active { background-image: none; diff --git a/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss b/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss index 74faf15..6248d9e 100644 --- a/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss @@ -1,4 +1,4 @@ -// Spacelab 3.3.5 +// Spacelab 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss index d4cb58f..72b8fcf 100644 --- a/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss @@ -1,15 +1,20 @@ -// Superhero 3.3.5 +// Superhero 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:300,400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== .navbar { @include box-shadow(none); border: none; - font-size: 12px; + font-size: $font-size-small; .navbar-default { @@ -32,8 +37,6 @@ .btn { - font-weight: 300; - .btn-default { &:hover { background-color: darken($btn-default-bg, 3%); @@ -42,16 +45,12 @@ .btn-sm, .btn-xs { - font-size: 12px; + font-size: $font-size-small; } } // Typography ================================================================= -body { - font-weight: 300; -} - .text-primary, .text-primary:hover { color: $brand-primary; @@ -88,8 +87,7 @@ body { @include box-shadow(none); > li > a { - font-size: 12px; - font-weight: 300; + font-size: $font-size-small; } } @@ -98,14 +96,14 @@ body { } .dropdown-header { - font-size: 12px; + font-size: $font-size-small; } // Tables ===================================================================== table, .table { - font-size: 12px; + font-size: $font-size-small; a:not(.btn) { color: #fff; @@ -141,8 +139,7 @@ label, .radio label, .checkbox label, .help-block { - font-size: 12px; - font-weight: 300; + font-size: $font-size-small; } .input-addon, @@ -165,6 +162,11 @@ label, color: $brand-warning; } + .form-control, + .form-control:focus { + border: 4px solid $brand-warning; + } + .input-group-addon { border: none; } @@ -185,6 +187,11 @@ label, color: $brand-danger; } + .form-control, + .form-control:focus { + border: 4px solid $brand-danger; + } + .input-group-addon { border: none; } @@ -205,6 +212,11 @@ label, color: $brand-success; } + .form-control, + .form-control:focus { + border: 4px solid $brand-success; + } + .input-group-addon { border: none; } @@ -252,10 +264,6 @@ label, // Indicators ================================================================= -.label { - font-weight: 300; -} - .alert { color: #fff; diff --git a/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss b/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss index c3ccc9e..e44ca32 100644 --- a/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss @@ -1,4 +1,4 @@ -// Superhero 3.3.5 +// Superhero 3.3.7 // Variables // -------------------------------------------------- @@ -50,7 +50,7 @@ $font-family-base: $font-family-sans-serif !default; $font-size-base: 15px !default; $font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px -$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px +$font-size-small: 12px !default; $font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px $font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px @@ -66,7 +66,7 @@ $line-height-computed: floor(($font-size-base * $line-height-base)) !default; //** By default, this inherits from the ``. $headings-font-family: inherit !default; -$headings-font-weight: 300 !default; +$headings-font-weight: 400 !default; $headings-line-height: 1.1 !default; $headings-color: inherit !default; @@ -110,7 +110,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; @@ -862,5 +862,7 @@ $blockquote-border-color: $gray-light !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: lighten($gray-light, 5%) !default; diff --git a/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss index dc66789..c73795a 100644 --- a/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss @@ -1,8 +1,13 @@ -// United 3.3.5 +// United 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== diff --git a/vendor/assets/stylesheets/bootswatch/united/_variables.scss b/vendor/assets/stylesheets/bootswatch/united/_variables.scss index 8832765..eb7feb3 100644 --- a/vendor/assets/stylesheets/bootswatch/united/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/united/_variables.scss @@ -1,4 +1,4 @@ -// United 3.3.5 +// United 3.3.7 // Variables // -------------------------------------------------- @@ -14,7 +14,7 @@ $gray: #777 !default; // #555 $gray-light: #AEA79F !default; // #999 $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee -$brand-primary: #DD4814 !default; +$brand-primary: #E95420 !default; $brand-success: #38B44A !default; $brand-info: #772953 !default; $brand-warning: #EFB73E !default; @@ -110,7 +110,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; @@ -862,5 +862,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; diff --git a/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss index 1beb274..005a127 100644 --- a/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss @@ -1,8 +1,13 @@ -// Yeti 3.3.5 +// Yeti 3.3.7 // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"; + +@mixin web-font($path) { + @import url("@{path}"); +} +@mixin web-font($web-font-path); // Navbar ===================================================================== @@ -35,6 +40,11 @@ } } + .navbar-text { + margin: 12px 15px; + line-height: 21px; + } + .dropdown { .dropdown-menu { @@ -317,12 +327,14 @@ input[type="checkbox"] { } } - .pagination-lg > li > a { + .pagination-lg > li > a, + .pagination-lg > li > span { padding-left: 22px; padding-right: 22px; } - .pagination-sm > li > a { + .pagination-sm > li > a, + .pagination-sm > li > span { padding: 0 5px; } } diff --git a/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss b/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss index f3a2ef5..4b015a7 100644 --- a/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss @@ -1,4 +1,4 @@ -// Yeti 3.3.5 +// Yeti 3.3.7 // Variables // -------------------------------------------------- @@ -110,7 +110,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; @@ -862,5 +862,7 @@ $blockquote-border-color: $table-border-color !default; $page-header-border-color: $table-border-color !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: $table-border-color !default; From f2f2b73b5953d27d13d343199268d8ef2dead31a Mon Sep 17 00:00:00 2001 From: 1v Date: Thu, 3 Nov 2016 18:16:35 +0100 Subject: [PATCH 6/6] Final update --- Rakefile | 10 +-- .../bootswatch/cerulean/_bootswatch.scss | 8 +- .../bootswatch/cerulean/_variables.scss | 30 ++++---- .../bootswatch/cosmo/_bootswatch.scss | 22 +++--- .../bootswatch/cosmo/_variables.scss | 30 ++++---- .../bootswatch/cyborg/_bootswatch.scss | 14 ++-- .../bootswatch/cyborg/_variables.scss | 30 ++++---- .../bootswatch/darkly/_bootswatch.scss | 34 ++++----- .../bootswatch/darkly/_variables.scss | 30 ++++---- .../bootswatch/flatly/_bootswatch.scss | 34 ++++----- .../bootswatch/flatly/_variables.scss | 30 ++++---- .../bootswatch/journal/_bootswatch.scss | 22 +++--- .../bootswatch/journal/_variables.scss | 30 ++++---- .../bootswatch/lumen/_bootswatch.scss | 70 +++++++++--------- .../bootswatch/lumen/_variables.scss | 30 ++++---- .../bootswatch/paper/_bootswatch.scss | 74 +++++++++---------- .../bootswatch/paper/_variables.scss | 30 ++++---- .../bootswatch/readable/_bootswatch.scss | 32 ++++---- .../bootswatch/readable/_variables.scss | 30 ++++---- .../bootswatch/sandstone/_bootswatch.scss | 42 +++++------ .../bootswatch/sandstone/_variables.scss | 30 ++++---- .../bootswatch/simplex/_bootswatch.scss | 12 +-- .../bootswatch/simplex/_variables.scss | 30 ++++---- .../bootswatch/slate/_bootswatch.scss | 20 ++--- .../bootswatch/slate/_variables.scss | 30 ++++---- .../bootswatch/spacelab/_bootswatch.scss | 36 ++++----- .../bootswatch/spacelab/_variables.scss | 30 ++++---- .../bootswatch/superhero/_bootswatch.scss | 32 ++++---- .../bootswatch/superhero/_variables.scss | 30 ++++---- .../bootswatch/united/_bootswatch.scss | 12 +-- .../bootswatch/united/_variables.scss | 30 ++++---- .../bootswatch/yeti/_bootswatch.scss | 48 ++++++------ .../bootswatch/yeti/_variables.scss | 30 ++++---- 33 files changed, 487 insertions(+), 515 deletions(-) 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/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss index 3401ddd..4186d7c 100644 --- a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss @@ -2,7 +2,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,7 +11,7 @@ // Navbar ===================================================================== .navbar { - .navbar-default { + &-default { @include btn-shadow($navbar-default-bg); filter: none; @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1)); @@ -22,7 +22,7 @@ } } - .navbar-inverse { + &-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%); @@ -34,7 +34,7 @@ } .navbar-nav > li > a, - .navbar-brand { + &-brand { text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); } } diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss index c67033b..db2f809 100644 --- a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Cerulean 3.3.7 // Variables // -------------------------------------------------- @@ -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. @@ -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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss index 469b47c..23161a7 100644 --- a/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss @@ -2,18 +2,14 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" !default; +@import url($web-font-path); // Navbar ===================================================================== .navbar { - .navbar-inverse { + &-inverse { .badge { background-color: #fff; @@ -206,13 +202,13 @@ table, // Containers ================================================================= .panel { - .panel-heading, - .panel-footer { + &-heading, + &-footer { border-top-right-radius: 0; border-top-left-radius: 0; } - .panel-default { + &-default { .close { color: $text-color; } @@ -221,7 +217,7 @@ table, a.list-group-item { - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -232,7 +228,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -243,7 +239,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } diff --git a/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss b/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss index c7fba4d..7aa27e8 100644 --- a/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Cosmo 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss index b013e25..010d836 100644 --- a/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss @@ -2,12 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700" !default; +@import url($web-font-path); // Navbar ===================================================================== @@ -200,7 +196,7 @@ a.list-group-item { border-color: $list-group-border; } - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -211,7 +207,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -222,7 +218,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } diff --git a/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss b/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss index aeb0a89..7b2f1ac 100644 --- a/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Cyborg 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: #fff !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. @@ -189,7 +191,7 @@ $input-color: $text-color !default; //** `` border color $input-border: $gray-dark !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss index 52ef52b..0c59684 100644 --- a/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss @@ -2,19 +2,15 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" !default; +@import url($web-font-path); // Navbar ===================================================================== .navbar { border-width: 0; - .navbar-default { + &-default { .badge { background-color: #fff; @@ -22,7 +18,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" } } - .navbar-inverse { + &-inverse { .badge { background-color: #fff; @@ -30,11 +26,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" } } - .navbar-brand { + &-brand { line-height: 1; } - .navbar-form { + &-form { .form-control { background-color: white; @@ -121,12 +117,12 @@ table, border: none; } - .table-bordered > thead > tr > th, - .table-bordered > tbody > tr > th, - .table-bordered > tfoot > tr > th, - .table-bordered > thead > tr > td, - .table-bordered > tbody > tr > td, - .table-bordered > tfoot > tr > td { + &-bordered > thead > tr > th, + &-bordered > tbody > tr > th, + &-bordered > tfoot > tr > th, + &-bordered > thead > tr > td, + &-bordered > tbody > tr > td, + &-bordered > tfoot > tr > td { border: 1px solid $table-border-color; } } @@ -312,7 +308,7 @@ a.list-group-item { border-color: $list-group-border; } - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -323,7 +319,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -334,7 +330,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } diff --git a/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss b/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss index 011b5f1..51f6de9 100644 --- a/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Darkly 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $gray !default; //** `` border color $input-border: #f1f1f1 !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss index 8c173ea..a9c2a77 100644 --- a/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss @@ -2,19 +2,15 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" !default; +@import url($web-font-path); // Navbar ===================================================================== .navbar { border-width: 0; - .navbar-default { + &-default { .badge { background-color: #fff; @@ -22,7 +18,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" } } - .navbar-inverse { + &-inverse { .badge { background-color: #fff; @@ -30,7 +26,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" } } - .navbar-brand { + &-brand { line-height: 1; } } @@ -111,12 +107,12 @@ table, border: none; } - .table-bordered > thead > tr > th, - .table-bordered > tbody > tr > th, - .table-bordered > tfoot > tr > th, - .table-bordered > thead > tr > td, - .table-bordered > tbody > tr > td, - .table-bordered > tfoot > tr > td { + &-bordered > thead > tr > th, + &-bordered > tbody > tr > th, + &-bordered > tfoot > tr > th, + &-bordered > thead > tr > td, + &-bordered > tbody > tr > td, + &-bordered > tfoot > tr > td { border: 1px solid $table-border-color; } } @@ -281,7 +277,7 @@ a.list-group-item { border-color: $list-group-border; } - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -292,7 +288,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -303,7 +299,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } @@ -316,7 +312,7 @@ a.list-group-item { } .panel { - .panel-default { + &-default { .close { color: $text-color; } diff --git a/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss b/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss index a9fc092..6bcaaba 100644 --- a/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Flatly 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $text-color !default; //** `` border color $input-border: #dce4ec !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss index 1e672e9..0beec2b 100644 --- a/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss @@ -2,12 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700" !default; +@import url($web-font-path); // Navbar ===================================================================== @@ -16,7 +12,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; font-family: $font-family-sans-serif; font-weight: $headings-font-weight; - .navbar-default { + &-default { .badge { background-color: #000; @@ -24,7 +20,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; } } - .navbar-inverse { + &-inverse { .badge { background-color: #fff; @@ -135,11 +131,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; .panel { - .panel-primary, - .panel-success, - .panel-warning, - .panel-danger, - .panel-info { + &-primary, + &-success, + &-warning, + &-danger, + &-info { .panel-title { color: #fff; } diff --git a/vendor/assets/stylesheets/bootswatch/journal/_variables.scss b/vendor/assets/stylesheets/bootswatch/journal/_variables.scss index a83cfbc..9aac45a 100644 --- a/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/journal/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Journal 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: #000 !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. @@ -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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss index 8175030..2d35f52 100644 --- a/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss @@ -2,14 +2,10 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"; +$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic" !default; +@import url($web-font-path); -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); - -.shadow ($width: 4px) { +@mixin shadow($width: 4px){ border-width: 0 1px $width 1px; } @@ -39,65 +35,65 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400 @include box-shadow(none); } - .btn-lg, - .btn-group-lg > .btn { + &-lg, + &-group-lg > .btn { padding: ($padding-large-vertical + 2) $padding-large-horizontal $padding-large-vertical; line-height: 15px; } - .btn-sm, - .btn-group-sm > .btn { + &-sm, + &-group-sm > .btn { padding: ($padding-small-vertical + 2) $padding-small-horizontal $padding-small-vertical; } - .btn-xs, - .btn-group-xs > .btn { + &-xs, + &-group-xs > .btn { padding: ($padding-xs-vertical + 2) $padding-xs-horizontal $padding-xs-vertical; } - .btn-default:hover, - .btn-default:focus, - .btn-group.open .dropdown-toggle.btn-default { + &-default:hover, + &-default:focus, + &-group.open .dropdown-toggle.btn-default { background-color: $btn-default-bg; border-color: $btn-default-border; } - .btn-primary:hover, - .btn-primary:focus, - .btn-group.open .dropdown-toggle.btn-primary { + &-primary:hover, + &-primary:focus, + &-group.open .dropdown-toggle.btn-primary { background-color: $btn-primary-bg; border-color: $btn-primary-border; } - .btn-success:hover, - .btn-success:focus, - .btn-group.open .dropdown-toggle.btn-success { + &-success:hover, + &-success:focus, + &-group.open .dropdown-toggle.btn-success { background-color: $btn-success-bg; border-color: $btn-success-border; } - .btn-info:hover, - .btn-info:focus, - .btn-group.open .dropdown-toggle.btn-info { + &-info:hover, + &-info:focus, + &-group.open .dropdown-toggle.btn-info { background-color: $btn-info-bg; border-color: $btn-info-border; } - .btn-warning:hover, - .btn-warning:focus, - .btn-group.open .dropdown-toggle.btn-warning { + &-warning:hover, + &-warning:focus, + &-group.open .dropdown-toggle.btn-warning { background-color: $btn-warning-bg; border-color: $btn-warning-border; } - .btn-danger:hover, - .btn-danger:focus, - .btn-group.open .dropdown-toggle.btn-danger { + &-danger:hover, + &-danger:focus, + &-group.open .dropdown-toggle.btn-danger { background-color: $btn-danger-bg; border-color: $btn-danger-border; } - .btn-group.open .dropdown-toggle { + &-group.open .dropdown-toggle { @include box-shadow(none); } } @@ -446,7 +442,7 @@ label { border: 1px solid $navbar-default-border; @include box-shadow(inset 0 2px 0 rgba(0, 0, 0, 0.1)); - .progress-bar { + &-bar { @include box-shadow(inset 0 -4px 0 rgba(0, 0, 0, 0.15)); } } @@ -466,7 +462,7 @@ a.list-group-item { border-color: $list-group-border; } - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -477,7 +473,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -488,7 +484,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } @@ -509,7 +505,7 @@ a.list-group-item { border: 1px solid $navbar-default-border; @include shadow(); - .panel-default { + &-default { .close { color: $text-color; } diff --git a/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss b/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss index 02d59bb..5e8d70f 100644 --- a/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Lumen 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: $gray-dark !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. @@ -189,7 +191,7 @@ $input-color: $gray !default; //** `` border color $input-border: darken(#f8f8f8, 6.5%) !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -257,7 +259,7 @@ $dropdown-link-disabled-color: $gray-lighter !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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss index e26c71b..11845cb 100644 --- a/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss @@ -2,16 +2,12 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default; +@import url($web-font-path); // Effects ================================================================= -@mixin ripple() { +@mixin ripple(){ position: relative; &:after { @@ -43,11 +39,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" border: none; @include box-shadow(0 1px 2px rgba(0,0,0,.3)); - .navbar-brand { + &-brand { font-size: 24px; } - .navbar-inverse { + &-inverse { .navbar-form { input[type=text], @@ -66,8 +62,8 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" // Buttons ==================================================================== -#btn($class,$bg) { - .btn-@{class} { +@mixin btn($class,$bg){ + .btn-#{$class} { &:focus { background-color: $bg; } @@ -83,13 +79,13 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" } } -#btn(default,$btn-default-bg); -#btn(primary,$btn-primary-bg); -#btn(success,$btn-success-bg); -#btn(info,$btn-info-bg); -#btn(warning,$btn-warning-bg); -#btn(danger,$btn-danger-bg); -#btn(link,#fff); +@include btn(default,$btn-default-bg); +@include btn(primary,$btn-primary-bg); +@include btn(success,$btn-success-bg); +@include btn(info,$btn-info-bg); +@include btn(warning,$btn-warning-bg); +@include btn(danger,$btn-danger-bg); +@include btn(link,#fff); .btn { text-transform: uppercase; @@ -98,7 +94,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" @include transition(all 0.4s); @include ripple(); - .btn-link { + &-link { border-radius: $btn-border-radius-base; @include box-shadow(none); color: $btn-default-color; @@ -111,7 +107,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" } } - .btn-default { + &-default { &.disabled { background-color: rgba(0, 0, 0, 0.1); @@ -129,7 +125,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" margin-left: 0; } - .btn-group-vertical { + &-vertical { > .btn + .btn, > .btn + .btn-group, > .btn-group + .btn, @@ -206,11 +202,11 @@ input[type=number], } &.input { - &.input-sm { + &-sm { font-size: $font-size-small; } - &.input-lg { + &-lg { font-size: $font-size-large; } } @@ -238,11 +234,11 @@ select.form-control { } &.input { - &.input-sm { + &-sm { font-size: $font-size-small; } - &.input-lg { + &-lg { font-size: $font-size-large; } } @@ -508,19 +504,19 @@ input[type="checkbox"], border: none; color: #fff; - .alert-success { + &-success { background-color: $brand-success; } - .alert-info { + &-info { background-color: $brand-info; } - .alert-warning { + &-warning { background-color: $brand-warning; } - .alert-danger { + &-danger { background-color: $brand-danger; } @@ -547,7 +543,7 @@ input[type="checkbox"], @include box-shadow(none); - .progress-bar { + &-bar { @include box-shadow(none); &:last-child { @@ -568,18 +564,18 @@ input[type="checkbox"], } } - &-bar-success:last-child.progress-bar:before { + &-success:last-child.progress-bar:before { background-color: lighten($brand-success, 35%); } - &-bar-info:last-child.progress-bar:before { + &-info:last-child.progress-bar:before { background-color: lighten($brand-info, 45%); } - &-bar-warning:last-child.progress-bar:before { + &-warning:last-child.progress-bar:before { background-color: lighten($brand-warning, 35%); } - &-bar-danger:last-child.progress-bar:before { + &-danger:last-child.progress-bar:before { background-color: lighten($brand-danger, 25%); } } @@ -603,11 +599,11 @@ input[type="checkbox"], .list-group { - .list-group-item { + &-item { padding: 15px; } - .list-group-item-text { + &-item-text { color: $gray-light; } } @@ -622,11 +618,11 @@ input[type="checkbox"], border-radius: 2px; @include box-shadow(0 1px 4px rgba(0,0,0,.3)); - .panel-heading { + &-heading { border-bottom: none; } - .panel-footer { + &-footer { border-top: none; } } @@ -637,7 +633,7 @@ input[type="checkbox"], } .carousel { - .carousel-caption { + &-caption { h1, h2, h3, h4, h5, h6 { color: inherit; } diff --git a/vendor/assets/stylesheets/bootswatch/paper/_variables.scss b/vendor/assets/stylesheets/bootswatch/paper/_variables.scss index 097c063..3cce0ca 100644 --- a/vendor/assets/stylesheets/bootswatch/paper/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/paper/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Paper 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: #444 !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. @@ -189,7 +191,7 @@ $input-color: $gray !default; //** `` border color $input-border: transparent !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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: $gray-light !default; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss index 590b277..edf7a17 100644 --- a/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss @@ -2,25 +2,21 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700" !default; +@import url($web-font-path); // Navbar ===================================================================== .navbar { font-family: $headings-font-family; - .navbar-nav, - .navbar-form { + &-nav, + &-form { margin-left: 0; margin-right: 0; } - .navbar-nav > li > a { + &-nav > li > a { $margin-vertical: (($navbar-height - 2*$padding-base-vertical - $line-height-computed - 2px) / 2); margin: $margin-vertical 6px; padding: $padding-base-vertical $padding-base-horizontal; @@ -32,20 +28,20 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700"; } } - .navbar-nav > .active > a, - .navbar-nav > .active > a:hover { + &-nav > .active > a, + &-nav > .active > a:hover { border: 1px solid #ddd; } - .navbar-default .navbar-nav > .active > a:hover { + &-default .navbar-nav > .active > a:hover { color: $navbar-default-link-hover-color; } - .navbar-inverse .navbar-nav > .active > a:hover { + &-inverse .navbar-nav > .active > a:hover { color: $navbar-inverse-link-hover-color; } - .navbar-brand { + &-brand { padding-top: (($navbar-height - 2*$font-size-large) / 2); padding-bottom: (($navbar-height - 2*$font-size-large) / 2); line-height: 1.9; @@ -102,8 +98,8 @@ legend { font-family: $headings-font-family; - .pagination-lg > li > a, - .pagination-lg > li > span { + &-lg > li > a, + &-lg > li > span { padding: 14px 24px; } } @@ -152,7 +148,7 @@ legend { font-family: $headings-font-family; font-weight: normal; - .label-default { + &-default { border: 1px solid #ddd; color: $text-color; } @@ -173,7 +169,7 @@ legend { .panel { @include box-shadow(none); - .panel-default { + &-default { .close { color: $text-color; } diff --git a/vendor/assets/stylesheets/bootswatch/readable/_variables.scss b/vendor/assets/stylesheets/bootswatch/readable/_variables.scss index 8ab7aae..e128e41 100644 --- a/vendor/assets/stylesheets/bootswatch/readable/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/readable/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Readable 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $text-color !default; //** `` border color $input-border: #ddd !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss index 9ca7432..e576413 100644 --- a/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss @@ -2,12 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700" !default; +@import url($web-font-path); // Navbar ===================================================================== @@ -20,11 +16,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700"; .navbar { .nav > li > a { - .sandstone; + @extend .sandstone; } - .navbar-form input, - .navbar-form .form-control { + &-form input, + &-form .form-control { border: none; } } @@ -33,17 +29,17 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700"; .btn { border: none; - .sandstone; + @extend .sandstone; &:hover { border-color: transparent; } - .btn-lg { + &-lg { line-height: 26px; } - .btn-default { + &-default { &:hover { background-color: $navbar-default-link-active-bg; } @@ -69,7 +65,7 @@ input, // Navs ======================================================================= .nav { - .sandstone; + @extend .sandstone; .open > a, .open > a:hover, @@ -111,7 +107,7 @@ input, } .breadcrumb { - .sandstone; + @extend .sandstone; border: 1px solid $gray-light; @@ -121,11 +117,11 @@ input, } .pagination { - .sandstone; + @extend .sandstone; } .pager { - .sandstone; + @extend .sandstone; li > a { color: $gray; @@ -134,7 +130,7 @@ input, .dropdown-menu { & > li > a { - .sandstone; + @extend .sandstone; } } @@ -149,7 +145,7 @@ input, } .tooltip { - .sandstone; + @extend .sandstone; } // Progress bars ============================================================== @@ -159,7 +155,7 @@ input, background-color: $gray-light; @include box-shadow(none); - .progress-bar { + &-bar { @include box-shadow(none); } } @@ -167,7 +163,7 @@ input, // Containers ================================================================= .list-group { - .list-group-item { + &-item { padding: 16px 24px; } } @@ -181,15 +177,15 @@ input, .panel-heading, .panel-title { - .sandstone; + @extend .sandstone; color: #fff; } .panel-footer { - .sandstone; + @extend .sandstone; } - .panel-default { + &-default { .panel-heading, .panel-title, .panel-footer { diff --git a/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss b/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss index e15111b..ddc1545 100644 --- a/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Sandstone 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $text-color !default; //** `` border color $input-border: $gray-light !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss index d89ed7b..a3babc4 100644 --- a/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss @@ -2,14 +2,10 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700"; +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700" !default; +@import url($web-font-path); -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); - -@mixin btn-shadow($color) { +@mixin btn-shadow($color){ @include gradient-vertical-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); filter: none; border: 1px solid darken($color, 10%); @@ -19,7 +15,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700"; .navbar { - .navbar-inverse { + &-inverse { .badge { background-color: #fff; diff --git a/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss b/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss index 8fc8ec0..ead5a4c 100644 --- a/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Simplex 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: $gray-dark !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. @@ -189,7 +191,7 @@ $input-color: $text-color !default; //** `` border color $input-border: #ddd !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss index 8577521..7b3bcd7 100644 --- a/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss @@ -2,12 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@mixin btn-shadow($color) { +@mixin btn-shadow($color){ @include gradient-vertical-three-colors(lighten($color, 6%), $color, 60%, darken($color, 4%)); filter: none; } -@mixin btn-shadow-inverse($color) { +@mixin btn-shadow-inverse($color){ @include gradient-vertical-three-colors(darken($color, 24%), darken($color, 18%), 40%, darken($color, 16%)); filter: none; } @@ -15,8 +15,8 @@ // Navbar ===================================================================== .navbar { - .navbar-default, - .navbar-inverse { + &-default, + &-inverse { border: 1px solid rgba(0, 0, 0, 0.6); text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); @@ -45,7 +45,7 @@ } } - .navbar-default { + &-default { @include btn-shadow($navbar-default-bg); .navbar-nav > li > a { @@ -55,7 +55,7 @@ } } - .navbar-inverse { + &-inverse { @include btn-shadow($navbar-inverse-bg); .badge { @@ -174,7 +174,7 @@ h1, h2, h3, h4, h5, h6 { color: #fff; } - .table-bordered tbody { + &-bordered tbody { tr.success, tr.warning, @@ -406,7 +406,7 @@ a.list-group-item { border-color: $list-group-border; } - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -417,7 +417,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -428,7 +428,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } diff --git a/vendor/assets/stylesheets/bootswatch/slate/_variables.scss b/vendor/assets/stylesheets/bootswatch/slate/_variables.scss index 47ff7dd..6da1088 100644 --- a/vendor/assets/stylesheets/bootswatch/slate/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/slate/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Slate 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $gray-darker !default; //** `` border color $input-border: #000 !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss index b1f9063..b3623cf 100644 --- a/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss @@ -2,14 +2,10 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"; +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" !default; +@import url($web-font-path); -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); - -@mixin btn-shadow($color) { +@mixin btn-shadow($color){ @include gradient-vertical-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%)); filter: none; border: 1px solid darken($color, 10%); @@ -22,7 +18,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 @include btn-shadow($navbar-default-bg); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); - .navbar-inverse { + &-inverse { @include btn-shadow($navbar-inverse-bg); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); @@ -36,15 +32,15 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 text-shadow: none; } - .navbar-nav > li > a, - .navbar-nav > li > a:hover { + &-nav > li > a, + &-nav > li > a:hover { padding-top: ($navbar-padding-vertical + 2px); padding-bottom: ($navbar-padding-vertical - 2px); @include transition(color ease-in-out .2s); } - .navbar-brand, - .navbar-brand:hover { + &-brand, + &-brand:hover { @include transition(color ease-in-out .2s); } @@ -63,7 +59,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 .btn { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - .btn-default { + &-default { @include btn-shadow($btn-default-bg); &:hover { @@ -71,7 +67,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 } } - .btn-primary { + &-primary { @include btn-shadow($btn-primary-bg); &:hover { @@ -79,7 +75,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 } } - .btn-success { + &-success { @include btn-shadow($btn-success-bg); &:hover { @@ -87,7 +83,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 } } - .btn-info { + &-info { @include btn-shadow($btn-info-bg); &:hover { @@ -95,7 +91,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 } } - .btn-warning { + &-warning { @include btn-shadow($btn-warning-bg); &:hover { @@ -103,7 +99,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 } } - .btn-danger { + &-danger { @include btn-shadow($btn-danger-bg); &:hover { @@ -111,7 +107,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 } } - .btn-link { + &-link { text-shadow: none; } @@ -138,7 +134,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700 .panel { - .panel-primary { + &-primary { .panel-title { color: #fff; } diff --git a/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss b/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss index 6248d9e..2fec16e 100644 --- a/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Spacelab 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: $gray-darker !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. @@ -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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss index 72b8fcf..c23166b 100644 --- a/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss @@ -2,12 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !default; +@import url($web-font-path); // Navbar ===================================================================== @@ -16,7 +12,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; border: none; font-size: $font-size-small; - .navbar-default { + &-default { .badge { background-color: #fff; @@ -24,7 +20,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; } } - .navbar-inverse { + &-inverse { .badge { background-color: #fff; @@ -37,14 +33,14 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; .btn { - .btn-default { + &-default { &:hover { background-color: darken($btn-default-bg, 3%); } } - .btn-sm, - .btn-xs { + &-sm, + &-xs { font-size: $font-size-small; } } @@ -298,7 +294,7 @@ a.list-group-item { border: none; } - a.list-group-item-success { + &-success { &.active { background-color: $state-success-bg; } @@ -309,7 +305,7 @@ a.list-group-item { } } - a.list-group-item-warning { + &-warning { &.active { background-color: $state-warning-bg; } @@ -320,7 +316,7 @@ a.list-group-item { } } - a.list-group-item-danger { + &-danger { &.active { background-color: $state-danger-bg; } @@ -335,7 +331,7 @@ a.list-group-item { .panel { border: none; - .panel-default > .panel-heading { + &-default > .panel-heading { background-color: $table-bg-hover; color: $text-color; } @@ -349,8 +345,8 @@ a.list-group-item { .modal { padding: 0; - .modal-header, - .modal-footer { + &-header, + &-footer { background-color: $table-bg-hover; border: none; border-radius: 0; @@ -358,7 +354,7 @@ a.list-group-item { } .popover { - .popover-title { + &-title { border: none; } } diff --git a/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss b/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss index e44ca32..082681a 100644 --- a/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Superhero 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $body-bg !default; //** `` border color $input-border: transparent !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -257,7 +259,7 @@ $dropdown-link-disabled-color: $body-bg !default; //** Text color for headers within dropdown menus. $dropdown-header-color: $body-bg !default; -//** Deprecated `@dropdown-caret-color` as of v3.1.0 +//** Deprecated `$dropdown-caret-color` as of v3.1.0 $dropdown-caret-color: #000 !default; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss index c73795a..e7dae2c 100644 --- a/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss @@ -2,18 +2,14 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700" !default; +@import url($web-font-path); // Navbar ===================================================================== .navbar { - .navbar-default { + &-default { .badge { background-color: #fff; @@ -21,7 +17,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700"; } } - .navbar-inverse { + &-inverse { .badge { background-color: #fff; diff --git a/vendor/assets/stylesheets/bootswatch/united/_variables.scss b/vendor/assets/stylesheets/bootswatch/united/_variables.scss index eb7feb3..bbb32d7 100644 --- a/vendor/assets/stylesheets/bootswatch/united/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/united/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // United 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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; diff --git a/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss index 005a127..3e5158c 100644 --- a/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss +++ b/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss @@ -2,12 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"; - -@mixin web-font($path) { - @import url("@{path}"); -} -@mixin web-font($web-font-path); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default; +@import url($web-font-path); // Navbar ===================================================================== @@ -20,7 +16,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400 background-color: #b3b3b3; } - .navbar-collapse { + &-collapse { border-top-color: $dropdown-divider-bg; @include box-shadow(none); } @@ -30,7 +26,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400 padding-bottom: 6px; } - .navbar-form { + &-form { margin-top: 7px; margin-bottom: 5px; @@ -40,14 +36,14 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400 } } - .navbar-text { + &-text { margin: 12px 15px; line-height: 21px; } .dropdown { - .dropdown-menu { + &-menu { border: none; > li > a, @@ -58,13 +54,13 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400 } } - .dropdown-header { + &-header { color: rgba(255, 255, 255, 0.5); } } - .navbar-default { + &-default { .dropdown-menu { background-color: $navbar-default-bg; @@ -82,7 +78,7 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400 } } - .navbar-inverse { + &-inverse { .dropdown-menu { background-color: $navbar-inverse-bg; @@ -106,15 +102,15 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400 .btn { padding: $padding-base-vertical $padding-base-horizontal; - .btn-lg { + &-lg { padding: $padding-large-vertical $padding-large-horizontal; } - .btn-sm { + &-sm { padding: $padding-small-vertical $padding-small-horizontal; } - .btn-xs { + &-xs { padding: $padding-xs-vertical $padding-xs-horizontal; } } @@ -327,14 +323,14 @@ input[type="checkbox"] { } } - .pagination-lg > li > a, - .pagination-lg > li > span { + &-lg > li > a, + &-lg > li > span { padding-left: 22px; padding-right: 22px; } - .pagination-sm > li > a, - .pagination-sm > li > span { + &-sm > li > a, + &-sm > li > span { padding: 0 5px; } } @@ -380,7 +376,7 @@ input[type="checkbox"] { border-radius: 0; font-weight: 300; - .label-default { + &-default { background-color: $btn-default-bg; color: $btn-default-color; } @@ -404,7 +400,7 @@ input[type="checkbox"] { .dropdown { - .dropdown-menu { + &-menu { padding: 0; margin-top: 0; font-size: $font-size-small; @@ -414,7 +410,7 @@ input[type="checkbox"] { } } - .dropdown-header { + &-header { padding-left: 15px; padding-right: 15px; font-size: 9px; @@ -429,13 +425,13 @@ input[type="checkbox"] { } .panel { - .panel-heading, - .panel-footer { + &-heading, + &-footer { border-top-right-radius: 0; border-top-left-radius: 0; } - .panel-default { + &-default { .close { color: $text-color; } diff --git a/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss b/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss index 4b015a7..13acf80 100644 --- a/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss +++ b/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss @@ -1,3 +1,4 @@ +$bootstrap-sass-asset-helper: false !default; // Yeti 3.3.7 // Variables // -------------------------------------------------- @@ -76,6 +77,7 @@ $headings-color: inherit !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. @@ -189,7 +191,7 @@ $input-color: $gray !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 ``s in CSS. $input-border-radius: $border-radius-base !default; @@ -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; @@ -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 @@ -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;