aboutsummaryrefslogtreecommitdiff
path: root/lib/type.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-06-28 15:11:41 -0700
committerMark Otto <[email protected]>2011-06-28 15:11:41 -0700
commit4e95e558db14a2de80c6cdfd5712c15c8130a951 (patch)
treefba6ce1ad1c748dcea295ee7e4f9bdb68c4ea552 /lib/type.less
parent01c5e74bb3a351feb0c83ff14fb22244647eb82b (diff)
downloadbootstrap-4e95e558db14a2de80c6cdfd5712c15c8130a951.tar.xz
bootstrap-4e95e558db14a2de80c6cdfd5712c15c8130a951.zip
reseting baseline to 18px, fixing wells, moving pre styles for chili to docs
Diffstat (limited to 'lib/type.less')
-rw-r--r--lib/type.less73
1 files changed, 2 insertions, 71 deletions
diff --git a/lib/type.less b/lib/type.less
index 07af80c1d..99628f281 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -8,7 +8,7 @@
-------------------------------------------------- */
p {
- #font > .shorthand(normal,14px,@baseline);
+ #font > .shorthand(normal,@basefont,@baseline);
margin-bottom: @baseline;
small {
font-size: 12px;
@@ -114,40 +114,6 @@ dl {
/* Misc
-------------------------------------------------- */
-// Labels
-span.label {
- background-color: #ccc;
- padding: 3px 5px;
- font-size: 10px;
- font-weight: bold;
- color: #fff;
- text-shadow: 0 0 1px rgba(0,0,0,.01);
- text-transform: uppercase;
- .border-radius(3px);
- &.expired {
- background-color: #f5f5f5;
- color: #999;
- }
- &.pending {
- background-color: #48489b;
- }
- &.declined {
- background-color: #9b4848;
- }
- &.active,
- &.approved {
- background-color: #59bf59;
- }
- &.disabled {
- background-color: #faa226;
- }
- &.scheduled {
- background-color: #f5f5f5;
- color: #59bf59;
- text-shadow: 0 1px 0 rgba(255,255,255,.5);
- }
-}
-
// Horizontal rules
hr {
margin: 0 0 19px;
@@ -218,39 +184,4 @@ pre {
border: 1px solid rgba(0,0,0,.15);
.border-radius(3px);
white-space: pre-wrap;
-}
-// Code block styling from Chili
-pre.css, pre.html {
- background-color: #fff;
-}
-pre ol {
- background-color: lighten(@orange, 42%);
- list-style: decimal;
- margin: (@baseline - 1) * -1;
- padding-left: 59px;
- .border-radius(2px);
- li {
- background-color: #fff;
- padding: 0 10px;
- border-left: 1px solid rgba(0,0,0,.1);
- border-left-color: lighten(@orange, 35%);
- font-size: 11px;
- line-height: @baseline;
- color: @grayLight;
- text-shadow: 0 1px 1px rgba(255,255,255,.5);
- word-wrap: break-word;
- &:hover {
- }
- &:first-child {
- padding-top: 9px;
- }
- &:last-child {
- padding-bottom: 9px;
- }
- }
-}
-// Language Styles
-span.html__tag_start,
-span.html__tag_end { color: #277ac1; font-weight: normal; }
-span.html__attr_name { color: #d78b41; }
-span.html__attr_value { color: #de4a3f; }
+} \ No newline at end of file