aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-21 17:06:37 -0700
committerMark Otto <[email protected]>2011-08-21 17:06:37 -0700
commit254e70550e2e10372736939702ee77072884bde2 (patch)
tree37e72bf716480d20886e03aa0565a03451733eb2 /lib
parent6db39d0ec3b48e299f8ced16e06bfa9e912b6be6 (diff)
downloadbootstrap-254e70550e2e10372736939702ee77072884bde2.tar.xz
bootstrap-254e70550e2e10372736939702ee77072884bde2.zip
remove 60px top margin on body and tweak a few other things
Diffstat (limited to 'lib')
-rw-r--r--lib/preboot.less7
-rw-r--r--lib/scaffolding.less36
2 files changed, 36 insertions, 7 deletions
diff --git a/lib/preboot.less b/lib/preboot.less
index 941f2817c..8b913604a 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -20,7 +20,6 @@
// Accent Colors
@blue: #049CDB;
-@blueDark: #0064CD;
@green: #46a546;
@red: #9d261d;
@yellow: #ffc40d;
@@ -181,7 +180,7 @@
}
// Buttons
-.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
+/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
display: inline-block;
#gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
padding: @padding;
@@ -189,7 +188,7 @@
color: @textColor;
font-size: @fontSize;
line-height: @baseline;
- border: 1px solid @borderColor;
+ border: 1px solid darken(@color, 10%);
border-bottom-color: fadein(@borderColor, 15%);
.border-radius(@borderRadius);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
@@ -199,7 +198,7 @@
color: @textColor;
text-decoration: none;
}
-}
+}*/
// Add an alphatransparency value to any background or border color (via Elyse Holladay)
#translucent {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 55a94a6be..4d170f78b 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -51,7 +51,7 @@ html, body {
background-color: #fff;
}
body {
- margin: 60px 0 0; // Add margin to the top of the page for the topbar
+ margin: 0;
#font > .sans-serif(normal,@basefont,@baseline);
color: @gray;
text-rendering: optimizeLegibility;
@@ -96,10 +96,40 @@ a {
// Buttons
.btn {
- .button();
+ display: inline-block;
+ #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
+ padding: 4px 14px;
+ text-shadow: 0 1px 1px rgba(255,255,255,.75);
+ color: #333;
+ font-size: 13px;
+ line-height: @baseline;
+ border: 1px solid #ccc;
+ border-bottom-color: #bbb;
+ .border-radius(4px);
+ @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ .box-shadow(@shadow);
+ &:hover {
+ background-position: 0 -15px;
+ color: #333;
+ text-decoration: none;
+ }
+}
+.primary {
+ #gradient > .vertical(#049CDB, #0064CD);
+ color: #fff;
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ border: 1px solid darken(#0064CD, 10%);
+ border-bottom-color: darken(#0064CD, 15%);
+ &:hover {
+ color: #fff;
+ }
+}
+
+.btn {
+ //.button(#1174C6);
.transition(.1s linear all);
&.primary {
- #gradient > .vertical(@blue, @blueDark);
+ //#gradient > .vertical(@blue, @blueDark);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
&:hover {