mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'master' into bg-variant

Browse Source
This commit is contained in:
Mark Otto
2014-01-18 14:11:55 -08:00
parent b121207e10 b1721f42cc
commit cd1bea0616
55 changed files with 2407 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/scaffolding.less
+3 -1
View File
@@ -5,7 +5,9 @@
// Reset the box-sizing
*,
* {
.box-sizing(border-box);
}
*:before,
*:after {
.box-sizing(border-box);
less/variables.less
+2 -2
View File
@@ -58,7 +58,7 @@
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
//** Computed "line-height" (`font-size` × `line-height`) for use with `margin`, `padding`, etc.
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`.
@@ -548,7 +548,7 @@
@modal-content-bg: #fff;
//** Modal content border color
@modal-content-border-color: rgba(0,0,0,.2);
//** Modal content border color <strong>for IE8</strong>
//** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999;
//** Modal backdrop background color