diff --git a/Makefile b/Makefile index f4f367567f..82603c41f6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.1.1.css -BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css +BOOTSTRAP = ./bootstrap-1.2.0.css +BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` diff --git a/README.md b/README.md index 8d0e693c97..eaa6ca9833 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here's what the LESS version looks like: Or if you prefer, the standard css way: - + For more info, refer to the docs! @@ -35,7 +35,7 @@ Releases will be numbered with the follow format: And constructed with the following guidelines: * Breaking backwards compatibility bumps the major -* New additions without breaking backwards compatibility bumpbs the minor +* New additions without breaking backwards compatibility bumps the minor * Bug fixes and misc changes bump the patch For more information on SemVer, please visit http://semver.org/. diff --git a/bootstrap-1.1.1.css b/bootstrap-1.2.0.css similarity index 91% rename from bootstrap-1.1.1.css rename to bootstrap-1.2.0.css index 4b7da60032..b10c09558b 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.2.0.css @@ -1,12 +1,12 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Aug 30 08:27:42 PDT 2011 + * Date: Wed Aug 31 16:27:14 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). @@ -424,113 +424,6 @@ 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, #ffffff 0.25, #e6e6e6); - background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: linear-gradient(#ffffff, #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(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #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.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 { - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - cursor: default; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn:disabled { - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - cursor: default; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn:disabled.primary { - color: #fff; -} -.btn:active { - -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; -} /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ @@ -1325,9 +1218,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { right: 0; } .nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { - background-color: #444; - background-color: rgba(255, 255, 255, 0.05); - *background-color: #444; + background: #444; + background: rgba(255, 255, 255, 0.05); } .nav .dropdown-menu { background-color: #333; @@ -1336,7 +1228,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #fff; } .nav .dropdown-menu .dropdown-toggle.open { - background-color: rgba(255, 255, 255, 0.05); + background: #444; + background: rgba(255, 255, 255, 0.05); } .nav .dropdown-menu li a { color: #999; @@ -1444,8 +1337,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .dropdown.open .dropdown-toggle { color: #fff; - background-color: #ccc; - background-color: rgba(0, 0, 0, 0.3); + background: #ccc; + background: rgba(0, 0, 0, 0.3); } .dropdown.open .dropdown-menu { display: block; @@ -1479,9 +1372,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .tabs > li { position: relative; + top: 1px; } .tabs > li > a { - margin-bottom: -1px; margin-right: 2px; padding: 0 15px; line-height: 35px; @@ -1982,9 +1875,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background-color: #333; - background-color: rgba(0, 0, 0, 0.8); - *background-color: #333; + background: #333; + background: rgba(0, 0, 0, 0.8); padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.2.0.min.css similarity index 89% rename from bootstrap-1.1.1.min.css rename to bootstrap-1.2.0.min.css index f4d0136ec5..ea4665c024 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.2.0.min.css @@ -71,15 +71,6 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .container-fluid .sidebar{float:left;width:220px;} .container-fluid .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, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #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(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #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.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{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:disabled.primary{color:#fff;} -.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} -button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} @@ -194,8 +185,8 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#fff;text-decoration:none;} .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} -.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} -.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);} +.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} @@ -203,12 +194,12 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;} -.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);} +.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);} .dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;}.tabs>li>a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} +.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} .tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;} .tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} @@ -263,6 +254,6 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .inner{background:#333;background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/docs/index.html b/docs/index.html index 46e2881a85..a4b92344c5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,7 +12,7 @@ - + @@ -78,7 +78,7 @@
Hotlink the CSS

For the quickest and easiest start, just copy this snippet into your webpage.

- +
@@ -663,9 +663,9 @@
- +
- + Small snippet of help text
@@ -700,7 +700,7 @@
- +
@@ -803,9 +803,9 @@
Example form legend
- +
- +
@@ -824,9 +824,9 @@
Example form legend
- +
- + Small snippet of help text
@@ -870,11 +870,7 @@

Example buttons

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

- - - - - +     

Alternate sizes

Fancy larger or smaller buttons? Have at it!

diff --git a/examples/hero.html b/examples/hero.html index a0025f2de2..ef773c5d01 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@

Project name

-
    +
    • Home
    • About
    • Contact
      • diff --git a/lib/bootstrap.less b/lib/bootstrap.less index aa0e24b969..c31bd725da 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/lib/patterns.less b/lib/patterns.less index 219e26b3f8..91294103c6 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -147,16 +147,16 @@ // Dropdowns within the .nav .dropdown-toggle:hover, .dropdown.open .dropdown-toggle { - background-color: #444; - background-color: rgba(255,255,255,.05); - *background-color: #444; // IE6-7 + background: #444; + background: rgba(255,255,255,.05); } .dropdown-menu { background-color: #333; .dropdown-toggle { color: #fff; &.open { - background-color: rgba(255,255,255,.05); + background: #444; + background: rgba(255,255,255,.05); } } li a { @@ -253,8 +253,8 @@ .dropdown.open { .dropdown-toggle { color: #fff; - background-color: #ccc; - background-color: rgba(0,0,0,.3); + background: #ccc; + background: rgba(0,0,0,.3); } .dropdown-menu { display: block; @@ -283,8 +283,8 @@ border-bottom: 1px solid #ddd; > li { position: relative; // For the dropdowns mostly + top: 1px; > a { - margin-bottom: -1px; margin-right: 2px; padding: 0 15px; line-height: (@baseline * 2) - 1; @@ -743,9 +743,8 @@ input[type=submit].btn { height: 0; } .inner { - background-color: #333; - background-color: rgba(0,0,0,.8); - *background-color: #333; /* IE 6-7 */ + background: #333; + background: rgba(0,0,0,.8); padding: 3px; overflow: hidden; width: 280px; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 7fbab7d43d..7f2af56ba2 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -108,89 +108,3 @@ a { text-decoration: underline; } } - -// Buttons -.btn { - 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); - color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-color: @blueDark @blueDark darken(@blueDark, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); - &:hover { - color: #fff; - } - } - &.large { - font-size: 16px; - line-height: 28px; - .border-radius(6px); - } - &.small { - padding-right: 9px; - padding-left: 9px; - font-size: 11px; - } - &.disabled { - background-image: none; - .opacity(65); - cursor: default; - .box-shadow(none); - } - - // this can't be included with the .disabled def because IE8 and below will drop it ;_; - &:disabled { - background-image: none; - .opacity(65); - cursor: default; - .box-shadow(none); - &.primary { - color: #fff; - } - } - &:active { - @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - } -} - -// Help Firefox not be a jerk about adding extra padding to buttons -button.btn, -input[type=submit].btn { - &::-moz-focus-inner { - padding: 0; - border: 0; - } -} diff --git a/templates/fluid.html b/templates/fluid.html deleted file mode 100644 index 59a6ddb1c1..0000000000 --- a/templates/fluid.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Bootstrap, from Twitter - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      -

      Project name

      - -
      -
      - -
      - - -
      - -
      -
      - -
      -

      Fluid page template

      -

      Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

      -

      Learn more »

      -
      - -
      -
      -

      Heading

      -
      -
      -

      Heading

      -
      -
      -

      Heading

      -
      -
      -
      - -
      - - - \ No newline at end of file