diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
| commit | 689e75e4b1b8055e657b30eb692b34ebf9d549da (patch) | |
| tree | 711f3f78d34a69f34ee40fa24a7e8fc4f961ae00 /less | |
| parent | b886fd2f012f3ebe68292aaedf55d5c3709f972b (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.tar.xz bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.zip | |
Merge branch 'master' into text-emphasis-variant
Diffstat (limited to 'less')
| -rw-r--r-- | less/scaffolding.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/less/scaffolding.less b/less/scaffolding.less index 976b4e3c2..c4869139b 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -5,7 +5,9 @@ // Reset the box-sizing -*, +* { + .box-sizing(border-box); +} *:before, *:after { .box-sizing(border-box); diff --git a/less/variables.less b/less/variables.less index 106a73457..d9147eb59 100644 --- a/less/variables.less +++ b/less/variables.less @@ -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 |