Browse files

Merge branch '1.1.1-wip'

  • Loading branch information...
2 parents 5193619 + 273659c commit a63fb4d234941c58547ed902eb198abaee71b89c @fat fat committed Aug 26, 2011
View
4 Makefile
@@ -1,6 +1,6 @@
DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
View
2 README.md
@@ -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.1.0.css">
+ <link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
For more info, refer to the docs!
View
772 bootstrap-1.1.0.css → bootstrap-1.1.1.css
@@ -1,12 +1,12 @@
/*!
- * Bootstrap v1.1.0
+ * Bootstrap v1.1.1
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Aug 22 23:50:35 PDT 2011
+ * Date: Fri Aug 26 11:11:13 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).
@@ -85,13 +85,92 @@ blockquote:before,
blockquote:after {
content: "";
}
-header,
-section,
-footer,
+html {
+ overflow-y: scroll;
+ font-size: 100%;
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
+}
+a:focus {
+ outline: thin dotted;
+}
article,
-aside {
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
display: block;
}
+audio, canvas, video {
+ display: inline-block;
+ *display: inline;
+ *zoom: 1;
+}
+audio:not([controls]) {
+ display: none;
+}
+sub, sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+sup {
+ top: -0.5em;
+}
+sub {
+ bottom: -0.25em;
+}
+img {
+ border: 0;
+ -ms-interpolation-mode: bicubic;
+}
+button,
+input,
+select,
+textarea {
+ font-size: 100%;
+ margin: 0;
+ vertical-align: baseline;
+ *vertical-align: middle;
+}
+button, input {
+ line-height: normal;
+ *overflow: visible;
+}
+button::-moz-focus-inner, input::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+ cursor: pointer;
+ -webkit-appearance: button;
+}
+input[type="search"] {
+ -webkit-appearance: textfield;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+textarea {
+ overflow: auto;
+ vertical-align: top;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
/* Preboot.less
* Variables and mixins to pre-ignite any new web development project
* ------------------------------------------------------------------ */
@@ -113,6 +192,7 @@ aside {
width: 940px;
margin: 0 auto;
zoom: 1;
+ margin-bottom: 18px;
}
.container:before, .container:after {
display: table;
@@ -121,12 +201,77 @@ aside {
.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);
+ 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);
+ 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);
+ 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);
+}
/*
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
* ------------------------------------------------------------------------------------------- */
.row {
zoom: 1;
+ margin-bottom: 18px;
+ margin-left: -20px;
}
.row:before, .row:after {
display: table;
@@ -135,205 +280,109 @@ aside {
.row:after {
clear: both;
}
-.row .span1 {
+.row .span1,
+.row .span2,
+.row .span3,
+.row .span4,
+.row .span5,
+.row .span6,
+.row .span7,
+.row .span8,
+.row .span9,
+.row .span10,
+.row .span11,
+.row .span12,
+.row .span13,
+.row .span14,
+.row .span15,
+.row .span16 {
+ display: inline;
float: left;
- width: 40px;
margin-left: 20px;
}
-.row .span1:first-child {
- margin-left: 0;
+.row .span1 {
+ width: 40px;
}
.row .span2 {
- float: left;
width: 100px;
- margin-left: 20px;
-}
-.row .span2:first-child {
- margin-left: 0;
}
.row .span3 {
- float: left;
width: 160px;
- margin-left: 20px;
-}
-.row .span3:first-child {
- margin-left: 0;
}
.row .span4 {
- float: left;
width: 220px;
- margin-left: 20px;
-}
-.row .span4:first-child {
- margin-left: 0;
}
.row .span5 {
- float: left;
width: 280px;
- margin-left: 20px;
-}
-.row .span5:first-child {
- margin-left: 0;
}
.row .span6 {
- float: left;
width: 340px;
- margin-left: 20px;
-}
-.row .span6:first-child {
- margin-left: 0;
}
.row .span7 {
- float: left;
width: 400px;
- margin-left: 20px;
-}
-.row .span7:first-child {
- margin-left: 0;
}
.row .span8 {
- float: left;
width: 460px;
- margin-left: 20px;
-}
-.row .span8:first-child {
- margin-left: 0;
}
.row .span9 {
- float: left;
width: 520px;
- margin-left: 20px;
-}
-.row .span9:first-child {
- margin-left: 0;
}
.row .span10 {
- float: left;
width: 580px;
- margin-left: 20px;
-}
-.row .span10:first-child {
- margin-left: 0;
}
.row .span11 {
- float: left;
width: 640px;
- margin-left: 20px;
-}
-.row .span11:first-child {
- margin-left: 0;
}
.row .span12 {
- float: left;
width: 700px;
- margin-left: 20px;
-}
-.row .span12:first-child {
- margin-left: 0;
}
.row .span13 {
- float: left;
width: 760px;
- margin-left: 20px;
-}
-.row .span13:first-child {
- margin-left: 0;
}
.row .span14 {
- float: left;
width: 820px;
- margin-left: 20px;
-}
-.row .span14:first-child {
- margin-left: 0;
}
.row .span15 {
- float: left;
width: 880px;
- margin-left: 20px;
-}
-.row .span15:first-child {
- margin-left: 0;
}
.row .span16 {
- float: left;
width: 940px;
- margin-left: 20px;
-}
-.row .span16:first-child {
- margin-left: 0;
}
.row .offset1 {
- margin-left: 80px !important;
-}
-.row .offset1:first-child {
- margin-left: 60px !important;
+ margin-left: 80px;
}
.row .offset2 {
- margin-left: 140px !important;
-}
-.row .offset2:first-child {
- margin-left: 120px !important;
+ margin-left: 140px;
}
.row .offset3 {
- margin-left: 200px !important;
-}
-.row .offset3:first-child {
- margin-left: 180px !important;
+ margin-left: 200px;
}
.row .offset4 {
- margin-left: 260px !important;
-}
-.row .offset4:first-child {
- margin-left: 240px !important;
+ margin-left: 260px;
}
.row .offset5 {
- margin-left: 320px !important;
-}
-.row .offset5:first-child {
- margin-left: 300px !important;
+ margin-left: 320px;
}
.row .offset6 {
- margin-left: 380px !important;
-}
-.row .offset6:first-child {
- margin-left: 360px !important;
+ margin-left: 380px;
}
.row .offset7 {
- margin-left: 440px !important;
-}
-.row .offset7:first-child {
- margin-left: 420px !important;
+ margin-left: 440px;
}
.row .offset8 {
- margin-left: 500px !important;
-}
-.row .offset8:first-child {
- margin-left: 480px !important;
+ margin-left: 500px;
}
.row .offset9 {
- margin-left: 500px !important;
-}
-.row .offset9:first-child {
- margin-left: 480px !important;
+ margin-left: 500px;

margin-left: 560px;

@fat
Bootstrap member
fat added a note Aug 27, 2011

oh thanks, nice catch! df8b654

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
}
.row .offset10 {
- margin-left: 620px !important;
-}
-.row .offset10:first-child {
- margin-left: 600px !important;
+ margin-left: 620px;
}
.row .offset11 {
- margin-left: 680px !important;
-}
-.row .offset11:first-child {
- margin-left: 660px !important;
+ margin-left: 680px;
}
.row .offset12 {
- margin-left: 740px !important;
-}
-.row .offset12:first-child {
- margin-left: 720px !important;
+ margin-left: 740px;
}
html, body {
background-color: #fff;
@@ -347,26 +396,27 @@ body {
color: #808080;
text-rendering: optimizeLegibility;
}
-div.container {
+.container {
width: 940px;
margin: 0 auto;
}
-div.container-fluid {
+.container-fluid {
padding: 0 20px;
zoom: 1;
+ margin-bottom: 18px;
}
-div.container-fluid:before, div.container-fluid:after {
+.container-fluid:before, .container-fluid:after {
display: table;
content: "";
}
-div.container-fluid:after {
+.container-fluid:after {
clear: both;
}
-div.container-fluid div.sidebar {
+.container-fluid .sidebar {
float: left;
width: 220px;
}
-div.container-fluid div.content {
+.container-fluid .content {
min-width: 700px;
max-width: 1180px;
margin-left: 240px;
@@ -382,7 +432,6 @@ a:hover {
text-decoration: underline;
}
.btn {
- cursor: pointer;
display: inline-block;
background-color: #e6e6e6;
background-repeat: no-repeat;
@@ -405,48 +454,43 @@ a:hover {
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -webkit-transition: 0.1s linear all;
- -moz-transition: 0.1s linear all;
- transition: 0.1s linear all;
}
.btn:hover {
background-position: 0 -15px;
color: #333;
text-decoration: none;
}
-.btn.primary, .btn.danger {
+.primary {
+ background-color: #0064cd;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+ background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+ background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+ background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+ background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+ background-image: linear-gradient(top, #049cdb, #0064cd);
color: #fff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border: 1px solid #004b9a;
+ border-bottom-color: #003f81;
}
-.btn.primary:hover, .btn.danger:hover {
+.primary:hover {
color: #fff;
}
+.btn {
+ -webkit-transition: 0.1s linear all;
+ -moz-transition: 0.1s linear all;
+ transition: 0.1s linear all;
+}
.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.danger {
- background-color: #9d261d;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));
- background-image: -moz-linear-gradient(#d83a2e, #9d261d);
- background-image: -ms-linear-gradient(#d83a2e, #9d261d);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));
- background-image: -webkit-linear-gradient(#d83a2e, #9d261d);
- background-image: -o-linear-gradient(#d83a2e, #9d261d);
- background-image: linear-gradient(#d83a2e, #9d261d);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #9d261d #9d261d #5c1611;
- 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;
@@ -467,6 +511,9 @@ a:hover {
-moz-opacity: 0.65;
opacity: 0.65;
cursor: default;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
@dagmar
dagmar added a note Aug 29, 2011

duplicate class css .btn.disabled

line 507 == line 518

;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
.btn:disabled {
background-image: none;
@@ -475,11 +522,17 @@ a:hover {
-moz-opacity: 0.65;
opacity: 0.65;
cursor: default;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
+.btn:disabled.primary {
+ color: #fff;
}
.btn:active {
- -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
}
button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
padding: 0;
@@ -607,7 +660,7 @@ em {
line-height: inherit;
}
.muted {
- color: #e6e6e6;
+ color: #bfbfbf;
}
blockquote {
margin-bottom: 18px;
@@ -660,19 +713,21 @@ pre {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
+ white-space: pre;
white-space: pre-wrap;
+ word-wrap: break-word;
}
/* Forms.less
* Base styles for various input types, form layouts, and states
* ------------------------------------------------------------- */
form {
margin-bottom: 18px;
}
-form fieldset {
+fieldset {
margin-bottom: 18px;
padding-top: 18px;
}
-form fieldset legend {
+fieldset legend {
display: block;
margin-left: 150px;
font-size: 20px;
@@ -685,19 +740,19 @@ form fieldset legend {
color: #404040;
}
-form .clearfix {
+.clearfix {
margin-bottom: 18px;
}
-form label,
-form input,
-form select,
-form textarea {
+label,
+input,
+select,
+textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
line-height: normal;
}
-form label {
+label {
padding-top: 6px;
font-size: 13px;
line-height: 18px;
@@ -706,20 +761,19 @@ form label {
text-align: right;
color: #404040;
}
-form div.input {
+div.input {
margin-left: 150px;
}
-form input[type=checkbox], form input[type=radio] {
+input[type=checkbox], input[type=radio] {
cursor: pointer;
}
-form input[type=text],
-form input[type=password],
-form textarea,
-form select,
-form .uneditable-input {
+input[type=text],
+input[type=password],
+textarea,
+select,
+.uneditable-input {
display: inline-block;
width: 210px;
- margin: 0;
padding: 4px;
font-size: 13px;
line-height: 18px;
@@ -730,39 +784,39 @@ form .uneditable-input {
-moz-border-radius: 3px;
border-radius: 3px;
}
-form select, form input[type=file] {
+select, input[type=file] {
height: 27px;
line-height: 27px;
}
-form textarea {
+textarea {
height: auto;
}
-form .uneditable-input {
+.uneditable-input {
background-color: #eee;
display: block;
border-color: #ccc;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
}
-form :-moz-placeholder {
+:-moz-placeholder {
color: #bfbfbf;
}
-form ::-webkit-input-placeholder {
+::-webkit-input-placeholder {
color: #bfbfbf;
}
-form input[type=text],
-form input[type=password],
-form select,
-form textarea {
+input[type=text],
+input[type=password],
+select,
+textarea {
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s;
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
}
-form input[type=text]:focus, form input[type=password]:focus, form textarea:focus {
+input[type=text]:focus, input[type=password]:focus, textarea:focus {
outline: none;
border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -797,46 +851,46 @@ form div.error .input-prepend span.add-on, form div.error .input-append span.add
border-color: #c87872;
color: #b9554d;
}
-form .input-mini,
-form input.mini,
-form textarea.mini,
-form select.mini {
+.input-mini,
+input.mini,
+textarea.mini,
+select.mini {
width: 60px;
}
-form .input-small,
-form input.small,
-form textarea.small,
-form select.small {
+.input-small,
+input.small,
+textarea.small,
+select.small {
width: 90px;
}
-form .input-medium,
-form input.medium,
-form textarea.medium,
-form select.medium {
+.input-medium,
+input.medium,
+textarea.medium,
+select.medium {
width: 150px;
}
-form .input-large,
-form input.large,
-form textarea.large,
-form select.large {
+.input-large,
+input.large,
+textarea.large,
+select.large {
width: 210px;
}
-form .input-xlarge,
-form input.xlarge,
-form textarea.xlarge,
-form select.xlarge {
+.input-xlarge,
+input.xlarge,
+textarea.xlarge,
+select.xlarge {
width: 270px;
}
-form .input-xxlarge,
-form input.xxlarge,
-form textarea.xxlarge,
-form select.xxlarge {
+.input-xxlarge,
+input.xxlarge,
+textarea.xxlarge,
+select.xxlarge {
width: 530px;
}
-form textarea.xxlarge {
+textarea.xxlarge {
overflow-y: scroll;
}
-form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled {
+input[readonly]:focus, textarea[readonly]:focus, input.disabled {
background: #f5f5f5;
border-color: #ddd;
-webkit-box-shadow: none;
@@ -980,16 +1034,16 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled {
.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
margin-bottom: 0;
}
-form.form-stacked {
+.form-stacked {
padding-left: 20px;
}
-form.form-stacked fieldset {
+.form-stacked fieldset {
padding-top: 9px;
}
-form.form-stacked legend {
+.form-stacked legend {
margin-left: 0;
}
-form.form-stacked label {
+.form-stacked label {
display: block;
float: none;
width: auto;
@@ -998,30 +1052,30 @@ form.form-stacked label {
line-height: 20px;
padding-top: 0;
}
-form.form-stacked .clearfix {
+.form-stacked .clearfix {
margin-bottom: 9px;
}
-form.form-stacked .clearfix div.input {
+.form-stacked .clearfix div.input {
margin-left: 0;
}
-form.form-stacked .inputs-list {
+.form-stacked .inputs-list {
margin-bottom: 0;
}
-form.form-stacked .inputs-list li {
+.form-stacked .inputs-list li {
padding-top: 0;
}
-form.form-stacked .inputs-list li label {
+.form-stacked .inputs-list li label {
font-weight: normal;
padding-top: 0;
}
-form.form-stacked div.error {
+.form-stacked div.error {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
margin-top: 0;
margin-left: -10px;
}
-form.form-stacked .actions {
+.form-stacked .actions {
margin-left: -20px;
padding-left: 20px;
}
@@ -1156,12 +1210,12 @@ table .headerSortUp.purple, table .headerSortDown.purple {
background-color: #222222;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
- background-image: -moz-linear-gradient(#333333, #222222);
- background-image: -ms-linear-gradient(#333333, #222222);
+ background-image: -moz-linear-gradient(top, #333333, #222222);
+ background-image: -ms-linear-gradient(top, #333333, #222222);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
- background-image: -webkit-linear-gradient(#333333, #222222);
- background-image: -o-linear-gradient(#333333, #222222);
- background-image: linear-gradient(#333333, #222222);
+ background-image: -webkit-linear-gradient(top, #333333, #222222);
+ background-image: -o-linear-gradient(top, #333333, #222222);
+ background-image: linear-gradient(top, #333333, #222222);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
@@ -1419,86 +1473,137 @@ footer {
.page-header h1 {
margin-bottom: 8px;
}
+.btn {
+ cursor: pointer;
+ display: inline-block;
+ background-color: #e6e6e6;
+ background-repeat: no-repeat;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ padding: 5px 14px 6px;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ color: #333;
+ font-size: 13px;
+ line-height: normal;
+ border: 1px solid #ccc;
+ border-bottom-color: #bbb;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-transition: 0.1s linear all;
+ -moz-transition: 0.1s linear all;
+ transition: 0.1s linear all;
+}
+.btn:hover {
+ background-position: 0 -15px;
+ color: #333;
+ text-decoration: none;
+}
+.btn.primary {
+ color: #fff;
+ background-color: #0064cd;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+ background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+ background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+ background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+ background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+ background-image: linear-gradient(top, #049cdb, #0064cd);
+ 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.disabled {
+ cursor: default;
+ background-image: none;
+ filter: alpha(opacity=65);
+ -khtml-opacity: 0.65;
+ -moz-opacity: 0.65;
+ opacity: 0.65;
+}
+.btn:disabled {
+ cursor: default;
+ background-image: none;
+ filter: alpha(opacity=65);
+ -khtml-opacity: 0.65;
+ -moz-opacity: 0.65;
+ opacity: 0.65;
+}
+.btn:active {
+ -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn.large {
+ font-size: 16px;
+ line-height: normal;
+ padding: 9px 14px 9px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.btn.small {
+ padding: 7px 9px 7px;
+ font-size: 11px;
+}
+button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
+ padding: 0;
+ border: 0;
+}
.alert-message {
- background-color: rgba(0, 0, 0, 0.15);
+ background-color: #eedc94;
background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));
- background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
- background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));
- background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
- background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
- background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15));
- filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
- background-color: #e6e6e6;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+ background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+ background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+ background-image: linear-gradient(top, #fceec1, #eedc94);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #eedc94 #eedc94 #e4c652;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
margin-bottom: 18px;
- padding: 8px 15px;
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
- border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+ padding: 7px 14px;
+ color: #404040;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ border-width: 1px;
+ border-style: solid;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+.alert-message h5 {
+ line-height: 18px;
}
.alert-message p {
- color: #fff;
margin-bottom: 0;
}
-.alert-message p + p {
+.alert-message div {
margin-top: 5px;
+ margin-bottom: 2px;
+ line-height: 28px;
}
-.alert-message.error {
- background-color: #d83a2e;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));
- background-image: -moz-linear-gradient(#e4776f, #d83a2e);
- background-image: -ms-linear-gradient(#e4776f, #d83a2e);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));
- background-image: -webkit-linear-gradient(#e4776f, #d83a2e);
- background-image: -o-linear-gradient(#e4776f, #d83a2e);
- background-image: linear-gradient(#e4776f, #d83a2e);
- border-bottom-color: #b32b21;
-}
-.alert-message.warning {
- background-color: #ffd040;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));
- background-image: -moz-linear-gradient(#ffe38d, #ffd040);
- background-image: -ms-linear-gradient(#ffe38d, #ffd040);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));
- background-image: -webkit-linear-gradient(#ffe38d, #ffd040);
- background-image: -o-linear-gradient(#ffe38d, #ffd040);
- background-image: linear-gradient(#ffe38d, #ffd040);
- border-bottom-color: #ffc40d;
-}
-.alert-message.success {
- background-color: #62bc62;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));
- background-image: -moz-linear-gradient(#97d397, #62bc62);
- background-image: -ms-linear-gradient(#97d397, #62bc62);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));
- background-image: -webkit-linear-gradient(#97d397, #62bc62);
- background-image: -o-linear-gradient(#97d397, #62bc62);
- background-image: linear-gradient(#97d397, #62bc62);
- border-bottom-color: #46a546;
-}
-.alert-message.info {
- background-color: #04aef4;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));
- background-image: -moz-linear-gradient(#62cffc, #04aef4);
- background-image: -ms-linear-gradient(#62cffc, #04aef4);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));
- background-image: -webkit-linear-gradient(#62cffc, #04aef4);
- background-image: -o-linear-gradient(#62cffc, #04aef4);
- background-image: linear-gradient(#62cffc, #04aef4);
- border-bottom-color: #049cdb;
+.alert-message .btn {
+ -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+ -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
}
.alert-message .close {
float: right;
margin-top: -2px;
- color: #000;
+ color: #000000;
font-size: 20px;
font-weight: bold;
text-shadow: 0 1px 0 #ffffff;
@@ -1508,60 +1613,49 @@ footer {
opacity: 0.2;
}
.alert-message .close:hover {
+ color: #000000;
text-decoration: none;
filter: alpha(opacity=40);
-khtml-opacity: 0.4;
-moz-opacity: 0.4;
opacity: 0.4;
}
-.block-message {
- margin-bottom: 18px;
+.alert-message.block-message {
+ background-image: none;
+ background-color: #fdf5d9;
padding: 14px;
- color: #404040;
- color: rgba(0, 0, 0, 0.8);
- *color: #404040;
- /* IE 6-7 */
-
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
+ border-color: #fceec1;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
-.block-message p {
- color: #404040;
- color: rgba(0, 0, 0, 0.8);
- *color: #404040;
- /* IE 6-7 */
-
+.alert-message.block-message p {
margin-right: 30px;
- margin-bottom: 0;
-}
-.block-message ul {
- margin-bottom: 0;
}
-.block-message strong {
- display: block;
+.alert-message.block-message .alert-actions {
+ margin-top: 5px;
}
-.block-message.error {
- background: #f8dcda;
- border: 1px solid #f4c8c5;
+.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
+ color: #404040;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
-.block-message.warning {
- background: #fff0c0;
- border: 1px solid #ffe38d;
+.alert-message.block-message.error {
+ background-color: #fddfde;
+ border-color: #fbc7c6;
}
-.block-message.success {
- background: #dff1df;
- border: 1px solid #bbe2bb;
+.alert-message.block-message.success {
+ background-color: #d1eed1;
+ border-color: #bfe7bf;
}
-.block-message.info {
- background: #c7eefe;
- border: 1px solid #ade6fe;
+.alert-message.block-message.info {
+ background-color: #ddf4fb;
+ border-color: #c6edf9;
}
.tabs, .pills {
margin: 0 0 20px;
padding: 0;
zoom: 1;
+ margin-bottom: 18px;
}
.tabs:before,
.pills:before,
@@ -1737,6 +1831,8 @@ footer {
-moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff;
zoom: 1;
+ margin-bottom: 18px;
+ margin-bottom: 0;
}
.modal .modal-footer:before, .modal .modal-footer:after {
display: table;
View
207 bootstrap-1.1.0.min.css → bootstrap-1.1.1.min.css
@@ -3,59 +3,79 @@ 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;}
ol,ul{list-style:none;}
q:before,q:after,blockquote:before,blockquote:after{content:"";}
-header,section,footer,article,aside{display:block;}
+html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;}
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{border:0;-ms-interpolation-mode:bicubic;}
+button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;}
+button,input{line-height:normal;*overflow:visible;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+table{border-collapse:collapse;border-spacing:0;}
.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
.clearfix:after{clear:both;}
.center-block{display:block;margin:0 auto;}
-.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container{width:940px;margin:0 auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";}
.container:after{clear:both;}
-.row{zoom:1;}.row:before,.row:after{display:table;content:"";}
+.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);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);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);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:after{clear:both;}
-.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;}
-.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;}
-.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;}
-.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;}
-.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;}
-.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;}
-.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;}
-.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;}
-.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;}
-.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;}
-.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;}
-.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;}
-.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;}
-.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;}
-.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;}
-.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;}
-.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;}
-.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;}
-.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;}
-.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;}
-.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;}
-.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;}
-.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;}
-.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;}
-.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;}
-.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !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 .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;}
+.row .span1{width:40px;}
+.row .span2{width:100px;}
+.row .span3{width:160px;}
+.row .span4{width:220px;}
+.row .span5{width:280px;}
+.row .span6{width:340px;}
+.row .span7{width:400px;}
+.row .span8{width:460px;}
+.row .span9{width:520px;}
+.row .span10{width:580px;}
+.row .span11{width:640px;}
+.row .span12{width:700px;}
+.row .span13{width:760px;}
+.row .span14{width:820px;}
+.row .span15{width:880px;}
+.row .span16{width:940px;}
+.row .offset1{margin-left:80px;}
+.row .offset2{margin-left:140px;}
+.row .offset3{margin-left:200px;}
+.row .offset4{margin-left:260px;}
+.row .offset5{margin-left:320px;}
+.row .offset6{margin-left:380px;}
+.row .offset7{margin-left:440px;}
+.row .offset8{margin-left:500px;}
+.row .offset9{margin-left:500px;}
+.row .offset10{margin-left:620px;}
+.row .offset11{margin-left:680px;}
+.row .offset12{margin-left:740px;}
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;text-rendering:optimizeLegibility;}
-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:after{clear:both;}
-div.container-fluid div.sidebar{float:left;width:220px;}
-div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
+.container{width:940px;margin:0 auto;}
+.container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.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;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
-.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding: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);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
-.btn.primary,.btn.danger{color:#fff;}.btn.primary:hover,.btn.danger:hover{color:#fff;}
-.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);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.danger{background-color:#9d261d;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));background-image:-moz-linear-gradient(#d83a2e, #9d261d);background-image:-ms-linear-gradient(#d83a2e, #9d261d);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));background-image:-webkit-linear-gradient(#d83a2e, #9d261d);background-image:-o-linear-gradient(#d83a2e, #9d261d);background-image:linear-gradient(#d83a2e, #9d261d);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#9d261d #9d261d #5c1611;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
+.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
+.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
-.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
-.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
-.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:disabled.primary{color:#fff;}
+.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
@@ -78,38 +98,39 @@ dl dd{margin-left:9px;}
hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;}
strong{font-style:inherit;font-weight:bold;line-height:inherit;}
em{font-style:italic;font-weight:inherit;line-height:inherit;}
-.muted{color:#e6e6e6;}
+.muted{color:#bfbfbf;}
blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;}
blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';}
address{display:block;line-height:18px;margin-bottom:18px;}
code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
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-wrap;}
-form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
-form .clearfix{margin-bottom:18px;}
-form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
-form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
-form div.input{margin-left:150px;}
-form input[type=checkbox],form input[type=radio]{cursor:pointer;}
-form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-form select,form input[type=file]{height:27px;line-height:27px;}
-form textarea{height:auto;}
-form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
-form :-moz-placeholder{color:#bfbfbf;}
-form ::-webkit-input-placeholder{color:#bfbfbf;}
-form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
-form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
+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:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
+.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;}
+input[type=checkbox],input[type=radio]{cursor:pointer;}
+input[type=text],input[type=password],textarea,select,.uneditable-input{display:inline-block;width:210px;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+select,input[type=file]{height:27px;line-height:27px;}
+textarea{height:auto;}
+.uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
+:-moz-placeholder{color:#bfbfbf;}
+::-webkit-input-placeholder{color:#bfbfbf;}
+input[type=text],input[type=password],select,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
+input[type=text]:focus,input[type=password]:focus,textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
form div.error .input-prepend span.add-on,form div.error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
-form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;}
-form .input-small,form input.small,form textarea.small,form select.small{width:90px;}
-form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;}
-form .input-large,form input.large,form textarea.large,form select.large{width:210px;}
-form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{width:270px;}
-form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;}
-form textarea.xxlarge{overflow-y:scroll;}
-form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.input-mini,input.mini,textarea.mini,select.mini{width:60px;}
+.input-small,input.small,textarea.small,select.small{width:90px;}
+.input-medium,input.medium,textarea.medium,select.medium{width:150px;}
+.input-large,input.large,textarea.large,select.large{width:210px;}
+.input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;}
+.input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;}
+textarea.xxlarge{overflow-y:scroll;}
+input[readonly]:focus,textarea[readonly]:focus,input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
.help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;}
.help-inline{padding-left:5px;*position:relative;*top:-5px;}
@@ -129,13 +150,13 @@ form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{bac
.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
.inputs-list li:first-child{padding-top:5px;}
.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;}
-form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;}
-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 .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 div.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-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;}
+.form-stacked legend{margin-left:0;}
+.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
+.form-stacked .clearfix{margin-bottom:9px;}.form-stacked .clearfix div.input{margin-left:0;}
+.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;}
.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
@@ -157,7 +178,7 @@ table .orange{color:#f89406;border-bottom-color:#f89406;}
table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;}
table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
-.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
.topbar a:hover,.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
.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;}
@@ -181,20 +202,26 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
-.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;}
-.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;}
-.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;}
-.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;}
-.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;}
-.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
-.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;}
-.block-message ul{margin-bottom:0;}
-.block-message strong{display:block;}
-.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
-.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
-.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
-.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
-.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
+.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
+.btn.primary{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);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.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;}
+.btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;}
+.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.btn.small{padding:7px 9px 7px;font-size:11px;}
+button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
+.alert-message{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message h5{line-height:18px;}
+.alert-message p{margin-bottom:0;}
+.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;}
+.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);}
+.alert-message .close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
+.alert-message.block-message{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message p{margin-right:30px;}
+.alert-message.block-message .alert-actions{margin-top:5px;}
+.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;}
+.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;}
+.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;}
+.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
.tabs:after,.pills:after{clear:both;}
.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;}
.tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
@@ -209,7 +236,7 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 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 .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
.modal .modal-body{padding:20px;}
-.modal .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;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
+.modal .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 .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
.modal .modal-footer:after{clear:both;}
.modal .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;}
View
7 docs/assets/css/docs.css
@@ -13,6 +13,9 @@ body {
section {
padding-top: 60px;
}
+section > .row {
+ margin-bottom: 10px;
+}
#masthead, #footer {
background-color: #049cd9;
background-repeat: no-repeat;
@@ -168,7 +171,7 @@ div.mini-layout div {
div.mini-layout div.mini-layout-body {
background-color: #dceaf4;
margin: 0 auto;
- width: 450px;
+ width: 340px;
height: 340px;
}
div.mini-layout.fluid div.mini-layout-sidebar,
@@ -182,7 +185,7 @@ div.mini-layout.fluid div.mini-layout-sidebar {
height: 340px;
}
div.mini-layout.fluid div.mini-layout-body {
- width: 400px;
+ width: 300px;
margin-left: 10px;
}
/* Topbar special styles
View
BIN docs/assets/img/browsers.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
213 docs/index.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.1.0.css" rel="stylesheet">
+ <link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -65,7 +65,7 @@
It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.<br />
</p>
<p><strong>Nerd alert:</strong> Bootstrap is <a href="#less" title="Read about using Bootstrap with Less">built with Less</a> and was designed to work out of the gate with modern browsers in mind.</p>
- </div> <!-- /container -->
+ </div><!-- /container -->
</div>
</div>
@@ -78,7 +78,7 @@
<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">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.0.min.css"></textarea>
+ <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.1.min.css"></textarea>
</form>
</div>
<div class="span5 columns">
@@ -94,7 +94,7 @@
<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 &raquo;</a></p>
</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
</div>
</div>
@@ -118,12 +118,13 @@
<div class="span5 columns">
<h3>Browser support</h3>
<p>Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.</p>
- <img src="assets/img/browsers.png" width="220px" height="48px" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
+ <img src="assets/img/browsers.png" width="258px" height="48px" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
<ul>
<li>Latest Safari</li>
<li>Latest Google Chrome</li>
<li>Firefox 4+</li>
<li>Internet Explorer 7+</li>
+ <li>Opera 11</li>
</ul>
</div>
<div class="span5 columns">
@@ -136,7 +137,7 @@
<li>Example page template (more to come soon)</li>
</ul>
</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
</section>
@@ -166,7 +167,7 @@
&lt;/div&gt;
</pre>
</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid" title="16 column layout">
<div class="span1 column">1</div>
<div class="span1 column">1</div>
@@ -184,7 +185,7 @@
<div class="span1 column">1</div>
<div class="span1 column">1</div>
<div class="span1 column">1</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid" title="8 column layout">
<div class="span2 columns">2</div>
<div class="span2 columns">2</div>
@@ -194,53 +195,53 @@
<div class="span2 columns">2</div>
<div class="span2 columns">2</div>
<div class="span2 columns">2</div>
- </div> <!-- /row -->
+ </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="span1 column">1</div>
- </div> <!-- /row -->
+ </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> <!-- /row -->
+ </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> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid" title="Half and half">
<div class="span8 columns">8</div>
<div class="span8 columns">8</div>
- </div> <!-- /row -->
+ </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> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid" title="Unnecessary single column layout">
<div class="span16 columns">16</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
<h4>Offsetting columns</h4>
<div class="row show-grid">
<div class="span4 columns">4</div>
<div class="span8 columns offset4">8 offset 4</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid">
<div class="span4 columns offset4">4 offset 4</div>
<div class="span4 columns offset4">4 offset 4</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid">
<div class="span5 columns offset3">5 offset 3</div>
<div class="span5 columns offset3">5 offset 3</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
<div class="row show-grid">
<div class="span10 columns offset6">10 offset 6</div>
- </div> <!-- /row -->
+ </div><!-- /row -->
</section>
@@ -252,13 +253,10 @@
<h1>Layouts <small>Basic templates to create webpages</small></h1>
</div>
- <!-- Fixed layout -->
<div class="row">
- <div class="span4 columns">
+ <div class="span8 columns">
<h2>Fixed layout</h2>
- <p>A basic 940px wide, centered container layout for just about any site or page.</p>
- </div>
- <div class="span12 columns">
+ <p>The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div.container&gt;</code>.</p>
<div class="mini-layout">
<div class="mini-layout-body"></div>
</div>
@@ -269,16 +267,10 @@
&lt;/div&gt;
&lt;/body&gt;
</pre>
- </div>
- </div> <!-- /row -->
-
- <!-- Fluid layout -->
- <div class="row">
- <div class="span4 columns">
+ </div><!-- /col -->
+ <div class="span8 columns">
<h2>Fluid layout</h2>
- <p>A flexible fluid or liquid page structure with min- and max-widths and a left-hand sidebar. Great for apps.</p>
- </div>
- <div class="span12 columns">
+ <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">
<div class="mini-layout-sidebar"></div>
<div class="mini-layout-body"></div>
@@ -295,8 +287,8 @@
&lt;/div&gt;
&lt;/body&gt;
</pre>
- </div>
- </div> <!-- /row -->
+ </div><!-- /col -->
+ </div><!-- /row -->
</section>
@@ -311,8 +303,10 @@
<!-- Headings & Paragraph Copy -->
<div class="row">
<div class="span4 columns">