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
// Swatch: Amelia
// Version: 2.1.0
// Version: 2.1.1
// -----------------------------------------------------
// TYPOGRAPHY
......
//
// Variables
// Swatch: Amelia
// Version: 2.1.0
// Version: 2.1.1
// --------------------------------------------------
......
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less
// Swatch: Cerulean
// Version: 2.1.0
// Version: 2.1.1
// -----------------------------------------------------
// TYPOGRAPHY
......
//
// Variables
// Swatch: Cerulean
// Version: 2.1.0
// Version: 2.1.1
// --------------------------------------------------
......
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less
// Swatch: Cyborg
// Version: 2.1.0
// Version: 2.1.1
// -----------------------------------------------------
// TYPOGRAPHY
......
//
// Variables
// Swatch: Cyborg
// Version: 2.1.0
// Version: 2.1.1
// --------------------------------------------------
......
/*!
* Bootstrap Responsive v2.1.0
* Bootstrap Responsive v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......@@ -107,6 +107,7 @@
}
[class*="span"] {
float: left;
min-height: 1px;
margin-left: 30px;
}
.container,
......@@ -453,6 +454,7 @@
}
[class*="span"] {
float: left;
min-height: 1px;
margin-left: 20px;
}
.container,
......@@ -780,7 +782,8 @@
padding-left: 20px;
}
.navbar-fixed-top,
.navbar-fixed-bottom {
.navbar-fixed-bottom,
.navbar-static-top {
margin-right: -20px;
margin-left: -20px;
}
......@@ -814,8 +817,11 @@
.row-fluid [class*="span"] {
display: block;
float: none;
width: auto;
width: 100%;
margin-left: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.span12,
.row-fluid .span12 {
......@@ -845,6 +851,9 @@
display: inline-block;
width: auto;
}
.controls-row [class*="span"] + [class*="span"] {
margin-left: 0;
}
.modal {
position: fixed;
top: 20px;
......@@ -870,7 +879,7 @@
input[type="radio"] {
border: 1px solid #ccc;
}
.form-horizontal .control-group > label {
.form-horizontal .control-label {
float: none;
width: auto;
padding-top: 0;
......@@ -944,14 +953,14 @@
display: none;
}
.nav-collapse .nav .nav-header {
color: #555555;
color: #777777;
text-shadow: none;
}
.nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
padding: 9px 15px;
font-weight: bold;
color: #555555;
color: #777777;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
......@@ -1003,6 +1012,10 @@
.nav-collapse .dropdown-menu .divider {
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-search {
float: none;
......@@ -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);
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 {
float: none;
margin-left: 0;
......
This diff is collapsed.
/*!
* Bootstrap v2.1.0
* Bootstrap v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......@@ -67,6 +67,7 @@ sub {
}
img {
width: auto\9;
height: auto;
max-width: 100%;
vertical-align: middle;
......@@ -215,6 +216,7 @@ a:hover {
[class*="span"] {
float: left;
min-height: 1px;
margin-left: 20px;
}
......@@ -583,7 +585,7 @@ p {
.lead {
margin-bottom: 20px;
font-size: 20px;
font-size: 21px;
font-weight: 200;
line-height: 30px;
}
......@@ -608,6 +610,22 @@ cite {
color: #999999;
}
.text-warning {
color: #c09853;
}
.text-error {
color: #b94a48;
}
.text-info {
color: #3a87ad;
}
.text-success {
color: #468847;
}
h1,
h2,
h3,
......@@ -725,9 +743,24 @@ dd {
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 {
float: left;
width: 120px;
width: 160px;
overflow: hidden;
clear: left;
text-align: right;
......@@ -736,7 +769,7 @@ dd {
}
.dl-horizontal dd {
margin-left: 130px;
margin-left: 180px;
}
hr {
......@@ -945,8 +978,9 @@ input[type="color"],
}
input,
textarea {
width: 210px;
textarea,
.uneditable-input {
width: 206px;
}
textarea {
......@@ -1039,7 +1073,7 @@ input[type="file"] {
select {
width: 220px;
background-color: #ffffff;
border: 1px solid #bbb;
border: 1px solid #cccccc;
}
select[multiple],
......@@ -1301,14 +1335,17 @@ input[type="checkbox"][readonly] {
.control-group.warning select,
.control-group.warning textarea {
color: #c09853;
}
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
border-color: #c09853;
-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.warning .checkbox:focus,
.control-group.warning .radio:focus,
.control-group.warning input:focus,
.control-group.warning select:focus,
.control-group.warning textarea:focus {
......@@ -1337,14 +1374,17 @@ input[type="checkbox"][readonly] {
.control-group.error select,
.control-group.error textarea {
color: #b94a48;
}
.control-group.error input,
.control-group.error select,
.control-group.error textarea {
border-color: #b94a48;
-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.error .checkbox:focus,
.control-group.error .radio:focus,
.control-group.error input:focus,
.control-group.error select:focus,
.control-group.error textarea:focus {
......@@ -1373,14 +1413,17 @@ input[type="checkbox"][readonly] {
.control-group.success select,
.control-group.success textarea {
color: #468847;
}
.control-group.success input,
.control-group.success select,
.control-group.success textarea {
border-color: #468847;
-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.success .checkbox:focus,
.control-group.success .radio:focus,
.control-group.success input:focus,
.control-group.success select:focus,
.control-group.success textarea:focus {
......@@ -1397,6 +1440,45 @@ input[type="checkbox"][readonly] {
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,
textarea:focus:required:invalid,
select:focus:required:invalid {
......@@ -1503,7 +1585,6 @@ select:focus:required:invalid:focus {
.input-prepend .add-on,
.input-append .btn,
.input-prepend .btn {
margin-left: -1px;
vertical-align: top;
-webkit-border-radius: 0;
-moz-border-radius: 0;
......@@ -1536,6 +1617,11 @@ select:focus:required:invalid:focus {
border-radius: 3px 0 0 3px;
}
.input-append .add-on,
.input-append .btn {
margin-left: -1px;
}
.input-append .add-on:last-child,
.input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0;
......@@ -1706,7 +1792,7 @@ legend + .control-group {
.form-horizontal .control-label {
float: left;
width: 140px;
width: 160px;
padding-top: 5px;
text-align: right;
}
......@@ -1714,21 +1800,26 @@ legend + .control-group {
.form-horizontal .controls {
*display: inline-block;
*padding-left: 20px;
margin-left: 160px;
margin-left: 180px;
*margin-left: 0;
}
.form-horizontal .controls:first-child {
*padding-left: 160px;
*padding-left: 180px;
}
.form-horizontal .help-block {
margin-top: 10px;
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 {
padding-left: 160px;
padding-left: 180px;
}
table {
......@@ -1853,7 +1944,7 @@ table {
.table-bordered colgroup + tbody tr:first-child td:last-child {
-webkit-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,
......@@ -1873,145 +1964,145 @@ table [class*=span],
margin-left: 0;
}
table .span1 {
.table .span1 {
float: none;
width: 44px;
margin-left: 0;
}
table .span2 {
.table .span2 {
float: none;
width: 124px;
margin-left: 0;
}
table .span3 {
.table .span3 {
float: none;
width: 204px;
margin-left: 0;
}
table .span4 {
.table .span4 {
float: none;
width: 284px;
margin-left: 0;
}
table .span5 {
.table .span5 {
float: none;
width: 364px;
margin-left: 0;
}
table .span6 {
.table .span6 {
float: none;
width: 444px;
margin-left: 0;
}
table .span7 {
.table .span7 {
float: none;
width: 524px;
margin-left: 0;
}
table .span8 {
.table .span8 {
float: none;
width: 604px;
margin-left: 0;
}
table .span9 {
.table .span9 {
float: none;
width: 684px;
margin-left: 0;
}
table .span10 {
.table .span10 {
float: none;
width: 764px;
margin-left: 0;
}
table .span11 {
.table .span11 {
float: none;
width: 844px;
margin-left: 0;
}
table .span12 {
.table .span12 {
float: none;
width: 924px;
margin-left: 0;
}
table .span13 {
.table .span13 {
float: none;
width: 1004px;
margin-left: 0;
}
table .span14 {
.table .span14 {
float: none;
width: 1084px;
margin-left: 0;
}
table .span15 {
.table .span15 {
float: none;
width: 1164px;
margin-left: 0;
}
table .span16 {
.table .span16 {
float: none;
width: 1244px;
margin-left: 0;
}
table .span17 {
.table .span17 {
float: none;
width: 1324px;
margin-left: 0;
}
table .span18 {
.table .span18 {
float: none;
width: 1404px;
margin-left: 0;
}
table .span19 {
.table .span19 {
float: none;
width: 1484px;
margin-left: 0;
}
table .span20 {
.table .span20 {
float: none;
width: 1564px;
margin-left: 0;
}
table .span21 {
.table .span21 {
float: none;
width: 1644px;
margin-left: 0;
}
table .span22 {
.table .span22 {
float: none;
width: 1724px;
margin-left: 0;
}
table .span23 {
.table .span23 {
float: none;
width: 1804px;
margin-left: 0;
}
table .span24 {
.table .span24 {
float: none;
width: 1884px;
margin-left: 0;
......@@ -2025,10 +2116,30 @@ table .span24 {
background-color: #f2dede;
}
.table tbody tr.warning td {
background-color: #fcf8e3;
}
.table tbody tr.info td {
background-color: #d9edf7;
}
.table-hover tbody tr.success:hover td {
background-color: #d0e9c6;
}
.table-hover tbody tr.error:hover td {
background-color: #ebcccc;
}
.table-hover tbody tr.warning:hover td {
background-color: #faf2cc;
}