Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

clean up btn selectors a bit

  • Loading branch information...
commit 04b8e667d0a8caaf241570721bbf7afb7a5e1b2d 1 parent 0e9d7c1
Jacob fat authored
48 bootstrap-1.1.0.css
@@ -6,7 +6,7 @@
6 6 * http://www.apache.org/licenses/LICENSE-2.0
7 7 *
8 8 * Designed and built with all the love in the world @twitter by @mdo and @fat.
9   - * Date: Thu Aug 25 13:30:35 PDT 2011
  9 + * Date: Thu Aug 25 13:52:00 PDT 2011
10 10 */
11 11 /* Reset.less
12 12 * 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).
@@ -141,12 +141,8 @@ aside {
141 141 }
142 142 .btn.danger,
143 143 .alert.danger,
144   -.btn.danger:hover,
145   -.alert.danger:hover,
146 144 .btn.error,
147   -.alert.error,
148   -.btn.error:hover,
149   -.alert.error:hover {
  145 +.alert.error {
150 146 background-color: #d6463e;
151 147 background-repeat: repeat-x;
152 148 background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));
@@ -160,10 +156,7 @@ aside {
160 156 border-color: #d6463e #d6463e #a52a23;
161 157 border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
162 158 }
163   -.btn.success,
164   -.alert.success,
165   -.btn.success:hover,
166   -.alert.success:hover {
  159 +.btn.success, .alert.success {
167 160 background-color: #57a957;
168 161 background-repeat: repeat-x;
169 162 background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
@@ -177,10 +170,7 @@ aside {
177 170 border-color: #57a957 #57a957 #3d773d;
178 171 border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
179 172 }
180   -.btn.info,
181   -.alert.info,
182   -.btn.info:hover,
183   -.alert.info:hover {
  173 +.btn.info, .alert.info {
184 174 background-color: #36b3d9;
185 175 background-repeat: repeat-x;
186 176 background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));
@@ -1326,6 +1316,21 @@ footer {
1326 1316 color: #333;
1327 1317 text-decoration: none;
1328 1318 }
  1319 +.btn.primary {
  1320 + color: #fff;
  1321 + background-color: #0064cd;
  1322 + background-repeat: repeat-x;
  1323 + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
  1324 + background-image: -moz-linear-gradient(#049cdb, #0064cd);
  1325 + background-image: -ms-linear-gradient(#049cdb, #0064cd);
  1326 + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
  1327 + background-image: -webkit-linear-gradient(#049cdb, #0064cd);
  1328 + background-image: -o-linear-gradient(#049cdb, #0064cd);
  1329 + background-image: linear-gradient(#049cdb, #0064cd);
  1330 + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
  1331 + border-color: #0064cd #0064cd #003f81;
  1332 + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
  1333 +}
1329 1334 .btn.disabled {
1330 1335 cursor: default;
1331 1336 background-image: none;
@@ -1347,21 +1352,6 @@ footer {
1347 1352 -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
1348 1353 box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
1349 1354 }
1350   -.btn.primary, .btn.primary:hover {
1351   - color: #fff;
1352   - background-color: #0064cd;
1353   - background-repeat: repeat-x;
1354   - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
1355   - background-image: -moz-linear-gradient(#049cdb, #0064cd);
1356   - background-image: -ms-linear-gradient(#049cdb, #0064cd);
1357   - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
1358   - background-image: -webkit-linear-gradient(#049cdb, #0064cd);
1359   - background-image: -o-linear-gradient(#049cdb, #0064cd);
1360   - background-image: linear-gradient(#049cdb, #0064cd);
1361   - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
1362   - border-color: #0064cd #0064cd #003f81;
1363   - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1364   -}
1365 1355 .btn.large {
1366 1356 font-size: 16px;
1367 1357 line-height: normal;
8 bootstrap-1.1.0.min.css
@@ -10,9 +10,9 @@ header,section,footer,article,aside{display:block;}
10 10 .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
11 11 .container:after{clear:both;}
12 12 .btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover,.btn.success,.alert.success,.btn.success:hover,.alert.success:hover,.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{color:#ffffff;}
13   -.btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
14   -.btn.success,.alert.success,.btn.success:hover,.alert.success:hover{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
15   -.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
  13 +.btn.danger,.alert.danger,.btn.error,.alert.error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
  14 +.btn.success,.alert.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
  15 +.btn.info,.alert.info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
16 16 .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
17 17 .row:after{clear:both;}
18 18 .row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;}
@@ -177,10 +177,10 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
177 177 footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
178 178 .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
179 179 .btn{cursor:pointer;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:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;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:#333;text-decoration:none;}
  180 +.btn.primary{color:#fff;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);background-image:linear-gradient(#049cdb, #0064cd);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);}
180 181 .btn.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;}
181 182 .btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;}
182 183 .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
183   -.btn.primary,.btn.primary:hover{color:#fff;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);background-image:linear-gradient(#049cdb, #0064cd);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);}
184 184 .btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
185 185 .btn.small{padding:7px 9px 7px;font-size:11px;}
186 186 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
14 lib/patterns.less
@@ -315,6 +315,12 @@ footer {
315 315 text-decoration: none;
316 316 }
317 317
  318 + // Primary Button Type
  319 + &.primary {
  320 + color:#fff;
  321 + .gradientBar(@blue, @blueDark)
  322 + }
  323 +
318 324 // Transitions
319 325 .transition(.1s linear all);
320 326
@@ -338,14 +344,6 @@ footer {
338 344 .box-shadow(@shadow);
339 345 }
340 346
341   - // Primary Button Type
342   - &.primary,
343   - &.primary:hover {
344   - color:#fff;
345   - .gradientBar(@blue, @blueDark)
346   - }
347   -
348   -
349 347 // Button Sizes
350 348 &.large {
351 349 font-size: 16px;
10 lib/preboot.less
@@ -206,19 +206,15 @@
206 206 }
207 207
208 208 &.danger,
209   - &.danger:hover,
210   - &.error,
211   - &.error:hover {
  209 + &.error {
212 210 .gradientBar(#f56a66, #d6463e);
213 211 }
214 212
215   - &.success,
216   - &.success:hover {
  213 + &.success {
217 214 .gradientBar(#62c462, #57a957);
218 215 }
219 216
220   - &.info,
221   - &.info:hover {
  217 + &.info {
222 218 .gradientBar(#6bd0ee, #36b3d9);
223 219 }
224 220

0 comments on commit 04b8e66

Please sign in to comment.
Something went wrong with that request. Please try again.