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

Unitless line-height

* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
This commit is contained in:
Mark Otto
2013-05-09 17:20:46 -07:00
parent 7b6352d2cf
commit 6fba68eb8b
8 changed files with 124 additions and 128 deletions
+4 -4
View File
@@ -24,8 +24,8 @@
margin-top: 10px;
> li > a {
padding-top: ((@navbar-height - @line-height-base) / 2);
padding-bottom: ((@navbar-height - @line-height-base) / 2);
padding-top: ((@navbar-height - @line-height-computed) / 2);
padding-bottom: ((@navbar-height - @line-height-computed) / 2);
color: @navbar-link-color;
line-height: 20px;
}
@@ -91,7 +91,7 @@
padding: 15px;
font-size: @font-size-large;
font-weight: 500;
line-height: @line-height-base;
line-height: @line-height-computed;
color: @navbar-brand-color;
text-align: center;
&:hover,
@@ -323,7 +323,7 @@
// Add a class to make any element properly align itself vertically within the navbars.
.navbar-text {
.navbar-vertical-align(@line-height-computed);
}