Skip to content

B
bootstrap
Commit 9660f6f1 authored by Mark Otto's avatar Mark Otto
Browse files
Options

new buttons, new modal updates around spacing and placeholder content

parent 80abe211
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 123 deletions
.DS_Store
View file @ 9660f6f1
No preview for this file type
bootstrap-1.0.0.css
View file @ 9660f6f1
...@@ -2,16 +2,10 @@ ...@@ -2,16 +2,10 @@
Master Stylesheet Master Stylesheet
This file is only for importing all required stylesheets for LESS to include and then compile. This file is only for importing all required stylesheets for LESS to include and then compile.
*/ */
/*-------------------------------------------------- /*
Global Reset Global Reset
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).
-------------------------------------------------- */
html, body { html, body {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -86,6 +80,13 @@ blockquote:before, ...@@ -86,6 +80,13 @@ blockquote:before,
blockquote:after { blockquote:after {
content: ""; content: "";
} }
header,
section,
footer,
article,
aside {
display: block;
}
/* /*
Preboot Preboot
Variables and mixins to pre-ignite any new web development project Variables and mixins to pre-ignite any new web development project
...@@ -333,46 +334,24 @@ a:hover { ...@@ -333,46 +334,24 @@ a:hover {
} }
.btn { .btn {
display: inline-block; display: inline-block;
background-color: #dfd8d8; background-color: #dcdcdc;
background-repeat: repeat-x; background-repeat: no-repeat;
background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#dfd8d8)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), color-stop(0.25, #f5f5f5), to(#dcdcdc));
/* Konqueror */ background-image: -webkit-linear-gradient(#f5f5f5, color-stop(0.25, #f5f5f5), #dcdcdc);
background-image: -moz-linear-gradient(#f5f5f5, color-stop(#f5f5f5, 0.25), #dcdcdc);
background-image: -moz-linear-gradient(#f5f5f5, #dfd8d8); padding: 4px 14px;
/* FF 3.6+ */
background-image: -ms-linear-gradient(#f5f5f5, #dfd8d8);
/* IE10 */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #dfd8d8));
/* Safari 4+, Chrome 2+ */
background-image: -webkit-linear-gradient(#f5f5f5, #dfd8d8);
/* Safari 5.1+, Chrome 10+ */
background-image: -o-linear-gradient(#f5f5f5, #dfd8d8);
/* Opera 11.10 */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#dfd8d8', GradientType=0);
/* IE6 & IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#dfd8d8', GradientType=0)";
/* IE8+ */
background-image: linear-gradient(#f5f5f5, #dfd8d8);
/* the standard */
padding: 9px 15px 10px;
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: #333333;
font-size: 13px; font-size: 13px;
line-height: 20px; line-height: 20px;
-webkit-border-radius: 6px; border: 1px solid rgba(0, 0, 0, 0.1);
-moz-border-radius: 6px; border-bottom-color: rgba(0, 0, 0, 0.25);
border-radius: 6px; -webkit-border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.25); -moz-border-radius: 4px;
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.25); border-radius: 4px;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.25); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1);
} }
.btn:hover { .btn:hover {
background-position: 0 -15px; background-position: 0 -15px;
...@@ -380,33 +359,33 @@ a:hover { ...@@ -380,33 +359,33 @@ a:hover {
text-decoration: none; text-decoration: none;
} }
.btn.primary { .btn.primary {
background-color: #0381b4; background-color: #0069d6;
background-repeat: repeat-x; background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0381b4)); background-image: -khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0069d6));
/* Konqueror */ /* Konqueror */
background-image: -moz-linear-gradient(#08b5fb, #0381b4); background-image: -moz-linear-gradient(#08b5fb, #0069d6);
/* FF 3.6+ */ /* FF 3.6+ */
background-image: -ms-linear-gradient(#08b5fb, #0381b4); background-image: -ms-linear-gradient(#08b5fb, #0069d6);
/* IE10 */ /* IE10 */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0381b4)); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0069d6));
/* Safari 4+, Chrome 2+ */ /* Safari 4+, Chrome 2+ */
background-image: -webkit-linear-gradient(#08b5fb, #0381b4); background-image: -webkit-linear-gradient(#08b5fb, #0069d6);
/* Safari 5.1+, Chrome 10+ */ /* Safari 5.1+, Chrome 10+ */
background-image: -o-linear-gradient(#08b5fb, #0381b4); background-image: -o-linear-gradient(#08b5fb, #0069d6);
/* Opera 11.10 */ /* Opera 11.10 */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0381b4', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0);
/* IE6 & IE7 */ /* IE6 & IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0381b4', GradientType=0)"; -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0)";
/* IE8+ */ /* IE8+ */
background-image: linear-gradient(#08b5fb, #0381b4); background-image: linear-gradient(#08b5fb, #0069d6);
/* the standard */ /* the standard */
color: #fff; color: #fff;
...@@ -417,6 +396,7 @@ a:hover { ...@@ -417,6 +396,7 @@ a:hover {
} }
.btn.large { .btn.large {
font-size: 16px; font-size: 16px;
line-height: 30px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
...@@ -1660,25 +1640,24 @@ div.modal { ...@@ -1660,25 +1640,24 @@ div.modal {
top: 50%; top: 50%;
left: 50%; left: 50%;
z-index: 2000; z-index: 2000;
width: 620px; width: 560px;
height: 500px; margin: -280px 0 0 -250px;
margin: -310px 0 0 -250px;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid rgba(0, 0, 0, 0.3);
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
-webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-webkit-background-clip: padding;
-moz-background-clip: padding;
background-clip: padding;
} }
div.modal .modal-header { div.modal .modal-header {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 5px 20px; padding: 5px 20px;
} }
div.modal .modal-header h2 {
font-size: 20px;
font-weight: 200;
}
div.modal .modal-header a.close { div.modal .modal-header a.close {
position: absolute; position: absolute;
right: 10px; right: 10px;
...@@ -1687,3 +1666,29 @@ div.modal .modal-header a.close { ...@@ -1687,3 +1666,29 @@ div.modal .modal-header a.close {
line-height: 10px; line-height: 10px;
font-size: 18px; font-size: 18px;
} }
div.modal .modal-body {
padding: 20px;
}
div.modal .modal-footer {
background-color: #eee;
padding: 14px 20px 15px;
border-top: 1px solid #ddd;
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff;
zoom: 1;
}
div.modal .modal-footer:after {
display: block;
visibility: hidden;
height: 0;
clear: both;
content: ".";
}
div.modal .modal-footer .btn {
float: right;
margin-left: 10px;
}
bootstrap-1.0.0.min.css
View file @ 9660f6f1
...@@ -3,6 +3,7 @@ h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,i ...@@ -3,6 +3,7 @@ h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,i
table{border-collapse:collapse;border-spacing:0;} table{border-collapse:collapse;border-spacing:0;}
ol,ul{list-style:none;} ol,ul{list-style:none;}
q:before,q:after,blockquote:before,blockquote:after{content:"";} q:before,q:after,blockquote:before,blockquote:after{content:"";}
header,section,footer,article,aside{display:block;}
.clearfix{zoom:1;}.clearfix:after{display:block;visibility:hidden;height:0;clear:both;content:".";} .clearfix{zoom:1;}.clearfix:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
.center-block{display:block;margin:0 auto;} .center-block{display:block;margin:0 auto;}
.container{width:940px;margin:0 auto;zoom:1;}.container:after{display:block;visibility:hidden;height:0;clear:both;content:".";} .container{width:940px;margin:0 auto;zoom:1;}.container:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
...@@ -30,9 +31,9 @@ div.container-fluid{padding:20px;zoom:1;}div.container-fluid:after{display:block ...@@ -30,9 +31,9 @@ div.container-fluid{padding:20px;zoom:1;}div.container-fluid:after{display:block
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;}a:hover{color:#0050a3;text-decoration:underline;}
.btn{display:inline-block;background-color:#dfd8d8;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#dfd8d8));background-image:-moz-linear-gradient(#f5f5f5, #dfd8d8);background-image:-ms-linear-gradient(#f5f5f5, #dfd8d8);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #dfd8d8));background-image:-webkit-linear-gradient(#f5f5f5, #dfd8d8);background-image:-o-linear-gradient(#f5f5f5, #dfd8d8);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#dfd8d8', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#dfd8d8', GradientType=0)";background-image:linear-gradient(#f5f5f5, #dfd8d8);padding:9px 15px 10px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:20px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),inset 0 -1px 0 rgba(0, 0, 0, 0.2),0 1px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),inset 0 -1px 0 rgba(0, 0, 0, 0.2),0 1px 2px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),inset 0 -1px 0 rgba(0, 0, 0, 0.2),0 1px 2px rgba(0, 0, 0, 0.25);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} .btn{display:inline-block;background-color:#dcdcdc;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), color-stop(0.25, #f5f5f5), to(#dcdcdc));background-image:-webkit-linear-gradient(#f5f5f5, color-stop(0.25, #f5f5f5), #dcdcdc);background-image:-moz-linear-gradient(#f5f5f5, color-stop(#f5f5f5, 0.25), #dcdcdc);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:20px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color: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.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;}
.btn.primary{background-color:#0381b4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0381b4));background-image:-moz-linear-gradient(#08b5fb, #0381b4);background-image:-ms-linear-gradient(#08b5fb, #0381b4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0381b4));background-image:-webkit-linear-gradient(#08b5fb, #0381b4);background-image:-o-linear-gradient(#08b5fb, #0381b4);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0381b4', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0381b4', GradientType=0)";background-image:linear-gradient(#08b5fb, #0381b4);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.primary{background-color:#0069d6;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0069d6));background-image:-moz-linear-gradient(#08b5fb, #0069d6);background-image:-ms-linear-gradient(#08b5fb, #0069d6);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0069d6));background-image:-webkit-linear-gradient(#08b5fb, #0069d6);background-image:-o-linear-gradient(#08b5fb, #0069d6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0)";background-image:linear-gradient(#08b5fb, #0069d6);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
.btn.large{font-size:16px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.large{font-size:16px;line-height:30px;-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;}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
p{font-size:14px;font-weight:normal;line-height:20px;margin-bottom:20px;}p small{font-size:12px;color:#b3b3b3;} p{font-size:14px;font-weight:normal;line-height:20px;margin-bottom:20px;}p small{font-size:12px;color:#b3b3b3;}
...@@ -194,5 +195,7 @@ div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background ...@@ -194,5 +195,7 @@ div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background
div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;}
div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);} div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}
div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:620px;height:500px;margin:-310px 0 0 -250px;background-color:#ffffff;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 2px 6px rgba(0, 0, 0, 0.35);-moz-box-shadow:0 2px 6px rgba(0, 0, 0, 0.35);box-shadow:0 2px 6px rgba(0, 0, 0, 0.35);}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header h2{font-size:20px;font-weight:200;} div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-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);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} div.modal .modal-body{padding:20px;}
div.modal .modal-footer{background-color:#eee;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
div.modal .modal-footer .btn{float:right;margin-left:10px;}
docs/assets/css/docs.css
View file @ 9660f6f1
...@@ -7,22 +7,9 @@ ...@@ -7,22 +7,9 @@
/* Body and structure /* Body and structure
-------------------------------------------------- */ -------------------------------------------------- */
body { body {
background-color: #ffffff; background-color: #fff;
background-repeat: no-repeat;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), color-stop(0.15, #ffffff), to(#ffffff));
background-image: -webkit-linear-gradient(#eeeeee, color-stop(0.15, #ffffff), #ffffff);
background-image: -moz-linear-gradient(#eeeeee, color-stop(#ffffff, 0.15), #ffffff);
background-attachment: fixed;
background-position: 0 40px;
position: relative; position: relative;
} }
header,
section,
footer,
article,
aside {
display: block;
}
section { section {
padding-top: 80px; padding-top: 80px;
margin-bottom: -40px; margin-bottom: -40px;
......
docs/index.html
View file @ 9660f6f1
...@@ -1189,14 +1189,17 @@ ...@@ -1189,14 +1189,17 @@
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
<div class="modal-backdrop" style="position:relative; min-height:200px; padding:40px; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px; z-index: 1"> <div class="modal-backdrop" style="position:relative; min-height:200px; padding:40px; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px; z-index: 1">
<div class="modal" style="position:relative; top: auto; left: auto; margin: 0 auto; width:565px; height: 265px; z-index: 1"> <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header"> <div class="modal-header">
<h2>Add new Tweet</h2> <h3>Add new Tweet</h3>
<a href="#" class="close">&times;</a> <a href="#" class="close">&times;</a>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>One fine body..</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="" class="btn primary">Primary</a>
<a href="" class="btn secondary">Secondary</a>
</div> </div>
</div> </div>
</div> </div>
......
lib/patterns.less
View file @ 9660f6f1
...@@ -487,20 +487,16 @@ div.modal { ...@@ -487,20 +487,16 @@ div.modal {
top: 50%; top: 50%;
left: 50%; left: 50%;
z-index: 2000; z-index: 2000;
width: 620px; width: 560px;
height: 500px; margin: -280px 0 0 -250px;
margin: -310px 0 0 -250px;
background-color: @white; background-color: @white;
border: 1px solid rgba(0,0,0,.3); border: 1px solid rgba(0,0,0,.3);
.border-radius(6px); .border-radius(6px);
.box-shadow(0 2px 6px rgba(0, 0, 0, 0.35)) .box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding);
.modal-header { .modal-header {
border-bottom:1px solid #eee; border-bottom: 1px solid #eee;
padding: 5px 20px; padding: 5px 20px;
h2 {
font-size: 20px;
font-weight: 200;
}
a.close { a.close {
position: absolute; position: absolute;
right: 10px; right: 10px;
...@@ -510,4 +506,19 @@ div.modal { ...@@ -510,4 +506,19 @@ div.modal {
font-size: 18px; font-size: 18px;
} }
} }
.modal-body {
padding: 20px;
}
.modal-footer {
background-color: #eee;
padding: 14px 20px 15px;
border-top: 1px solid #ddd;
.border-radius(0 0 6px 6px);
.box-shadow(inset 0 1px 0 #fff);
.clearfix();
.btn {
float: right;
margin-left: 10px;
}
}
} }
lib/preboot.less
View file @ 9660f6f1
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
// Accent Colors // Accent Colors
@blue: #08b5fb; @blue: #08b5fb;
@blueDark: #0069d6;
@green: #46a546; @green: #46a546;
@red: #9d261d; @red: #9d261d;
@yellow: #ffc40d; @yellow: #ffc40d;
...@@ -41,16 +42,16 @@ ...@@ -41,16 +42,16 @@
/* Color Scheme /* Color Scheme
-------------------------------------------------- */ -------------------------------------------------- */
@baseColor: @blue; // Set a base color @baseColor: @blue; // Set a base color
@complement: spin(@baseColor, 180); // Determine a complementary color @complement: spin(@baseColor, 180); // Determine a complementary color
@split1: spin(@baseColor, 158); // Split complements @split1: spin(@baseColor, 158); // Split complements
@split2: spin(@baseColor, -158); @split2: spin(@baseColor, -158);
@triad1: spin(@baseColor, 135); // Triads colors @triad1: spin(@baseColor, 135); // Triads colors
@triad2: spin(@baseColor, -135); @triad2: spin(@baseColor, -135);
@tetra1: spin(@baseColor, 90); // Tetra colors @tetra1: spin(@baseColor, 90); // Tetra colors
@tetra2: spin(@baseColor, -90); @tetra2: spin(@baseColor, -90);
@analog1: spin(@baseColor, 22); // Analogs colors @analog1: spin(@baseColor, 22); // Analogs colors
@analog2: spin(@baseColor, -22); @analog2: spin(@baseColor, -22);
/* Mixins /* Mixins
...@@ -160,6 +161,13 @@ ...@@ -160,6 +161,13 @@
transition: @transition; transition: @transition;
} }
// Background clipping
.background-clip(@clip) {
-webkit-background-clip: @clip;
-moz-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;
...@@ -171,16 +179,18 @@ ...@@ -171,16 +179,18 @@
} }
// Buttons // Buttons
.button(@color: #f5f5f5, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @padding: 9px 15px 10px, @borderRadius: 6px) { .button(@color: #f5f5f5, @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(@color,darken(saturate(@color,10),10)); #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
padding: @padding; padding: @padding;
text-shadow: @textShadow; text-shadow: @textShadow;
color: @textColor; color: @textColor;
font-size: @fontSize; font-size: @fontSize;
line-height: @baseline; line-height: @baseline;
border: 1px solid @borderColor;
border-bottom-color: fadein(@borderColor, 15%);
.border-radius(@borderRadius); .border-radius(@borderRadius);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(0,0,0,.25); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.1);
.box-shadow(@shadow); .box-shadow(@shadow);
&:hover { &:hover {
background-position: 0 -15px; background-position: 0 -15px;
......
lib/reset.less
View file @ 9660f6f1
/*-------------------------------------------------- /*
Global Reset Global Reset
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).
-------------------------------------------------- */
html, body { margin: 0; padding: 0; } // Eric Meyer reset
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; } html, body { margin: 0; padding: 0; }
table { border-collapse: collapse; border-spacing: 0; } h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
ol, ul { list-style: none; } table { border-collapse: collapse; border-spacing: 0; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; } ol, ul { list-style: none; }
\ No newline at end of file q:before, q:after, blockquote:before, blockquote:after { content: ""; }
// HTML5
header,
section,
footer,
article,
aside {
display: block;
}
lib/scaffolding.less
View file @ 9660f6f1
...@@ -80,7 +80,7 @@ a { ...@@ -80,7 +80,7 @@ a {
.btn { .btn {
.button(); .button();
&.primary { &.primary {
#gradient > .vertical(@blue, darken(@blue, 15)); #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);
&:hover { &:hover {
...@@ -89,6 +89,7 @@ a { ...@@ -89,6 +89,7 @@ a {
} }
&.large { &.large {
font-size: 16px; font-size: 16px;
line-height: 30px;
.border-radius(6px); .border-radius(6px);
} }
&.small { &.small {
......
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