Commit 6c27a127 authored by Thomas Park's avatar Thomas Park
Browse files

all: 2.1.0 -> 2.1.1

parent 6fd8d7e1
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Bootswatch.less
// Swatch: Amelia // Swatch: Amelia
// Version: 2.1.0 // Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
......
// //
// Variables // Variables
// Swatch: Amelia // Swatch: Amelia
// Version: 2.1.0 // Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
......
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Bootswatch.less
// Swatch: Cerulean // Swatch: Cerulean
// Version: 2.1.0 // Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
......
// //
// Variables // Variables
// Swatch: Cerulean // Swatch: Cerulean
// Version: 2.1.0 // Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
......
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Bootswatch.less
// Swatch: Cyborg // Swatch: Cyborg
// Version: 2.1.0 // Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
......
// //
// Variables // Variables
// Swatch: Cyborg // Swatch: Cyborg
// Version: 2.1.0 // Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
......
/*! /*!
* Bootstrap Responsive v2.1.0 * Bootstrap Responsive v2.1.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
} }
[class*="span"] { [class*="span"] {
float: left; float: left;
min-height: 1px;
margin-left: 30px; margin-left: 30px;
} }
.container, .container,
...@@ -453,6 +454,7 @@ ...@@ -453,6 +454,7 @@
} }
[class*="span"] { [class*="span"] {
float: left; float: left;
min-height: 1px;
margin-left: 20px; margin-left: 20px;
} }
.container, .container,
...@@ -780,7 +782,8 @@ ...@@ -780,7 +782,8 @@
padding-left: 20px; padding-left: 20px;
} }
.navbar-fixed-top, .navbar-fixed-top,
.navbar-fixed-bottom { .navbar-fixed-bottom,
.navbar-static-top {
margin-right: -20px; margin-right: -20px;
margin-left: -20px; margin-left: -20px;
} }
...@@ -814,8 +817,11 @@ ...@@ -814,8 +817,11 @@
.row-fluid [class*="span"] { .row-fluid [class*="span"] {
display: block; display: block;
float: none; float: none;
width: auto; width: 100%;
margin-left: 0; margin-left: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
} }
.span12, .span12,
.row-fluid .span12 { .row-fluid .span12 {
...@@ -845,6 +851,9 @@ ...@@ -845,6 +851,9 @@
display: inline-block; display: inline-block;
width: auto; width: auto;
} }
.controls-row [class*="span"] + [class*="span"] {
margin-left: 0;
}
.modal { .modal {
position: fixed; position: fixed;
top: 20px; top: 20px;
...@@ -870,7 +879,7 @@ ...@@ -870,7 +879,7 @@
input[type="radio"] { input[type="radio"] {
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.form-horizontal .control-group > label { .form-horizontal .control-label {
float: none; float: none;
width: auto; width: auto;
padding-top: 0; padding-top: 0;
...@@ -944,14 +953,14 @@ ...@@ -944,14 +953,14 @@
display: none; display: none;
} }
.nav-collapse .nav .nav-header { .nav-collapse .nav .nav-header {
color: #555555; color: #777777;
text-shadow: none; text-shadow: none;
} }
.nav-collapse .nav > li > a, .nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a { .nav-collapse .dropdown-menu a {
padding: 9px 15px; padding: 9px 15px;
font-weight: bold; font-weight: bold;
color: #555555; color: #777777;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
...@@ -1003,6 +1012,10 @@ ...@@ -1003,6 +1012,10 @@
.nav-collapse .dropdown-menu .divider { .nav-collapse .dropdown-menu .divider {
display: none; display: none;
} }
.nav-collapse .nav > li > .dropdown-menu:before,
.nav-collapse .nav > li > .dropdown-menu:after {
display: none;
}
.nav-collapse .navbar-form, .nav-collapse .navbar-form,
.nav-collapse .navbar-search { .nav-collapse .navbar-search {
float: none; float: none;
...@@ -1014,6 +1027,11 @@ ...@@ -1014,6 +1027,11 @@
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
} }
.navbar-inverse .nav-collapse .navbar-form,
.navbar-inverse .nav-collapse .navbar-search {
border-top-color: #111111;
border-bottom-color: #111111;
}
.navbar .nav-collapse .nav.pull-right { .navbar .nav-collapse .nav.pull-right {
float: none; float: none;
margin-left: 0; margin-left: 0;
......
This diff is collapsed.
/*! /*!
* Bootstrap v2.1.0 * Bootstrap v2.1.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -67,6 +67,7 @@ sub { ...@@ -67,6 +67,7 @@ sub {
} }
img { img {
width: auto\9;
height: auto; height: auto;
max-width: 100%; max-width: 100%;
vertical-align: middle; vertical-align: middle;
...@@ -215,6 +216,7 @@ a:hover { ...@@ -215,6 +216,7 @@ a:hover {
[class*="span"] { [class*="span"] {
float: left; float: left;
min-height: 1px;
margin-left: 20px; margin-left: 20px;
} }
...@@ -583,7 +585,7 @@ p { ...@@ -583,7 +585,7 @@ p {
.lead { .lead {
margin-bottom: 20px; margin-bottom: 20px;
font-size: 20px; font-size: 21px;
font-weight: 200; font-weight: 200;
line-height: 30px; line-height: 30px;
} }
...@@ -608,6 +610,22 @@ cite { ...@@ -608,6 +610,22 @@ cite {
color: #999999; color: #999999;
} }
.text-warning {
color: #c09853;
}
.text-error {
color: #b94a48;
}
.text-info {
color: #3a87ad;
}
.text-success {
color: #468847;
}
h1, h1,
h2, h2,
h3, h3,
...@@ -725,9 +743,24 @@ dd { ...@@ -725,9 +743,24 @@ dd {
margin-left: 10px; margin-left: 10px;
} }
.dl-horizontal {
*zoom: 1;
}
.dl-horizontal:before,
.dl-horizontal:after {
display: table;
line-height: 0;
content: "";
}
.dl-horizontal:after {
clear: both;
}
.dl-horizontal dt { .dl-horizontal dt {
float: left; float: left;
width: 120px; width: 160px;
overflow: hidden; overflow: hidden;
clear: left; clear: left;
text-align: right; text-align: right;
...@@ -736,7 +769,7 @@ dd { ...@@ -736,7 +769,7 @@ dd {
} }
.dl-horizontal dd { .dl-horizontal dd {
margin-left: 130px; margin-left: 180px;
} }
hr { hr {
...@@ -945,8 +978,9 @@ input[type="color"], ...@@ -945,8 +978,9 @@ input[type="color"],
} }
input, input,
textarea { textarea,
width: 210px; .uneditable-input {
width: 206px;
} }
textarea { textarea {
...@@ -1039,7 +1073,7 @@ input[type="file"] { ...@@ -1039,7 +1073,7 @@ input[type="file"] {
select { select {
width: 220px; width: 220px;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #bbb; border: 1px solid #cccccc;
} }
select[multiple], select[multiple],
...@@ -1301,14 +1335,17 @@ input[type="checkbox"][readonly] { ...@@ -1301,14 +1335,17 @@ input[type="checkbox"][readonly] {
.control-group.warning select, .control-group.warning select,
.control-group.warning textarea { .control-group.warning textarea {
color: #c09853; color: #c09853;
}
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
border-color: #c09853; border-color: #c09853;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
} }
.control-group.warning .checkbox:focus,
.control-group.warning .radio:focus,
.control-group.warning input:focus, .control-group.warning input:focus,
.control-group.warning select:focus, .control-group.warning select:focus,
.control-group.warning textarea:focus { .control-group.warning textarea:focus {
...@@ -1337,14 +1374,17 @@ input[type="checkbox"][readonly] { ...@@ -1337,14 +1374,17 @@ input[type="checkbox"][readonly] {
.control-group.error select, .control-group.error select,
.control-group.error textarea { .control-group.error textarea {
color: #b94a48; color: #b94a48;
}
.control-group.error input,
.control-group.error select,
.control-group.error textarea {
border-color: #b94a48; border-color: #b94a48;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
} }
.control-group.error .checkbox:focus,
.control-group.error .radio:focus,
.control-group.error input:focus, .control-group.error input:focus,
.control-group.error select:focus, .control-group.error select:focus,
.control-group.error textarea:focus { .control-group.error textarea:focus {
...@@ -1373,14 +1413,17 @@ input[type="checkbox"][readonly] { ...@@ -1373,14 +1413,17 @@ input[type="checkbox"][readonly] {
.control-group.success select, .control-group.success select,
.control-group.success textarea { .control-group.success textarea {
color: #468847; color: #468847;
}
.control-group.success input,
.control-group.success select,
.control-group.success textarea {
border-color: #468847; border-color: #468847;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
} }
.control-group.success .checkbox:focus,
.control-group.success .radio:focus,
.control-group.success input:focus, .control-group.success input:focus,
.control-group.success select:focus, .control-group.success select:focus,
.control-group.success textarea:focus { .control-group.success textarea:focus {
...@@ -1397,6 +1440,45 @@ input[type="checkbox"][readonly] { ...@@ -1397,6 +1440,45 @@ input[type="checkbox"][readonly] {
border-color: #468847; border-color: #468847;
} }
.control-group.info > label,
.control-group.info .help-block,
.control-group.info .help-inline {
color: #3a87ad;
}
.control-group.info .checkbox,
.control-group.info .radio,
.control-group.info input,
.control-group.info select,
.control-group.info textarea {
color: #3a87ad;
}
.control-group.info input,
.control-group.info select,
.control-group.info textarea {
border-color: #3a87ad;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.info input:focus,
.control-group.info select:focus,
.control-group.info textarea:focus {
border-color: #2d6987;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
}
.control-group.info .input-prepend .add-on,
.control-group.info .input-append .add-on {
color: #3a87ad;
background-color: #d9edf7;
border-color: #3a87ad;
}
input:focus:required:invalid, input:focus:required:invalid,
textarea:focus:required:invalid, textarea:focus:required:invalid,
select:focus:required:invalid { select:focus:required:invalid {
...@@ -1503,7 +1585,6 @@ select:focus:required:invalid:focus { ...@@ -1503,7 +1585,6 @@ select:focus:required:invalid:focus {
.input-prepend .add-on, .input-prepend .add-on,
.input-append .btn, .input-append .btn,
.input-prepend .btn { .input-prepend .btn {
margin-left: -1px;
vertical-align: top; vertical-align: top;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
...@@ -1536,6 +1617,11 @@ select:focus:required:invalid:focus { ...@@ -1536,6 +1617,11 @@ select:focus:required:invalid:focus {
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
} }
.input-append .add-on,
.input-append .btn {
margin-left: -1px;
}
.input-append .add-on:last-child, .input-append .add-on:last-child,
.input-append .btn:last-child { .input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
...@@ -1706,7 +1792,7 @@ legend + .control-group { ...@@ -1706,7 +1792,7 @@ legend + .control-group {
.form-horizontal .control-label { .form-horizontal .control-label {
float: left; float: left;
width: 140px; width: 160px;
padding-top: 5px; padding-top: 5px;
text-align: right; text-align: right;
} }
...@@ -1714,21 +1800,26 @@ legend + .control-group { ...@@ -1714,21 +1800,26 @@ legend + .control-group {
.form-horizontal .controls { .form-horizontal .controls {
*display: inline-block; *display: inline-block;
*padding-left: 20px; *padding-left: 20px;
margin-left: 160px; margin-left: 180px;
*margin-left: 0; *margin-left: 0;
} }
.form-horizontal .controls:first-child { .form-horizontal .controls:first-child {
*padding-left: 160px; *padding-left: 180px;
} }
.form-horizontal .help-block { .form-horizontal .help-block {
margin-top: 10px;
margin-bottom: 0; margin-bottom: 0;
} }
.form-horizontal input + .help-block,
.form-horizontal select + .help-block,
.form-horizontal textarea + .help-block {
margin-top: 10px;
}
.form-horizontal .form-actions { .form-horizontal .form-actions {
padding-left: 160px; padding-left: 180px;
} }
table { table {
...@@ -1853,7 +1944,7 @@ table { ...@@ -1853,7 +1944,7 @@ table {
.table-bordered colgroup + tbody tr:first-child td:last-child { .table-bordered colgroup + tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
-moz-border-right-topleft: 4px; -moz-border-radius-topleft: 4px;
} }
.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) td,
...@@ -1873,145 +1964,145 @@ table [class*=span], ...@@ -1873,145 +1964,145 @@ table [cla