mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
This commit is contained in:
Jacob Thornton
commit
346122a0c7
4
Makefile
4
Makefile
@ -1,6 +1,6 @@
|
||||
DATE=$(shell DATE)
|
||||
BOOTSTRAP = ./bootstrap-1.2.0.css
|
||||
BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
|
||||
BOOTSTRAP = ./bootstrap-1.3.0.css
|
||||
BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css
|
||||
BOOTSTRAP_LESS = ./lib/bootstrap.less
|
||||
LESS_COMPESSOR ?= `which lessc`
|
||||
WATCHR ?= `which watchr`
|
||||
|
||||
@ -18,7 +18,7 @@ Here's what the LESS version looks like:
|
||||
|
||||
Or if you prefer, the standard css way:
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
|
||||
<link rel="stylesheet" type="text/css" href="bootstrap-1.3.0.css">
|
||||
|
||||
For more info, refer to the docs!
|
||||
|
||||
|
||||
71
bootstrap-1.2.0.css → bootstrap-1.3.0.css
vendored
71
bootstrap-1.2.0.css → bootstrap-1.3.0.css
vendored
@ -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: Tue Sep 6 21:46:15 PDT 2011
|
||||
* Date: Thu Sep 8 10:45:51 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).
|
||||
@ -185,20 +185,6 @@ textarea {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
.fixed-container {
|
||||
width: 940px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.fixed-container:before, .fixed-container:after {
|
||||
display: table;
|
||||
content: "";
|
||||
}
|
||||
.fixed-container:after {
|
||||
clear: both;
|
||||
}
|
||||
.btn.danger,
|
||||
.alert-message.danger,
|
||||
.btn.danger:hover,
|
||||
@ -293,7 +279,6 @@ TODO:
|
||||
* ------------------------------------------------------------------------------------------- */
|
||||
.row {
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
margin-left: -20px;
|
||||
}
|
||||
.row:before, .row:after {
|
||||
@ -303,7 +288,7 @@ TODO:
|
||||
.row:after {
|
||||
clear: both;
|
||||
}
|
||||
.row [class^="span"] {
|
||||
.row [class*="span"] {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-left: 20px;
|
||||
@ -444,7 +429,6 @@ body {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.container:before, .container:after {
|
||||
display: table;
|
||||
@ -457,7 +441,6 @@ body {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.container-fluid:before, .container-fluid:after {
|
||||
display: table;
|
||||
@ -699,7 +682,7 @@ fieldset legend {
|
||||
|
||||
color: #404040;
|
||||
}
|
||||
.clearfix {
|
||||
form .clearfix {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
label,
|
||||
@ -1070,21 +1053,24 @@ table {
|
||||
width: 100%;
|
||||
margin-bottom: 18px;
|
||||
padding: 0;
|
||||
border-collapse: separate;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
}
|
||||
table th, table td {
|
||||
padding: 10px 10px 9px;
|
||||
line-height: 13.5px;
|
||||
line-height: 18px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
border-bottom: 1px solid #ddd;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
table th {
|
||||
padding-top: 9px;
|
||||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
border-bottom-width: 2px;
|
||||
}
|
||||
table td {
|
||||
vertical-align: top;
|
||||
}
|
||||
.zebra-striped tbody tr:nth-child(odd) td {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
@ -1227,6 +1213,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
||||
-moz-opacity: 1;
|
||||
opacity: 1;
|
||||
}
|
||||
.topbar form.pull-right {
|
||||
float: right;
|
||||
}
|
||||
.topbar input {
|
||||
background-color: #444;
|
||||
background-color: rgba(255, 255, 255, 0.3);
|
||||
@ -1506,7 +1495,6 @@ a.menu:after, .dropdown-toggle:after {
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.tabs:before,
|
||||
.pills:before,
|
||||
@ -1591,6 +1579,38 @@ a.menu:after, .dropdown-toggle:after {
|
||||
color: #fff;
|
||||
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.breadcrumb {
|
||||
margin: 0 0 18px;
|
||||
padding: 7px 14px;
|
||||
background-color: #f5f5f5;
|
||||
background-repeat: repeat-x;
|
||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
|
||||
background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
|
||||
background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
|
||||
background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
|
||||
background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
|
||||
background-image: linear-gradient(top, #ffffff, #f5f5f5);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
|
||||
border: 1px solid #ddd;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: inset 0 1px 0 #ffffff;
|
||||
-moz-box-shadow: inset 0 1px 0 #ffffff;
|
||||
box-shadow: inset 0 1px 0 #ffffff;
|
||||
}
|
||||
.breadcrumb li {
|
||||
display: inline;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
}
|
||||
.breadcrumb .divider {
|
||||
padding: 0 5px;
|
||||
color: #bfbfbf;
|
||||
}
|
||||
.breadcrumb .active a {
|
||||
color: #404040;
|
||||
}
|
||||
.hero-unit {
|
||||
background-color: #f5f5f5;
|
||||
margin-bottom: 30px;
|
||||
@ -1948,7 +1968,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
||||
-moz-box-shadow: inset 0 1px 0 #ffffff;
|
||||
box-shadow: inset 0 1px 0 #ffffff;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.modal-footer:before, .modal-footer:after {
|
||||
@ -22,15 +22,13 @@ textarea{overflow:auto;vertical-align:top;}
|
||||
.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
|
||||
.clearfix:after{clear:both;}
|
||||
.center-block{display:block;margin-left:auto;margin-right:auto;}
|
||||
.fixed-container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.fixed-container:before,.fixed-container:after{display:table;content:"";}
|
||||
.fixed-container:after{clear:both;}
|
||||
.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
|
||||
.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
|
||||
.btn.success,.alert-message.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(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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);}
|
||||
.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
|
||||
.row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
|
||||
.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
|
||||
.row:after{clear:both;}
|
||||
.row [class^="span"]{display:inline;float:left;margin-left:20px;}
|
||||
.row [class*="span"]{display:inline;float:left;margin-left:20px;}
|
||||
.row .span1{width:40px;}
|
||||
.row .span2{width:100px;}
|
||||
.row .span3{width:160px;}
|
||||
@ -73,9 +71,9 @@ textarea{overflow:auto;vertical-align:top;}
|
||||
.row .offset-two-thirds{margin-left:660px;}
|
||||
html,body{background-color:#fff;}
|
||||
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;}
|
||||
.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";}
|
||||
.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
|
||||
.container:after{clear:both;}
|
||||
.container-fluid{padding-left:20px;padding-right:20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
|
||||
.container-fluid{padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
|
||||
.container-fluid:after{clear:both;}
|
||||
.container-fluid>.sidebar{float:left;width:220px;}
|
||||
.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;}
|
||||
@ -114,7 +112,7 @@ code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
|
||||
pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
|
||||
form{margin-bottom:18px;}
|
||||
fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;margin-left:150px;font-size:19.5px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
|
||||
.clearfix{margin-bottom:18px;}
|
||||
form .clearfix{margin-bottom:18px;}
|
||||
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
|
||||
label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
|
||||
div.input{margin-left:150px;}
|
||||
@ -167,8 +165,9 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
|
||||
.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
|
||||
.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
|
||||
.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 th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
|
||||
table{width:100%;margin-bottom:18px;padding:0;border-collapse:collapse;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;border:1px solid #ddd;}
|
||||
table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom-width:2px;}
|
||||
table td{vertical-align:top;}
|
||||
.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
|
||||
.zebra-striped tbody tr:hover td{background-color:#f5f5f5;}
|
||||
.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
|
||||
@ -193,6 +192,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
|
||||
.topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
|
||||
.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;}
|
||||
.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
|
||||
.topbar form.pull-right{float:right;}
|
||||
.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;}
|
||||
.topbar input::-webkit-input-placeholder{color:#e6e6e6;}
|
||||
.topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
|
||||
@ -215,7 +215,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
|
||||
.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.topbar .dropdown-menu a:hover,.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);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);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);}
|
||||
.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
|
||||
.open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.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,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.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{float:left;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;}
|
||||
@ -226,6 +226,9 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
|
||||
.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;}
|
||||
.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
|
||||
.pills .active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
|
||||
.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #fff;}
|
||||
.breadcrumb .divider{padding:0 5px;color:#bfbfbf;}
|
||||
.breadcrumb .active a{color:#404040;}
|
||||
.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
|
||||
.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
|
||||
footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
|
||||
@ -264,7 +267,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
|
||||
.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-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-box;-moz-background-clip:padding-box;background-clip:padding-box;}
|
||||
.modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
|
||||
.modal-body{padding:20px;}
|
||||
.modal-footer{background-color:#f5f5f5;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;margin-bottom:18px;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
|
||||
.modal-footer{background-color:#f5f5f5;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;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
|
||||
.modal-footer:after{clear:both;}
|
||||
.modal-footer .btn{float:right;margin-left:10px;}
|
||||
.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
|
||||
@ -66,7 +66,7 @@ section > .row {
|
||||
line-height: 27px;
|
||||
}
|
||||
|
||||
div.quickstart {
|
||||
.quickstart {
|
||||
background-color: #f5f5f5;
|
||||
background-repeat: repeat-x;
|
||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
|
||||
@ -81,13 +81,16 @@ div.quickstart {
|
||||
border-top: 1px solid #fff;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
div.quickstart div.row {
|
||||
.quickstart .container {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.quickstart .row {
|
||||
margin: 0 -20px;
|
||||
-webkit-box-shadow: 1px 0 0 #f9f9f9;
|
||||
-moz-box-shadow: 1px 0 0 #f9f9f9;
|
||||
box-shadow: 1px 0 0 #f9f9f9;
|
||||
}
|
||||
div.quickstart div.columns {
|
||||
.quickstart [class*="span"] {
|
||||
width: 285px;
|
||||
height: 117px;
|
||||
margin-left: 0;
|
||||
@ -97,21 +100,21 @@ div.quickstart div.columns {
|
||||
-moz-box-shadow: inset 1px 0 0 #f9f9f9;
|
||||
box-shadow: inset 1px 0 0 #f9f9f9;
|
||||
}
|
||||
div.quickstart div.columns:last-child {
|
||||
.quickstart [class*="span"]:last-child {
|
||||
border-right: 1px solid #eee;
|
||||
width: 286px;
|
||||
}
|
||||
div.quickstart h6,
|
||||
div.quickstart p {
|
||||
.quickstart h6,
|
||||
.quickstart p {
|
||||
line-height: 18px;
|
||||
text-align: center;
|
||||
margin-bottom: 9px;
|
||||
color: #333;
|
||||
}
|
||||
div.quickstart h6 {
|
||||
.quickstart h6 {
|
||||
color: #999;
|
||||
}
|
||||
div.quickstart form textarea {
|
||||
.quickstart textarea {
|
||||
display: block;
|
||||
width: 275px;
|
||||
height: auto;
|
||||
@ -137,7 +140,7 @@ div.quickstart form textarea {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.show-grid .column, .show-grid .columns {
|
||||
.show-grid [class*="span"] {
|
||||
background-color: #eee;
|
||||
text-align: center;
|
||||
-webkit-border-radius: 3px;
|
||||
@ -146,7 +149,7 @@ div.quickstart form textarea {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.show-grid:hover .column, .show-grid:hover .columns {
|
||||
.show-grid:hover [class*="span"] {
|
||||
background: rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
/* Render mini layout previews
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.4 KiB |
235
docs/index.html
235
docs/index.html
@ -12,7 +12,7 @@
|
||||
<![endif]-->
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
|
||||
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
|
||||
<link href="assets/css/docs.css" rel="stylesheet">
|
||||
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
|
||||
|
||||
@ -75,14 +75,14 @@
|
||||
<div class="quickstart">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="span5 columns">
|
||||
<div class="span5">
|
||||
<h6>Hotlink the CSS</h6>
|
||||
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="1"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
|
||||
</form>
|
||||
</div>
|
||||
<div class="span5 columns">
|
||||
<div class="span5">
|
||||
<h6>Use it with Less</h6>
|
||||
<p>A fan of using Less? No problem, just clone the repo and add these lines:</p>
|
||||
<form>
|
||||
@ -90,7 +90,7 @@
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</div>
|
||||
<div class="span5 columns">
|
||||
<div class="span5">
|
||||
<h6>Fork on GitHub</h6>
|
||||
<p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
|
||||
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub »</a></p>
|
||||
@ -153,7 +153,7 @@
|
||||
<a href="../examples/fluid.html"><img src="assets/img/example-diagram-02.png" class="diagram" alt="Fluid layout with static sidebar"></a>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<a href="../examples/application.html"><img src="assets/img/example-diagram-03.png" class="diagram" alt="Simple hanging container for apps"></a>
|
||||
<a href="../examples/container-app.html"><img src="assets/img/example-diagram-03.png" class="diagram" alt="Simple hanging container for apps"></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -173,19 +173,19 @@
|
||||
<h1>Grid system <small>Rock the standard 940px or roll your own</small></h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Default grid</h2>
|
||||
<p>The default grid system provided as part of Bootstrap is a 940px wide 16-column grid. It’s a flavor of the popular 960 grid system, but without the additional margin/padding on the left and right sides.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h3>Example grid markup</h3>
|
||||
<p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="row">
|
||||
<div class="span6 columns">
|
||||
<div class="span6">
|
||||
...
|
||||
</div>
|
||||
<div class="span10 columns">
|
||||
<div class="span10">
|
||||
...
|
||||
</div>
|
||||
</div>
|
||||
@ -211,28 +211,28 @@
|
||||
<div class="span1 column">1</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="8 column layout">
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2 columns">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
<div class="span2">2</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Example uncommon layout">
|
||||
<div class="span3 columns">3</div>
|
||||
<div class="span3 columns">3</div>
|
||||
<div class="span3 columns">3</div>
|
||||
<div class="span3 columns">3</div>
|
||||
<div class="span3 columns">3</div>
|
||||
<div class="span3">3</div>
|
||||
<div class="span3">3</div>
|
||||
<div class="span3">3</div>
|
||||
<div class="span3">3</div>
|
||||
<div class="span3">3</div>
|
||||
<div class="span1 column">1</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Four column layout">
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span4">4</div>
|
||||
<div class="span4">4</div>
|
||||
<div class="span4">4</div>
|
||||
<div class="span4">4</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Default three column layout">
|
||||
<div class="span-one-third column">1/3</div>
|
||||
@ -244,24 +244,24 @@
|
||||
<div class="span-two-thirds column">2/3</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Irregular three column layout">
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span6 columns">6</div>
|
||||
<div class="span6 columns">6</div>
|
||||
<div class="span4">4</div>
|
||||
<div class="span6">6</div>
|
||||
<div class="span6">6</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Half and half">
|
||||
<div class="span8 columns">8</div>
|
||||
<div class="span8 columns">8</div>
|
||||
<div class="span8">8</div>
|
||||
<div class="span8">8</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Example uncommon two-column layout">
|
||||
<div class="span5 columns">5</div>
|
||||
<div class="span11 columns">11</div>
|
||||
<div class="span5">5</div>
|
||||
<div class="span11">11</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid" title="Unnecessary single column layout">
|
||||
<div class="span16 columns">16</div>
|
||||
<div class="span16">16</div>
|
||||
</div><!-- /row -->
|
||||
<h4>Offsetting columns</h4>
|
||||
<div class="row show-grid">
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span4">4</div>
|
||||
<div class="span8 columns offset4">8 offset 4</div>
|
||||
</div><!-- /row -->
|
||||
<div class="row show-grid">
|
||||
@ -290,7 +290,7 @@
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="span8 columns">
|
||||
<div class="span8">
|
||||
<h2>Fixed layout</h2>
|
||||
<p>The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code><div.container></code>.</p>
|
||||
<div class="mini-layout">
|
||||
@ -304,7 +304,7 @@
|
||||
</body>
|
||||
</pre>
|
||||
</div><!-- /col -->
|
||||
<div class="span8 columns">
|
||||
<div class="span8">
|
||||
<h2>Fluid layout</h2>
|
||||
<p>An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.</p>
|
||||
<div class="mini-layout fluid">
|
||||
@ -338,13 +338,13 @@
|
||||
|
||||
<!-- Headings & Paragraph Copy -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Headings & copy</h2>
|
||||
<p>A standard typographic hierarchy for structuring your webpages.</p>
|
||||
<p>The entire typographic grid is based on two Less variables in our preboot.less file: <code>@basefont</code> and <code>@baseline</code>. The first is the base font-size used throughout and the second is the base line-height.</p>
|
||||
<p>We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.</p>
|
||||
</div>
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h1>h1. Heading 1</h1>
|
||||
<h2>h2. Heading 2</h2>
|
||||
<h3>h3. Heading 3</h3>
|
||||
@ -352,7 +352,7 @@
|
||||
<h5>h5. Heading 5</h5>
|
||||
<h6>h6. Heading 6</h6>
|
||||
</div>
|
||||
<div class="span8 columns">
|
||||
<div class="span8">
|
||||
<h3>Example paragraph</h3>
|
||||
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
|
||||
<h1>Example heading <small>Has sub-heading…</small></h1>
|
||||
@ -361,7 +361,7 @@
|
||||
|
||||
<!-- Misc Elements -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Misc. elements</h2>
|
||||
<p>Using emphasis, addresses, & abbreviations</p>
|
||||
<p>
|
||||
@ -371,7 +371,7 @@
|
||||
<code><abbr></code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h4>When to use</h4>
|
||||
<p>Emphasis tags (<code><strong></code> and <code><em></code>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <code><strong></code> for importance and <code><em></code> for <em>stress</em> emphasis.</p>
|
||||
<h3>Emphasis in a paragraph</h3>
|
||||
@ -405,7 +405,7 @@
|
||||
|
||||
<!-- Blockquotes -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Blockquotes</h2>
|
||||
<p>
|
||||
<code><blockquote></code>
|
||||
@ -413,7 +413,7 @@
|
||||
<code><small></code>
|
||||
</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h4>How to quote</h4>
|
||||
<p>To include a blockquote, wrap <code><blockquote></code> around <code><p></code> and <code><small></code> tags. Use the <code><small></code> element to cite your source and you'll get an em dash <code>&mdash;</code> before it.</p>
|
||||
<blockquote>
|
||||
@ -425,7 +425,7 @@
|
||||
|
||||
<h2>Lists</h2>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h4>Unordered <code><ul></code></h4>
|
||||
<ul>
|
||||
<li>Lorem ipsum dolor sit amet</li>
|
||||
@ -445,7 +445,7 @@
|
||||
<li>Eget porttitor lorem</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h4>Unstyled <code><ul.unstyled></code></h4>
|
||||
<ul class="unstyled">
|
||||
<li>Lorem ipsum dolor sit amet</li>
|
||||
@ -465,7 +465,7 @@
|
||||
<li>Eget porttitor lorem</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h4>Ordered <code><ol></code></h4>
|
||||
<ol>
|
||||
<li>Lorem ipsum dolor sit amet</li>
|
||||
@ -478,7 +478,7 @@
|
||||
<li>Eget porttitor lorem</li>
|
||||
</ol>
|
||||
</div>
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h4>Description <code>dl</code></h4>
|
||||
<dl>
|
||||
<dt>Description lists</dt>
|
||||
@ -503,7 +503,7 @@
|
||||
</div>
|
||||
<!-- Table structure -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Building tables</h2>
|
||||
<p>
|
||||
<code><table></code>
|
||||
@ -519,7 +519,7 @@
|
||||
<p>Always wrap your column headers in a <code><thead></code> such that hierarchy is <code><thead></code> > <code><tr></code> > <code><th></code>.</p>
|
||||
<p>Similar to the column headers, all your table’s body content should be wrapped in a <code><tbody></code> so your hierarchy is <code><tbody></code> > <code><tr></code> > <code><td></code>.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h3>Example: Default table styles</h3>
|
||||
<p>All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.</p>
|
||||
<table>
|
||||
@ -648,11 +648,11 @@
|
||||
<h1>Forms</h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Default styles</h2>
|
||||
<p>All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<form>
|
||||
<fieldset>
|
||||
<legend>Example form legend</legend>
|
||||
@ -836,11 +836,11 @@
|
||||
<br />
|
||||
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Stacked forms</h2>
|
||||
<p>Add <code>.form-stacked</code> to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<form action="" class="form-stacked">
|
||||
<fieldset>
|
||||
<legend>Example form legend</legend>
|
||||
@ -903,12 +903,12 @@
|
||||
</div><!-- /row -->
|
||||
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Buttons</h2>
|
||||
<p>As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.</p>
|
||||
<p>All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue <code>.primary</code> class, a light-blue <code>.info</code> class, a green <code>.success</code> class, and a red <code>.danger</code> class. Plus, rolling your own styles is easy peasy.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h3>Example buttons</h3>
|
||||
<p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code><a></code>, <code><button></code>, and select <code><input></code> elements. Here’s how it looks:</p>
|
||||
<div class="well" style="padding: 14px 19px;">
|
||||
@ -958,17 +958,17 @@
|
||||
<li><a href="#">Link</a></li>
|
||||
<li><a href="#">Link</a></li>
|
||||
<li><a href="#">Link</a></li>
|
||||
<li class="active dropdown">
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle">Dropdown</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li class="active"><a href="#">Secondary link</a></li>
|
||||
<li><a href="#">Secondary link</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#">Another link</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<form action="">
|
||||
<form class="pull-left" action="">
|
||||
<input type="text" placeholder="Search" />
|
||||
</form>
|
||||
<ul class="nav secondary-nav">
|
||||
@ -988,17 +988,17 @@
|
||||
</div><!-- /topbar-wrapper -->
|
||||
|
||||
<div class="row">
|
||||
<div class="span5 columns">
|
||||
<div class="span5">
|
||||
<h4>What is it</h4>
|
||||
<p>Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.</p>
|
||||
</div>
|
||||
<div class="span5 columns">
|
||||
<div class="span5">
|
||||
<h4>Customizable</h4>
|
||||
<p>All elements within, and the entire topbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.</p>
|
||||
</div>
|
||||
<div class="span6 columns">
|
||||
<div class="span6">
|
||||
<h4>Dropdowns included</h4>
|
||||
<p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done.</p>
|
||||
<p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <code>li</code> tags also support <code>.active</code> for showing current page selection.</p>
|
||||
</div>
|
||||
</div>
|
||||
<p><strong>Note:</strong> When using the topbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>body</code>.</p>
|
||||
@ -1006,12 +1006,12 @@
|
||||
<br />
|
||||
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Tabs and pills</h2>
|
||||
<p>Create simple secondary navigation with a <code><ul></code>. Swap between tabs or pills by adding the appropriate class.</p>
|
||||
<p>Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<ul class="tabs">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
<li><a href="#">Profile</a></li>
|
||||
@ -1056,13 +1056,41 @@
|
||||
</div>
|
||||
</div><!-- /row -->
|
||||
|
||||
<!-- Breadcrumbs -->
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Breadcrumbs</h2>
|
||||
<p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.</p>
|
||||
</div>
|
||||
<div class="span12">
|
||||
<ul class="breadcrumb">
|
||||
<li class="active">Home</li>
|
||||
</ul>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li class="active">Middle page</li>
|
||||
</ul>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Middle page</a> <span class="divider">/</span></li>
|
||||
<li class="active">Another one</li>
|
||||
</ul>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Middle page</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Another one</a> <span class="divider">/</span></li>
|
||||
<li class="active">You are here</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Pagination -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Pagination</h2>
|
||||
<p>Ultra simplistic and minimally styled pagination inspired by Rdio. The large block is hard to miss, easily scalable, and provides large click areas.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<div class="pagination">
|
||||
<ul>
|
||||
<li class="prev disabled"><a href="#">← Previous</a></li>
|
||||
@ -1132,12 +1160,12 @@
|
||||
</div>
|
||||
<!-- Basic alert messages -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Basic alerts</h2>
|
||||
<p><code>div.alert-message</code></p>
|
||||
<p>One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<div class="alert-message warning">
|
||||
<a class="close" href="#">×</a>
|
||||
<p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
|
||||
@ -1158,12 +1186,12 @@
|
||||
</div><!-- /row -->
|
||||
<!-- Block messages -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Block messages</h2>
|
||||
<p><code>div.alert-message.block-message</code></p>
|
||||
<p>For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<div class="alert-message block-message warning">
|
||||
<a class="close" href="#">×</a>
|
||||
<p><strong>Holy guacamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
|
||||
@ -1209,11 +1237,11 @@
|
||||
<h1>Popovers <small>Components for displaying content in modals, tooltips, and popovers</small></h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Modals</h2>
|
||||
<p>Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<div class="well" style="background-color: #888; border: none; padding: 40px;">
|
||||
<!-- Modal -->
|
||||
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
|
||||
@ -1235,11 +1263,11 @@
|
||||
|
||||
<!-- Tooltips -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Tool Tips</h2>
|
||||
<p>Twipsies are super useful for aiding a confused user and pointing them in the right direction.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<div class="twipsies well">
|
||||
<div style="position: relative">
|
||||
<p class="muted" style="margin-bottom: 0">
|
||||
@ -1268,11 +1296,11 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
|
||||
|
||||
<!-- Popovers -->
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<h2>Popovers</h2>
|
||||
<p>Use popovers to provide subtextual information to a page without affecting layout.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<div class="well popover-well">
|
||||
<div class="popover-wrapper">
|
||||
<div class="popover left">
|
||||
@ -1300,27 +1328,44 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
|
||||
<h1>Using Javascript with Bootstrap <small>An index of plugins to get you started</small></h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<p>Integrating javascript with the Bootstrap library is super easy. Below we go over the basics and provide you with some awesome plugins to get you started!</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h2>Getting started</h2>
|
||||
<p>We've set out to make your interactive work with Bootstrap even more simple, offering several lightweight plugins for things like modals, tooltips, and other dynamic components. These plugins have been coded up to work with either <a href="http://jquery.com/" target="_blank">jQuery</a> or <a href="http://ender.no.de" target="_blank">Ender</a>, but we encourage you to extend and modify them to fit your development needs!</p>
|
||||
<h2>Do I need javascript?</h2>
|
||||
<p>The short answer is <strong>no</strong>... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our <a href="./javascript.html">plugin documentation page</a>.
|
||||
<dl>
|
||||
<dt><a href="./javascript.html#modal">bootstrap-modal.js</a></dt>
|
||||
<dd>Our Modal plugin is a <strong>super</strong> slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.</dd>
|
||||
<dt><a href="./javascript.html#alerts">bootstrap-alerts.js</a></dt>
|
||||
<dd>The alert plugin is a super tiny class for adding close functionality to alerts.</dd>
|
||||
<dt><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></dt>
|
||||
<dd>This plugin is for adding dropdown to the bootstrap nav.</dd>
|
||||
<dt><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></dt>
|
||||
<dd>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</dd>
|
||||
<dt><a href="./javascript.html#popover">bootstrap-popover.js</a></dt>
|
||||
<dd>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">boostrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</dd>
|
||||
</dl>
|
||||
</p>
|
||||
<p>The short answer is <strong>no</strong>... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our <a href="./javascript.html">plugin documentation page</a>.</p>
|
||||
<table class="zebra-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 150px;">File</th>
|
||||
<th>Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><a href="./javascript.html#modal">bootstrap-modal.js</a></td>
|
||||
<td>Our Modal plugin is a <strong>super</strong> slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="./javascript.html#alerts">bootstrap-alerts.js</a></td>
|
||||
<td>The alert plugin is a super tiny class for adding close functionality to alerts.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></td>
|
||||
<td>This plugin is for adding dropdown to the bootstrap nav.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></td>
|
||||
<td>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="./javascript.html#popover">bootstrap-popover.js</a></td>
|
||||
<td>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">boostrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1332,11 +1377,11 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
|
||||
<h1>Using Bootstrap with Less <small>Supercharge your CSS with variables, mixins, and functions</small></h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<div class="span4">
|
||||
<p>Bootstrap was built with <a href="http://markdotto.com/bootstrap/">Preboot</a>, an open-source pack of mixins and variables to be used in conjunction with <a href="http://lesscss.org" target="_blank">Less</a>, a CSS preprocessor for faster and easier web development.</p>
|
||||
<p>Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<div class="span12">
|
||||
<h2>How to use it</h2>
|
||||
<p>Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<script src="assets/js/bootstrap-dropdown.js"></script>
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
|
||||
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
|
||||
<link href="assets/css/docs.css" rel="stylesheet">
|
||||
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
|
||||
|
||||
|
||||
119
examples/container-app.html
Normal file
119
examples/container-app.html
Normal file
@ -0,0 +1,119 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Bootstrap, from Twitter</title>
|
||||
<meta name="description" content="">
|
||||
<meta name="author" content="">
|
||||
|
||||
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
|
||||
<style type="text/css">
|
||||
/* Override some defaults */
|
||||
html, body {
|
||||
background-color: #eee;
|
||||
}
|
||||
body {
|
||||
padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
|
||||
}
|
||||
.container > footer p {
|
||||
text-align: center; /* center align it with the container */
|
||||
}
|
||||
.container {
|
||||
width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
|
||||
}
|
||||
|
||||
/* The white background content wrapper */
|
||||
.content {
|
||||
background-color: #fff;
|
||||
padding: 20px;
|
||||
margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
|
||||
-webkit-border-radius: 0 0 6px 6px;
|
||||
-moz-border-radius: 0 0 6px 6px;
|
||||
border-radius: 0 0 6px 6px;
|
||||
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
|
||||
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
|
||||
box-shadow: 0 1px 2px rgba(0,0,0,.15);
|
||||
}
|
||||
|
||||
/* Page header tweaks */
|
||||
.page-header {
|
||||
background-color: #f5f5f5;
|
||||
padding: 20px 20px 10px;
|
||||
margin: -20px -20px 20px;
|
||||
}
|
||||
|
||||
/* Styles you shouldn't keep as they are for displaying this base example only */
|
||||
.content .span10,
|
||||
.content .span4 {
|
||||
min-height: 500px;
|
||||
}
|
||||
/* Give a quick and non-cross-browser friendly divider */
|
||||
.content .span4 {
|
||||
margin-left: 0;
|
||||
padding-left: 19px;
|
||||
border-left: 1px solid #eee;
|
||||
}
|
||||
|
||||
.topbar .btn {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<!-- Le fav and touch icons -->
|
||||
<link rel="shortcut icon" href="images/favicon.ico">
|
||||
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
|
||||
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div class="topbar">
|
||||
<div class="fill">
|
||||
<div class="container">
|
||||
<h3><a href="#">Project name</a></h3>
|
||||
<ul class="nav">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
<li><a href="#about">About</a></li>
|
||||
<li><a href="#contact">Contact</a></li>
|
||||
</ul>
|
||||
<form action="" class="pull-right">
|
||||
<input class="input-small" type="text" placeholder="Username">
|
||||
<input class="input-small" type="password" placeholder="Password">
|
||||
<button class="btn" type="submit">Sign in</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="content">
|
||||
<div class="page-header">
|
||||
<h1>Page name <small>Supporting text or tagline</small></h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span10">
|
||||
<h2>Main content</h2>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>Secondary content</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<p>© Company 2011</p>
|
||||
</footer>
|
||||
|
||||
</div> <!-- /container -->
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -12,7 +12,7 @@
|
||||
<![endif]-->
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
|
||||
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
|
||||
<style type="text/css">
|
||||
body {
|
||||
padding-top: 60px;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<![endif]-->
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
|
||||
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
|
||||
<style type="text/css">
|
||||
body {
|
||||
padding-top: 60px;
|
||||
|
||||
@ -26,7 +26,7 @@ fieldset {
|
||||
}
|
||||
|
||||
// Parent element that clears floats and wraps labels and fields together
|
||||
.clearfix {
|
||||
form .clearfix {
|
||||
margin-bottom: @baseline;
|
||||
}
|
||||
|
||||
|
||||
@ -62,6 +62,10 @@
|
||||
position: relative;
|
||||
.opacity(100);
|
||||
}
|
||||
// Todo: remove from v2.0 when ready, added for legacy
|
||||
form.pull-right {
|
||||
float: right;
|
||||
}
|
||||
input {
|
||||
background-color: #444;
|
||||
background-color: rgba(255,255,255,.3);
|
||||
@ -398,6 +402,32 @@ a.menu:after,
|
||||
}
|
||||
|
||||
|
||||
// BREADCRUMBS
|
||||
// -----------
|
||||
|
||||
.breadcrumb {
|
||||
margin: 0 0 @baseline;
|
||||
padding: 7px 14px;
|
||||
#gradient > .vertical(#ffffff, #f5f5f5);
|
||||
border: 1px solid #ddd;
|
||||
.border-radius(3px);
|
||||
.box-shadow(inset 0 1px 0 #fff);
|
||||
li {
|
||||
display: inline;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
}
|
||||
.divider {
|
||||
padding: 0 5px;
|
||||
color: @grayLight;
|
||||
}
|
||||
a {
|
||||
}
|
||||
.active a {
|
||||
color: @grayDark;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// PAGE HEADERS
|
||||
// ------------
|
||||
|
||||
|
||||
@ -121,7 +121,7 @@
|
||||
}
|
||||
|
||||
// Grid System
|
||||
.fixed-container {
|
||||
.fixed-container() {
|
||||
width: @siteWidth;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
@ -133,6 +133,17 @@
|
||||
.offset(@columnOffset: 1) {
|
||||
margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
|
||||
}
|
||||
// Necessary grid styles for every column to make them appear next to each other horizontally
|
||||
.gridColumn() {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-left: @gridGutterWidth;
|
||||
}
|
||||
// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
|
||||
.makeColumn(@columnSpan: 1) {
|
||||
.gridColumn();
|
||||
.columns(@columnSpan);
|
||||
}
|
||||
|
||||
// Border Radius
|
||||
.border-radius(@radius: 5px) {
|
||||
|
||||
@ -13,10 +13,8 @@
|
||||
|
||||
// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
|
||||
// Credit to @dhg for the idea
|
||||
[class^="span"] {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-left: @gridGutterWidth;
|
||||
[class*="span"] {
|
||||
.gridColumn();
|
||||
}
|
||||
|
||||
// Default columns
|
||||
|
||||
@ -11,20 +11,23 @@ table {
|
||||
width: 100%;
|
||||
margin-bottom: @baseline;
|
||||
padding: 0;
|
||||
border-collapse: separate;
|
||||
font-size: 13px;
|
||||
border-collapse: collapse;
|
||||
font-size: @basefont;
|
||||
th, td {
|
||||
padding: 10px 10px 9px;
|
||||
line-height: @baseline * .75;
|
||||
line-height: @baseline;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
border-bottom: 1px solid #ddd;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
th {
|
||||
padding-top: 9px;
|
||||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
border-bottom-width: 2px;
|
||||
}
|
||||
td {
|
||||
vertical-align: top;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user