Skip to content

B
bootstrap
Commit 23ec21d0 authored by Mark Otto's avatar Mark Otto
Browse files
Options

resolve conflicts

parents b59b82b0 a98d2ccc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 798 additions and 685 deletions
bootstrap-1.0.0.css
View file @ 23ec21d0
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 /* 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). * 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 { ...@@ -121,6 +121,26 @@ aside {
.container:after { .container:after {
clear: both; 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 * Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates * Basic and global styles for generating a grid system, structural layout, and page templates
...@@ -339,7 +359,7 @@ html, body { ...@@ -339,7 +359,7 @@ html, body {
background-color: #fff; background-color: #fff;
} }
body { body {
margin: 60px 0 0; margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
...@@ -375,6 +395,7 @@ a { ...@@ -375,6 +395,7 @@ a {
color: #0069d6; color: #0069d6;
text-decoration: none; text-decoration: none;
line-height: inherit; line-height: inherit;
font-weight: inherit;
} }
a:hover { a:hover {
color: #0050a3; color: #0050a3;
...@@ -392,28 +413,24 @@ a:hover { ...@@ -392,28 +413,24 @@ a:hover {
background-image: linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6); background-image: linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);
padding: 4px 14px; padding: 4px 14px;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
color: #333333; color: #333;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
border: 1px solid; border: 1px solid #ccc;
border-color: #ccc #ccc #bbb; border-bottom-color: #bbb;
border-color: borderColor borderColor rgba(0, 0, 0, 0.25);
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
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); -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); -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); 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 { .btn:hover {
background-position: 0 -15px; background-position: 0 -15px;
color: #333333; color: #333;
text-decoration: none; text-decoration: none;
} }
.btn.primary { .primary {
background-color: #0064cd; background-color: #0064cd;
background-repeat: repeat-x; background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
...@@ -423,6 +440,20 @@ a:hover { ...@@ -423,6 +440,20 @@ a:hover {
background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -webkit-linear-gradient(#049cdb, #0064cd);
background-image: -o-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd);
background-image: 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; color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-color: #0064cd #0064cd #003f81; border-color: #0064cd #0064cd #003f81;
...@@ -977,6 +1008,13 @@ form.form-stacked .inputs-list li label { ...@@ -977,6 +1008,13 @@ form.form-stacked .inputs-list li label {
font-weight: normal; font-weight: normal;
padding-top: 0; 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 { form.form-stacked .actions {
margin-left: -20px; margin-left: -20px;
padding-left: 20px; padding-left: 20px;
......
bootstrap-1.0.0.min.css
View file @ 23ec21d0
...@@ -40,15 +40,16 @@ header,section,footer,article,aside{display:block;} ...@@ -40,15 +40,16 @@ header,section,footer,article,aside{display:block;}
.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;} .row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;} .row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
html,body{background-color:#fff;} html,body{background-color:#fff;}
body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
div.container{width:940px;margin:0 auto;} div.container{width:940px;margin:0 auto;}
div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";} div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
div.container-fluid:after{clear:both;} div.container-fluid:after{clear:both;}
div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.sidebar{float:left;width:220px;}
div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} 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, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);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;font-size:13px;line-height:18px;border:1px solid;border-color:#ccc #ccc #bbb;border-color:borderColor borderColor rgba(0, 0, 0, 0.25);-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;text-decoration:none;} .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, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);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:#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;}
.btn.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(#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);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;} .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(#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);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.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.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;} .btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
...@@ -131,6 +132,7 @@ form.form-stacked legend{margin-left:0;} ...@@ -131,6 +132,7 @@ form.form-stacked legend{margin-left:0;}
form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;}
form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}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;} form.form-stacked .actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
......
docs/assets/css/docs.css
View file @ 23ec21d0
...@@ -44,7 +44,7 @@ section { ...@@ -44,7 +44,7 @@ section {
font-weight: bold; font-weight: bold;
} }
#masthead { #masthead {
margin-top: -20px; margin-top: 40px;
} }
#masthead h1, #masthead h1,
#masthead p { #masthead p {
...@@ -146,34 +146,6 @@ div.quickstart form textarea { ...@@ -146,34 +146,6 @@ div.quickstart form textarea {
.show-grid:hover .column, .show-grid:hover .columns { .show-grid:hover .column, .show-grid:hover .columns {
background: rgba(0, 0, 0, 0.25); 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 /* Render mini layout previews
-------------------------------------------------- */ -------------------------------------------------- */
div.mini-layout { div.mini-layout {
...@@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body { ...@@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body {
width: 450px; width: 450px;
height: 340px; 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; float: left;
} }
div.mini-layout.fluid div.mini-layout-sidebar { div.mini-layout.fluid div.mini-layout-sidebar {
......
docs/index.html
View file @ 23ec21d0
This diff is collapsed.
lib/forms.less
View file @ 23ec21d0
...@@ -342,6 +342,13 @@ form.form-stacked { ...@@ -342,6 +342,13 @@ form.form-stacked {
} }
} }
} }
.error {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
margin-top: 0;
margin-left: -10px;
}
.actions { .actions {
margin-left: -20px; margin-left: -20px;
padding-left: 20px; padding-left: 20px;
......
lib/preboot.less
View file @ 23ec21d0
...@@ -145,43 +145,43 @@ ...@@ -145,43 +145,43 @@
// Border Radius // Border Radius
.border-radius(@radius: 5px) { .border-radius(@radius: 5px) {
-webkit-border-radius: @radius; -webkit-border-radius: @radius;
-moz-border-radius: @radius; -moz-border-radius: @radius;
border-radius: @radius; border-radius: @radius;
} }
// Drop shadows // Drop shadows
.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
-webkit-box-shadow: @shadow; -webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow; -moz-box-shadow: @shadow;
box-shadow: @shadow; box-shadow: @shadow;
} }
// Transitions // Transitions
.transition(@transition) { .transition(@transition) {
-webkit-transition: @transition; -webkit-transition: @transition;
-moz-transition: @transition; -moz-transition: @transition;
transition: @transition; transition: @transition;
} }
// Background clipping // Background clipping
.background-clip(@clip) { .background-clip(@clip) {
-webkit-background-clip: @clip; -webkit-background-clip: @clip;
-moz-background-clip: @clip; -moz-background-clip: @clip;
background-clip: @clip; background-clip: @clip;
} }
// CSS3 Content Columns // CSS3 Content Columns
.content-columns(@columnCount, @columnGap: 20px) { .content-columns(@columnCount, @columnGap: 20px) {
-webkit-column-count: @columnCount; -webkit-column-count: @columnCount;
-webkit-column-gap: @columnGap; -moz-column-count: @columnCount;
-moz-column-count: @columnCount; column-count: @columnCount;
-moz-column-gap: @columnGap; -webkit-column-gap: @columnGap;
column-count: @columnCount; -moz-column-gap: @columnGap;
column-gap: @columnGap; column-gap: @columnGap;
} }
// Buttons // Buttons
.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) { /*.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; display: inline-block;
#gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%)); #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
padding: @padding; padding: @padding;
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
color: @textColor; color: @textColor;
text-decoration: none; text-decoration: none;
} }
} }*/
// Add an alphatransparency value to any background or border color (via Elyse Holladay) // Add an alphatransparency value to any background or border color (via Elyse Holladay)
#translucent { #translucent {
...@@ -262,6 +262,6 @@ ...@@ -262,6 +262,6 @@
.opacity(@opacity: 100) { .opacity(@opacity: 100) {
filter: e(%("alpha(opacity=%d)", @opacity)); filter: e(%("alpha(opacity=%d)", @opacity));
-khtml-opacity: @opacity / 100; -khtml-opacity: @opacity / 100;
-moz-opacity: @opacity / 100; -moz-opacity: @opacity / 100;
opacity: @opacity / 100; opacity: @opacity / 100;
} }
\ No newline at end of file
lib/scaffolding.less
View file @ 23ec21d0
...@@ -51,7 +51,7 @@ html, body { ...@@ -51,7 +51,7 @@ html, body {
background-color: #fff; background-color: #fff;
} }
body { body {
margin: 60px 0 0; // Add margin to the top of the page for the topbar margin: 0;
#font > .sans-serif(normal,@basefont,@baseline); #font > .sans-serif(normal,@basefont,@baseline);
color: @gray; color: @gray;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
...@@ -87,6 +87,7 @@ a { ...@@ -87,6 +87,7 @@ a {
color: @linkColor; color: @linkColor;
text-decoration: none; text-decoration: none;
line-height: inherit; line-height: inherit;
font-weight: inherit;
&:hover { &:hover {
color: @linkColorHover; color: @linkColorHover;
text-decoration: underline; text-decoration: underline;
...@@ -95,10 +96,40 @@ a { ...@@ -95,10 +96,40 @@ a {
// Buttons // Buttons
.btn { .btn {
.button(); 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); .transition(.1s linear all);
&.primary { &.primary {
#gradient > .vertical(@blue, @blueDark); //#gradient > .vertical(@blue, @blueDark);
color: #fff; color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border-color: @blueDark @blueDark darken(@blueDark, 15%); border-color: @blueDark @blueDark darken(@blueDark, 15%);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment