mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'master' into dancek-breadcrumb-separator

Browse Source
This commit is contained in:
Mark Otto
2013-09-01 10:01:57 +02:00
parent eb95574d80 4b53ea52e9
commit daa8330b41
9 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/input-groups.less
+1
View File
@@ -61,6 +61,7 @@
font-size: @font-size-base;
font-weight: normal;
line-height: 1;
color: @input-color;
text-align: center;
background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;
less/type.less
+1
View File
@@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6,
font-family: @headings-font-family;
font-weight: @headings-font-weight;
line-height: @headings-line-height;
color: inherit;
small {
font-weight: normal;
less/variables.less
+2
View File
@@ -61,6 +61,8 @@
@headings-font-family: @font-family-base;
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;
// Iconography
// -------------------------