Permalink
Browse files

resolve conflicts

  • Loading branch information...
2 parents b59b82b + a98d2cc commit 23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22 @mdo mdo committed Aug 22, 2011
Showing with 798 additions and 685 deletions.
  1. +49 −11 bootstrap-1.0.0.css
  2. +6 −4 bootstrap-1.0.0.min.css
  3. +4 −30 docs/assets/css/docs.css
  4. +681 −620 docs/index.html
  5. +7 −0 lib/forms.less
  6. +17 −17 lib/preboot.less
  7. +34 −3 lib/scaffolding.less
View
@@ -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: Sun Aug 21 20:38:48 PDT 2011
+ * Date: Sun Aug 21 20:50:48 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,26 @@ 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
@@ -339,7 +359,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;
@@ -375,6 +395,7 @@ a {
color: #0069d6;
text-decoration: none;
line-height: inherit;
+ font-weight: inherit;
}
a:hover {
color: #0050a3;
@@ -392,28 +413,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;
- border-color: #ccc #ccc #bbb;
- border-color: borderColor borderColor 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));
@@ -425,6 +442,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);
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);
}
@@ -977,6 +1008,13 @@ form.form-stacked .inputs-list li label {
font-weight: normal;
padding-top: 0;
}
+form.form-stacked .error {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ margin-top: 0;
+ margin-left: -10px;
+}
form.form-stacked .actions {
margin-left: -20px;
padding-left: 20px;
View
Oops, something went wrong.
View
@@ -44,7 +44,7 @@ section {
font-weight: bold;
}
#masthead {
- margin-top: -20px;
+ margin-top: 40px;
}
#masthead h1,
#masthead p {
@@ -146,34 +146,6 @@ div.quickstart form textarea {
.show-grid:hover .column, .show-grid:hover .columns {
background: rgba(0, 0, 0, 0.25);
}
-/* Hashgrid.js grid (press G & H to view)
--------------------------------------------------- */
-#grid {
- width: 980px;
- position: absolute;
- top: 0;
- left: 50%;
- margin-left: -490px;
-}
-#grid div.vert {
- background-color: rgba(0, 206, 209, 0.075);
- width: 39px;
- border: solid darkturquoise;
- border-width: 0 1px;
- margin-right: 19px;
-}
-#grid div.vert.first-line {
- margin-left: 19px;
-}
-#grid div.horiz {
- height: 19px;
- border-bottom: 1px solid rgba(255, 0, 0, 0.1);
- margin: 0;
- padding: 0;
-}
-#grid div.horiz:nth-child(5n) {
- border-color: rgba(255, 0, 0, 0.25);
-}
/* Render mini layout previews
-------------------------------------------------- */
div.mini-layout {
@@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body {
width: 450px;
height: 340px;
}
-div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-layout-header, div.mini-layout.fluid div.mini-layout-body {
+div.mini-layout.fluid div.mini-layout-sidebar,
+div.mini-layout.fluid div.mini-layout-header,
+div.mini-layout.fluid div.mini-layout-body {
float: left;
}
div.mini-layout.fluid div.mini-layout-sidebar {
Oops, something went wrong.

0 comments on commit 23ec21d

Please sign in to comment.