aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-10 15:29:38 -0700
committerMark Otto <[email protected]>2011-09-10 15:29:38 -0700
commit99ede580cf85611bf446abd46fa1ad4daf850a59 (patch)
treee7d78be8b981f4f5b0744a08d4f19cca30edb6e7 /lib
parent6d99ae56591f94327453f5dc51e3ce57c64cb831 (diff)
downloadbootstrap-99ede580cf85611bf446abd46fa1ad4daf850a59.tar.xz
bootstrap-99ede580cf85611bf446abd46fa1ad4daf850a59.zip
adding code and .label sections to type section
Diffstat (limited to 'lib')
-rw-r--r--lib/patterns.less20
-rw-r--r--lib/preboot.less5
-rw-r--r--lib/scaffolding.less2
-rw-r--r--lib/type.less2
4 files changed, 26 insertions, 3 deletions
diff --git a/lib/patterns.less b/lib/patterns.less
index 0fb7193c2..d0262b3b9 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -897,7 +897,7 @@ input[type=submit].btn {
}
-// Pattern Animations
+// PATTERN ANIMATIONS
// ------------------
.fade {
@@ -906,4 +906,22 @@ input[type=submit].btn {
&.in {
opacity: 1;
}
+}
+
+
+// LABELS
+// ------
+
+.label {
+ padding: 1px 3px 2px;
+ background-color: @grayLight;
+ font-size: @basefont * .75;
+ font-weight: bold;
+ color: @white;
+ text-transform: uppercase;
+ .border-radius(3px);
+ &.important { background-color: #c43c35; }
+ &.warning { background-color: @orange; }
+ &.success { background-color: @green; }
+ &.notice { background-color: lighten(@blue, 25%); }
} \ No newline at end of file
diff --git a/lib/preboot.less b/lib/preboot.less
index dffeb64bf..1ac8ca91c 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -58,9 +58,12 @@
// Clearfix for clearing floats like a boss h5bp.com/q
.clearfix {
zoom: 1;
- &:before, &:after {
+ &:before,
+ &:after {
display: table;
content: "";
+ zoom: 1;
+ *display: inline;
}
&:after {
clear: both;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 88f1139ef..fb50cb221 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -86,6 +86,7 @@ body {
// Fluid layouts (left aligned, with sidebar, min- & max-width content)
.container-fluid {
+ position: relative;
padding-left: 20px;
padding-right: 20px;
.clearfix();
@@ -98,6 +99,7 @@ body {
min-width: 700px;
max-width: 1180px;
margin-left: 240px;
+ .clearfix();
}
}
diff --git a/lib/type.less b/lib/type.less
index c0c706462..55ff80937 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -173,7 +173,7 @@ code {
pre {
background-color: #f5f5f5;
display: block;
- padding: @baseline - 1;
+ padding: (@baseline - 1) / 2;
margin: 0 0 @baseline;
line-height: @baseline;
font-size: 12px;