From e31d2e71771443b2e1706e2a685ac6f5c1c5fd10 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 17 Dec 2014 15:33:53 +0000 Subject: rake convert --- .../fonts/bootstrap/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes assets/stylesheets/bootstrap/_carousel.scss | 1 + assets/stylesheets/bootstrap/_glyphicons.scss | 3 ++- assets/stylesheets/bootstrap/_variables.scss | 3 ++- lib/bootstrap-sass/version.rb | 2 +- templates/project/_bootstrap-variables.sass | 3 ++- 6 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 diff --git a/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 b/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 differ diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss index b4a5312..4b2a33e 100644 --- a/assets/stylesheets/bootstrap/_carousel.scss +++ b/assets/stylesheets/bootstrap/_carousel.scss @@ -148,6 +148,7 @@ width: 20px; height: 20px; margin-top: -10px; + line-height: 1; font-family: serif; } diff --git a/assets/stylesheets/bootstrap/_glyphicons.scss b/assets/stylesheets/bootstrap/_glyphicons.scss index 699f1b8..695276f 100644 --- a/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/assets/stylesheets/bootstrap/_glyphicons.scss @@ -12,6 +12,7 @@ font-family: 'Glyphicons Halflings'; src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot')); src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'), + url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'), url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'), url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'), url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg'); @@ -239,7 +240,7 @@ .glyphicon-copy { &:before { content: "\e205"; } } .glyphicon-paste { &:before { content: "\e206"; } } .glyphicon-door { &:before { content: "\1f6aa"; } } -.glyphicon-key { &:before { content: "\1F511"; } } +.glyphicon-key { &:before { content: "\1f511"; } } .glyphicon-alert { &:before { content: "\e209"; } } .glyphicon-equalizer { &:before { content: "\e210"; } } .glyphicon-king { &:before { content: "\e211"; } } diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index e23cba0..3589a3c 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -15,7 +15,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555 $gray-light: lighten($gray-base, 46.7%) !default; // #777 $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee -$brand-primary: darken(#428bca, 6.5%) !default; +$brand-primary: darken(#428bca, 6.5%) !default; // #337ab7 $brand-success: #5cb85c !default; $brand-info: #5bc0de !default; $brand-warning: #f0ad4e !default; @@ -192,6 +192,7 @@ $input-border: #ccc !default; // 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; //** Large `.form-control` border radius $input-border-radius-large: $border-radius-large !default; diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 2f57651..1cf175c 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.3.1.0' - BOOTSTRAP_SHA = '20ddded9f8050c9011c183f1c676d374d69a094e' + BOOTSTRAP_SHA = '8deda6116f8f72b34ee46cd43c083aad7e13e406' end diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index 080b1a3..16e87f1 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -16,7 +16,7 @@ // $gray-light: lighten($gray-base, 46.7%) // #777 // $gray-lighter: lighten($gray-base, 93.5%) // #eee -// $brand-primary: darken(#428bca, 6.5%) +// $brand-primary: darken(#428bca, 6.5%) // #337ab7 // $brand-success: #5cb85c // $brand-info: #5bc0de // $brand-warning: #f0ad4e @@ -193,6 +193,7 @@ // 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 //** Large `.form-control` border radius // $input-border-radius-large: $border-radius-large -- cgit v1.2.3