diff options
| author | Mark Otto <[email protected]> | 2014-06-25 16:57:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-25 16:57:22 -0700 |
| commit | 4045740c54504ede15f831c877f134752b6c12be (patch) | |
| tree | c3291b31e7dd119fbf43028300f49213e9912652 /less | |
| parent | e40df7cfacef0b581810c8ec661923054541638c (diff) | |
| parent | 4abb0957833c7158563244d1770ab9a5e6966150 (diff) | |
| download | bootstrap-4045740c54504ede15f831c877f134752b6c12be.tar.xz bootstrap-4045740c54504ede15f831c877f134752b6c12be.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/progress-bars.less | 7 | ||||
| -rw-r--r-- | less/type.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 11 |
3 files changed, 12 insertions, 10 deletions
diff --git a/less/progress-bars.less b/less/progress-bars.less index 3d4e6306f..3ac52a29e 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -6,6 +6,13 @@ // Bar animations // ------------------------- +// WebKit +@-webkit-keyframes progress-bar-stripes { + from { background-position: 40px 0; } + to { background-position: 0 0; } +} + +// Spec and IE10+ @keyframes progress-bar-stripes { from { background-position: 40px 0; } to { background-position: 0 0; } diff --git a/less/type.less b/less/type.less index 5eb69f3c2..9b1e48bae 100644 --- a/less/type.less +++ b/less/type.less @@ -74,10 +74,10 @@ p { // Emphasis & misc // ------------------------- -// Ex: 14px base font * 85% = about 12px +// Ex: (12px small font / 14px base font) * 100% = about 85% small, .small { - font-size: 85%; + font-size: floor((100% * @font-size-small / @font-size-base)); } // Undo browser default styling diff --git a/less/variables.less b/less/variables.less index 2f339fb41..582f0f8d3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -822,6 +822,8 @@ // //## +//** Horizontal offset for forms and lists. +@component-offset-horizontal: 180px; //** Text muted color @text-muted: @gray-light; //** Abbreviations and acronyms border color @@ -838,14 +840,7 @@ @page-header-border-color: @gray-lighter; //** Width of horizontal description list titles @dl-horizontal-offset: @component-offset-horizontal; - - -//== Miscellaneous -// -//## - //** Horizontal line color. @hr-border: @gray-lighter; -//** Horizontal offset for forms and lists. -@component-offset-horizontal: 180px; + |