remove 60px top margin on body and tweak a few other things

diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index ba4111d9ad85cfbb6171b2be10828b0a953ce245..82161281482d24a786ba6361fd8cdf9bdee8378a 100644 (file)
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Aug 20 23:56:06 PDT 2011
+ * Date: Sun Aug 21 17:05:45 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -121,6 +121,25 @@ aside {
 .container:after {
   clear: both;
 }
+/*.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;
+  text-shadow: @textShadow;
+  color: @textColor;
+  font-size: @fontSize;
+  line-height: @baseline;
+  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);
+  .box-shadow(@shadow);
+  &:hover {
+    background-position: 0 -15px;
+    color: @textColor;
+    text-decoration: none;
+  }
+}*/
 /*
  * Scaffolding
  * Basic and global styles for generating a grid system, structural layout, and page templates
@@ -339,7 +358,7 @@ html, body {
   background-color: #fff;
 }
 body {
-  margin: 60px 0 0;
+  margin: 0;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
@@ -393,27 +412,24 @@ a:hover {
   background-image: linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);
   padding: 4px 14px;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  color: #333333;
+  color: #333;
   font-size: 13px;
   line-height: 18px;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -webkit-transition: 0.1s linear all;
-  -moz-transition: 0.1s linear all;
-  transition: 0.1s linear all;
 }
 .btn:hover {
   background-position: 0 -15px;
-  color: #333333;
+  color: #333;
   text-decoration: none;
 }
-.btn.primary {
+.primary {
   background-color: #0064cd;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
@@ -427,6 +443,20 @@ a:hover {
   background-image: linear-gradient(#049cdb, #0064cd);
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid #004b9a;
+  border-bottom-color: #003f81;
+}
+.primary:hover {
+  color: #fff;
+}
+.btn {
+  -webkit-transition: 0.1s linear all;
+  -moz-transition: 0.1s linear all;
+  transition: 0.1s linear all;
+}
+.btn.primary {
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 .btn.primary:hover {
   color: #fff;

diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index d98fccf2ff8150aae402af0dceeed295345ef048..79222bbe5744a47d9d92c18c31c1c4cac5214b82 100644 (file)
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -40,15 +40,16 @@ header,section,footer,article,aside{display:block;}
 .row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
 .row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
 html,body{background-color:#fff;}
-body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
 div.container{width:940px;margin:0 auto;}
 div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
 div.container-fluid:after{clear:both;}
 div.container-fluid div.sidebar{float:left;width:220px;}
 div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
 a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
-.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;}
-.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
+.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
+.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
+.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
 .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
 .btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
 .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 243130e018f56d5387dd8e66393be071294ed156..2d17370c24885db0b9cd2e0466c46eb4723440a1 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -44,7 +44,7 @@ section {
   font-weight: bold;
 }
 #masthead {
-  margin-top: -20px;
+  margin-top: 40px;
 }
 #masthead h1,
 #masthead p {

diff --git a/lib/preboot.less b/lib/preboot.less
index 941f2817c5309c6334a14c66c17071cd6ccf387c..8b913604a1e6021f5e1fca3110af66d871b8ee90 100644 (file)
--- 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 55a94a6be594e27d243fd0a8e094bb050f1896db..4d170f78b7c4d8731041914821b1135c6293fb66 100644 (file)
--- 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 {