mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-06-25 16:57:22 -07:00
parent e40df7cfac 4abb095783
commit 4045740c54
36 changed files with 3598 additions and 3661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/progress-bars.less
+7
View File
@@ -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; }
less/type.less
+2 -2
View File
@@ -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
less/variables.less
+3 -8
View File
@@ -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;