Permalink
Browse files

update bootsrap with latest assets

  • Loading branch information...
1 parent c62f2cd commit 3c983123973a3638e78c693687c3d577e6ae78c0 @fat fat committed Aug 23, 2011
Showing with 42 additions and 55 deletions.
  1. +31 −44 assets/css/bootstrap-1.1.0.css
  2. +9 −8 assets/css/bootstrap-1.1.0.min.css
  3. +2 −3 index.html
@@ -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: Mon Aug 22 12:48:23 PDT 2011
+ * Date: Mon Aug 22 23:50:35 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,26 +121,6 @@ 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;
- border-color: #ccc #ccc #bbb;
- border-color: borderColor borderColor 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
@@ -402,6 +382,7 @@ a:hover {
text-decoration: underline;
}
.btn {
+ cursor: pointer;
display: inline-block;
background-color: #e6e6e6;
background-repeat: no-repeat;
@@ -424,13 +405,22 @@ a:hover {
-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: #333;
text-decoration: none;
}
-.primary {
+.btn.primary, .btn.danger {
+ color: #fff;
+}
+.btn.primary:hover, .btn.danger:hover {
+ color: #fff;
+}
+.btn.primary {
background-color: #0064cd;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
@@ -440,27 +430,23 @@ a:hover {
background-image: -webkit-linear-gradient(#049cdb, #0064cd);
background-image: -o-linear-gradient(#049cdb, #0064cd);
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);
border-color: #0064cd #0064cd #003f81;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
-.btn.primary:hover {
- color: #fff;
+.btn.danger {
+ background-color: #9d261d;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));
+ background-image: -moz-linear-gradient(#d83a2e, #9d261d);
+ background-image: -ms-linear-gradient(#d83a2e, #9d261d);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));
+ background-image: -webkit-linear-gradient(#d83a2e, #9d261d);
+ background-image: -o-linear-gradient(#d83a2e, #9d261d);
+ background-image: linear-gradient(#d83a2e, #9d261d);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #9d261d #9d261d #5c1611;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn.large {
font-size: 16px;
@@ -489,7 +475,6 @@ a:hover {
-moz-opacity: 0.65;
opacity: 0.65;
cursor: default;
- color: #fff;
}
.btn:active {
-webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -910,7 +895,10 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled {
.inline-inputs span {
padding: 0 2px 0 1px;
}
-.input-prepend input[type=text], .input-append input[type=text] {
+.input-prepend input[type=text],
+.input-append input[type=text],
+.input-prepend input[type=password],
+.input-append input[type=password] {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
@@ -943,7 +931,7 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled {
/* IE6-7 */
}
-.input-append input[type=text] {
+.input-append input[type=text], .input-append input[type=password] {
float: left;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
@@ -1441,7 +1429,6 @@ footer {
background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15));
- -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
background-color: #e6e6e6;
margin-bottom: 18px;
@@ -1728,7 +1715,7 @@ footer {
border-bottom: 1px solid #eee;
padding: 5px 20px;
}
-.modal .modal-header a.close {
+.modal .modal-header .close {
position: absolute;
right: 10px;
top: 10px;
Oops, something went wrong.

0 comments on commit 3c98312

Please sign in to comment.