aboutsummaryrefslogtreecommitdiff
path: root/bootstrap-1.0.0.css
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 /bootstrap-1.0.0.css
parent6db39d0ec3b48e299f8ced16e06bfa9e912b6be6 (diff)
downloadbootstrap-254e70550e2e10372736939702ee77072884bde2.tar.xz
bootstrap-254e70550e2e10372736939702ee77072884bde2.zip
remove 60px top margin on body and tweak a few other things
Diffstat (limited to 'bootstrap-1.0.0.css')
-rw-r--r--bootstrap-1.0.0.css50
1 files changed, 40 insertions, 10 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index ba4111d9a..821612814 100644
--- 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;