kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

rake convert

Browse source
This commit is contained in:
Gleb Mazovetskiy 2014-12-17 15:33:53 +00:00 • committed by Gleb Mazovetskiy
parent 3e33c6f0d7
commit e31d2e7177
6 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 Normal file
View file

Binary file not shown.

1
assets/stylesheets/bootstrap/_carousel.scss
View file

@ -148,6 +148,7 @@
width: 20px;
height: 20px;
margin-top: -10px;
line-height: 1;
font-family: serif;
}

3
assets/stylesheets/bootstrap/_glyphicons.scss
View file

@ -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"; } }

3
assets/stylesheets/bootstrap/_variables.scss
View file

@ -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 `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
$input-border-radius: $border-radius-base !default;
//** Large `.form-control` border radius
$input-border-radius-large: $border-radius-large !default;

2
lib/bootstrap-sass/version.rb
View file

@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.3.1.0'
BOOTSTRAP_SHA = '20ddded9f8050c9011c183f1c676d374d69a094e'
BOOTSTRAP_SHA = '8deda6116f8f72b34ee46cd43c083aad7e13e406'
end

3
templates/project/_bootstrap-variables.sass
View file

@ -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 `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
// $input-border-radius: $border-radius-base
//** Large `.form-control` border radius
// $input-border-radius-large: $border-radius-large