aboutsummaryrefslogtreecommitdiff
path: root/less/type.less
diff options
context:
space:
mode:
Diffstat (limited to 'less/type.less')
-rw-r--r--less/type.less128
1 files changed, 71 insertions, 57 deletions
diff --git a/less/type.less b/less/type.less
index 1e4ff9d18..24a581fe8 100644
--- a/less/type.less
+++ b/less/type.less
@@ -3,15 +3,65 @@
// --------------------------------------------------
+// Headings
+// -------------------------
+
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+ font-family: @headings-font-family;
+ font-weight: @headings-font-weight;
+ line-height: @headings-line-height;
+ color: @headings-color;
+
+ small,
+ .small {
+ font-weight: normal;
+ line-height: 1;
+ color: @headings-small-color;
+ }
+}
+
+h1,
+h2,
+h3 {
+ margin-top: @line-height-computed;
+ margin-bottom: (@line-height-computed / 2);
+
+ small,
+ .small {
+ font-size: 65%;
+ }
+}
+h4,
+h5,
+h6 {
+ margin-top: (@line-height-computed / 2);
+ margin-bottom: (@line-height-computed / 2);
+
+ small,
+ .small {
+ font-size: 75%;
+ }
+}
+
+h1, .h1 { font-size: @font-size-h1; }
+h2, .h2 { font-size: @font-size-h2; }
+h3, .h3 { font-size: @font-size-h3; }
+h4, .h4 { font-size: @font-size-h4; }
+h5, .h5 { font-size: @font-size-h5; }
+h6, .h6 { font-size: @font-size-h6; }
+
+
// Body text
// -------------------------
p {
margin: 0 0 (@line-height-computed / 2);
}
+
.lead {
margin-bottom: @line-height-computed;
- font-size: (@font-size-base * 1.15);
+ font-size: floor((@font-size-base * 1.15));
font-weight: 200;
line-height: 1.4;
@@ -70,52 +120,7 @@ cite { font-style: normal; }
.text-left { text-align: left; }
.text-right { text-align: right; }
.text-center { text-align: center; }
-
-
-// Headings
-// -------------------------
-
-h1, h2, h3, h4, h5, h6,
-.h1, .h2, .h3, .h4, .h5, .h6 {
- font-family: @headings-font-family;
- font-weight: @headings-font-weight;
- line-height: @headings-line-height;
- color: @headings-color;
-
- small {
- font-weight: normal;
- line-height: 1;
- color: @headings-small-color;
- }
-}
-
-h1,
-h2,
-h3 {
- margin-top: @line-height-computed;
- margin-bottom: (@line-height-computed / 2);
-
- small {
- font-size: 65%;
- }
-}
-h4,
-h5,
-h6 {
- margin-top: (@line-height-computed / 2);
- margin-bottom: (@line-height-computed / 2);
-
- small {
- font-size: 75%;
- }
-}
-
-h1, .h1 { font-size: @font-size-h1; }
-h2, .h2 { font-size: @font-size-h2; }
-h3, .h3 { font-size: @font-size-h3; }
-h4, .h4 { font-size: @font-size-h4; }
-h5, .h5 { font-size: @font-size-h5; }
-h6, .h6 { font-size: @font-size-h6; }
+.text-justify { text-align: justify; }
// Page header
@@ -128,7 +133,6 @@ h6, .h6 { font-size: @font-size-h6; }
}
-
// Lists
// --------------------------------------------------
@@ -138,7 +142,7 @@ ol {
margin-top: 0;
margin-bottom: (@line-height-computed / 2);
ul,
- ol{
+ ol {
margin-bottom: 0;
}
}
@@ -150,18 +154,25 @@ ol {
padding-left: 0;
list-style: none;
}
+
// Inline turns list items into inline-block
.list-inline {
.list-unstyled();
+
> li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
+
+ &:first-child {
+ padding-left: 0;
+ }
}
}
// Description Lists
dl {
+ margin-top: 0; // Remove browser default
margin-bottom: @line-height-computed;
}
dt,
@@ -191,7 +202,7 @@ dd {
}
dd {
margin-left: @component-offset-horizontal;
- .clearfix(); // Clear the floated `dt` if an empty `dd` is present
+ &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
}
}
}
@@ -201,12 +212,12 @@ dd {
// Abbreviations and acronyms
abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted @abbr-border-color;
}
-abbr.initialism {
+.initialism {
font-size: 90%;
text-transform: uppercase;
}
@@ -224,12 +235,13 @@ blockquote {
p:last-child {
margin-bottom: 0;
}
- small {
+ small,
+ .small {
display: block;
line-height: @line-height-base;
color: @blockquote-small-color;
&:before {
- content: '\2014 \00A0';// EM DASH, NBSP
+ content: '\2014 \00A0'; // EM DASH, NBSP
}
}
@@ -240,15 +252,17 @@ blockquote {
border-right: 5px solid @blockquote-border-color;
border-left: 0;
p,
- small {
+ small,
+ .small {
text-align: right;
}
- small {
+ small,
+ .small {
&:before {
content: '';
}
&:after {
- content: '\00A0 \2014';// NBSP, EM DASH
+ content: '\00A0 \2014'; // NBSP, EM DASH
}
}
}