aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/forms.less7
-rw-r--r--lib/patterns.less31
-rw-r--r--lib/preboot.less3
-rw-r--r--lib/scaffolding.less2
-rw-r--r--lib/tables.less3
-rw-r--r--lib/type.less73
6 files changed, 26 insertions, 93 deletions
diff --git a/lib/forms.less b/lib/forms.less
index 876f62123..a455e6832 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -37,6 +37,7 @@ form {
float: left;
width: 130px;
text-align: right;
+ color: @grayDark;
}
// Shift over the inside div to align all label's relevant content
div.input {
@@ -53,7 +54,7 @@ form {
textarea,
select,
.uneditable-input {
- display: block;
+ display: inline-block;
width: 210px;
margin: 0;
padding: 4px;
@@ -99,7 +100,9 @@ form {
margin: -10px 0 10px;
.border-radius(4px);
@error-text: desaturate(lighten(@red, 25%), 25%);
- > label {
+ > label,
+ span.help-inline,
+ span.help-block {
color: @red;
}
input[type=text],
diff --git a/lib/patterns.less b/lib/patterns.less
index ed8168955..13cdc8178 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -230,7 +230,7 @@ div.topbar {
background: rgba(0,0,0,.2);
padding: 6px 15px;
cursor: default;
- color: #666;
+ color: @gray;
border-top: 1px solid rgba(0,0,0,.2);
}
}
@@ -244,10 +244,9 @@ div.topbar {
div.page-header {
margin-bottom: @baseline - 1;
border-bottom: 1px solid #ddd;
- .border-radius(6px 6px 0 0);
.box-shadow(0 1px 0 rgba(255,255,255,.5));
h1 {
- margin-bottom: 0;
+ margin-bottom: (@baseline / 2) - 1px;
}
}
@@ -260,11 +259,11 @@ div.alert-message {
#gradient > .vertical(transparent, rgba(0,0,0,0.15));
background-color: @grayLighter;
margin-bottom: @baseline;
- padding: 10px 15px 9px;
- .border-radius(6px);
+ padding: 8px 15px;
color: #fff;
- border-bottom: 1px solid rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ border-bottom: 1px solid rgba(0,0,0,.25);
+ .border-radius(4px);
p {
color: #fff;
margin-bottom: 0;
@@ -303,15 +302,13 @@ div.alert-message {
// Block-level Alerts
div.block-message {
margin-bottom: @baseline;
- padding: 14px 19px;
- color: #333;
+ padding: 14px;
+ color: @grayDark;
color: rgba(0,0,0,.8);
text-shadow: 0 1px 0 rgba(255,255,255,.25);
.border-radius(6px);
p {
- font-size: 13px;
- line-height: 18px;
- color: #333;
+ color: @grayDark;
color: rgba(0,0,0,.8);
margin-right: 30px;
margin-bottom: 0;
@@ -324,7 +321,7 @@ div.block-message {
}
a.close {
display: block;
- color: #333;
+ color: @grayDark;
color: rgba(0,0,0,.5);
text-shadow: 0 1px 1px rgba(255,255,255,.75);
}
@@ -368,7 +365,7 @@ ul.pills {
// Basic Tabs
ul.tabs {
width: 100%;
- border-bottom: 1px solid #ccc;
+ border-bottom: 1px solid @grayLight;
li {
a {
margin-bottom: -1px;
@@ -377,12 +374,12 @@ ul.tabs {
line-height: (@baseline * 2) - 1;
.border-radius(3px 3px 0 0);
&:hover {
- background: #f5f5f5;
- border-bottom: 1px solid #ccc;
+ background-color: @grayLighter;
+ border-bottom: 1px solid @grayLight;
}
}
&.active a {
- background: #fff;
+ background-color: #fff;
padding: 0 14px;
border: 1px solid #ccc;
border-bottom: 0;
@@ -465,7 +462,7 @@ div.well {
min-height: 20px;
border: 1px solid #ddd;
.border-radius(4px);
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.075);
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.05);
}
diff --git a/lib/preboot.less b/lib/preboot.less
index e8b0cb755..4d6f9c22d 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -30,7 +30,8 @@
@purple: #7a43b6;
// Baseline grid
-@baseline: 20px;
+@basefont: 13px;
+@baseline: 18px;
// Griditude
@gridColumns: 16;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index f8aca54ef..6853afe75 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -35,7 +35,7 @@ html, body {
}
body {
margin: 0;
- #font > .sans-serif(normal,14px,20px);
+ #font > .sans-serif(normal,@basefont,@baseline);
color: @gray;
text-rendering: optimizeLegibility;
}
diff --git a/lib/tables.less b/lib/tables.less
index 29405fa64..3f1b5ada8 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -13,9 +13,10 @@ table {
padding: 0;
text-align: left;
border-collapse: separate;
+ font-size: 13px;
th, td {
padding: 10px 10px 9px;
- line-height: @baseline;
+ line-height: @baseline * .75;
vertical-align: middle;
border-bottom: 1px solid #ddd;
}
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