summaryrefslogtreecommitdiff
path: root/united/bootstrap.css
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2014-02-13 15:21:12 -0500
committerThomas Park <thomas@thomaspark.me>2014-02-13 15:21:12 -0500
commit76c6df6aa66b3795df61d94e86e3fe4953d0a3a7 (patch)
tree74695325547aa231f00726684fbc37e3e29b428d /united/bootstrap.css
parentb743ae3d3a82237a10aee8a7d231738a64a0f41d (diff)
3.1.0 -> 3.1.1
Diffstat (limited to 'united/bootstrap.css')
-rw-r--r--united/bootstrap.css246
1 files changed, 100 insertions, 146 deletions
diff --git a/united/bootstrap.css b/united/bootstrap.css
index ba47d43d..84bebae6 100644
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -1,6 +1,6 @@
@import url("//fonts.googleapis.com/css?family=Ubuntu");
/*!
- * Bootswatch v3.1.0+1
+ * Bootswatch v3.1.1
* Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park
* Licensed under MIT
@@ -307,7 +307,11 @@ figure {
img {
vertical-align: middle;
}
-.img-responsive {
+.img-responsive,
+.thumbnail > img,
+.thumbnail a > img,
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
display: block;
max-width: 100%;
height: auto;
@@ -581,15 +585,13 @@ ol ol {
.list-inline {
padding-left: 0;
list-style: none;
+ margin-left: -5px;
}
.list-inline > li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
-.list-inline > li:first-child {
- padding-left: 0;
-}
dl {
margin-top: 0;
margin-bottom: 20px;
@@ -1709,9 +1711,6 @@ output {
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
}
-.form-control:-moz-placeholder {
- color: #aea79f;
-}
.form-control::-moz-placeholder {
color: #aea79f;
opacity: 1;
@@ -1732,6 +1731,9 @@ fieldset[disabled] .form-control {
textarea.form-control {
height: auto;
}
+input[type="search"] {
+ -webkit-appearance: none;
+}
input[type="date"] {
line-height: 38px;
}
@@ -1935,6 +1937,9 @@ select[multiple].input-lg {
width: auto;
vertical-align: middle;
}
+ .form-inline .input-group > .form-control {
+ width: 100%;
+ }
.form-inline .control-label {
margin-bottom: 0;
vertical-align: middle;
@@ -2002,10 +2007,11 @@ select[multiple].input-lg {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
- -o-user-select: none;
user-select: none;
}
-.btn:focus {
+.btn:focus,
+.btn:active:focus,
+.btn.active:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
@@ -2311,19 +2317,22 @@ fieldset[disabled] .btn-link:focus {
color: #aea79f;
text-decoration: none;
}
-.btn-lg {
+.btn-lg,
+.btn-group-lg > .btn {
padding: 14px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px;
}
-.btn-sm {
+.btn-sm,
+.btn-group-sm > .btn {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
-.btn-xs {
+.btn-xs,
+.btn-group-xs > .btn {
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
@@ -3194,24 +3203,6 @@ input[type="button"].btn-block {
.btn-group.open .dropdown-toggle {
outline: 0;
}
-.btn-group-xs > .btn {
- padding: 1px 5px;
- font-size: 12px;
- line-height: 1.5;
- border-radius: 3px;
-}
-.btn-group-sm > .btn {
- padding: 5px 10px;
- font-size: 12px;
- line-height: 1.5;
- border-radius: 3px;
-}
-.btn-group-lg > .btn {
- padding: 14px 16px;
- font-size: 18px;
- line-height: 1.33;
- border-radius: 6px;
-}
.btn-group > .btn + .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
@@ -3311,6 +3302,8 @@ input[type="button"].btn-block {
padding-right: 0;
}
.input-group .form-control {
+ position: relative;
+ z-index: 2;
float: left;
width: 100%;
margin-bottom: 0;
@@ -3746,7 +3739,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
padding: 15px 15px;
font-size: 18px;
line-height: 20px;
- height: 20px;
+ height: 50px;
}
.navbar-brand:hover,
.navbar-brand:focus {
@@ -3863,6 +3856,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
width: auto;
vertical-align: middle;
}
+ .navbar-form .input-group > .form-control {
+ width: 100%;
+ }
.navbar-form .control-label {
margin-bottom: 0;
vertical-align: middle;
@@ -4414,9 +4410,6 @@ a.list-group-item.active > .badge,
}
.thumbnail > img,
.thumbnail a > img {
- display: block;
- max-width: 100%;
- height: auto;
margin-left: auto;
margin-right: auto;
}
@@ -4769,6 +4762,31 @@ a.list-group-item-danger.active:focus {
.panel-body {
padding: 15px;
}
+.panel-heading {
+ padding: 10px 15px;
+ border-bottom: 1px solid transparent;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
+}
+.panel-heading > .dropdown .dropdown-toggle {
+ color: inherit;
+}
+.panel-title {
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 16px;
+ color: inherit;
+}
+.panel-title > a {
+ color: inherit;
+}
+.panel-footer {
+ padding: 10px 15px;
+ background-color: #f5f5f5;
+ border-top: 1px solid #dddddd;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+}
.panel > .list-group {
margin-bottom: 0;
}
@@ -4776,17 +4794,13 @@ a.list-group-item-danger.active:focus {
border-width: 1px 0;
border-radius: 0;
}
-.panel > .list-group .list-group-item:first-child {
- border-top: 0;
-}
-.panel > .list-group .list-group-item:last-child {
- border-bottom: 0;
-}
.panel > .list-group:first-child .list-group-item:first-child {
+ border-top: 0;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
}
.panel > .list-group:last-child .list-group-item:last-child {
+ border-bottom: 0;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
}
@@ -4797,6 +4811,11 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive > .table {
margin-bottom: 0;
}
+.panel > .table:first-child,
+.panel > .table-responsive:first-child > .table:first-child {
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
+}
.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
@@ -4817,6 +4836,11 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
border-top-right-radius: 3px;
}
+.panel > .table:last-child,
+.panel > .table-responsive:last-child > .table:last-child {
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+}
.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
@@ -4877,63 +4901,30 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
border-right: 0;
}
-.panel > .table-bordered > thead > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
-.panel > .table-bordered > tbody > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
-.panel > .table-bordered > tfoot > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
.panel > .table-bordered > thead > tr:first-child > td,
.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
.panel > .table-bordered > tbody > tr:first-child > td,
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-bordered > tfoot > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
- border-top: 0;
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
+ border-bottom: 0;
}
-.panel > .table-bordered > thead > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
-.panel > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-bordered > tfoot > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th,
-.panel > .table-bordered > thead > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > thead > tr:last-child > td,
.panel > .table-bordered > tbody > tr:last-child > td,
.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
.panel > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
border-bottom: 0;
}
.panel > .table-responsive {
border: 0;
margin-bottom: 0;
}
-.panel-heading {
- padding: 10px 15px;
- border-bottom: 1px solid transparent;
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
-}
-.panel-heading > .dropdown .dropdown-toggle {
- color: inherit;
-}
-.panel-title {
- margin-top: 0;
- margin-bottom: 0;
- font-size: 16px;
- color: inherit;
-}
-.panel-title > a {
- color: inherit;
-}
-.panel-footer {
- padding: 10px 15px;
- background-color: #f5f5f5;
- border-top: 1px solid #dddddd;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
-}
.panel-group {
margin-bottom: 20px;
}
@@ -5195,6 +5186,8 @@ button.close {
.modal-sm {
width: 300px;
}
+}
+@media (min-width: 992px) {
.modal-lg {
width: 900px;
}
@@ -5340,8 +5333,8 @@ button.close {
.popover-content {
padding: 9px 14px;
}
-.popover .arrow,
-.popover .arrow:after {
+.popover > .arrow,
+.popover > .arrow:after {
position: absolute;
display: block;
width: 0;
@@ -5349,14 +5342,14 @@ button.close {
border-color: transparent;
border-style: solid;
}
-.popover .arrow {
+.popover > .arrow {
border-width: 11px;
}
-.popover .arrow:after {
+.popover > .arrow:after {
border-width: 10px;
content: "";
}
-.popover.top .arrow {
+.popover.top > .arrow {
left: 50%;
margin-left: -11px;
border-bottom-width: 0;
@@ -5364,14 +5357,14 @@ button.close {
border-top-color: rgba(0, 0, 0, 0.25);
bottom: -11px;
}
-.popover.top .arrow:after {
+.popover.top > .arrow:after {
content: " ";
bottom: 1px;
margin-left: -10px;
border-bottom-width: 0;
border-top-color: #ffffff;
}
-.popover.right .arrow {
+.popover.right > .arrow {
top: 50%;
left: -11px;
margin-top: -11px;
@@ -5379,14 +5372,14 @@ button.close {
border-right-color: #999999;
border-right-color: rgba(0, 0, 0, 0.25);
}
-.popover.right .arrow:after {
+.popover.right > .arrow:after {
content: " ";
left: 1px;
bottom: -10px;
border-left-width: 0;
border-right-color: #ffffff;
}
-.popover.bottom .arrow {
+.popover.bottom > .arrow {
left: 50%;
margin-left: -11px;
border-top-width: 0;
@@ -5394,14 +5387,14 @@ button.close {
border-bottom-color: rgba(0, 0, 0, 0.25);
top: -11px;
}
-.popover.bottom .arrow:after {
+.popover.bottom > .arrow:after {
content: " ";
top: 1px;
margin-left: -10px;
border-top-width: 0;
border-bottom-color: #ffffff;
}
-.popover.left .arrow {
+.popover.left > .arrow {
top: 50%;
right: -11px;
margin-top: -11px;
@@ -5409,7 +5402,7 @@ button.close {
border-left-color: #999999;
border-left-color: rgba(0, 0, 0, 0.25);
}
-.popover.left .arrow:after {
+.popover.left > .arrow:after {
content: " ";
right: 1px;
border-right-width: 0;
@@ -5432,9 +5425,6 @@ button.close {
}
.carousel-inner > .item > img,
.carousel-inner > .item > a > img {
- display: block;
- max-width: 100%;
- height: auto;
line-height: 1;
}
.carousel-inner > .active,
@@ -5578,8 +5568,8 @@ button.close {
text-shadow: none;
}
@media screen and (min-width: 768px) {
- .carousel-control .glyphicons-chevron-left,
- .carousel-control .glyphicons-chevron-right,
+ .carousel-control .glyphicon-chevron-left,
+ .carousel-control .glyphicon-chevron-right,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
@@ -5601,9 +5591,9 @@ button.close {
width: device-width;
}
.visible-xs,
-tr.visible-xs,
-th.visible-xs,
-td.visible-xs {
+.visible-sm,
+.visible-md,
+.visible-lg {
display: none !important;
}
@media (max-width: 767px) {
@@ -5621,12 +5611,6 @@ td.visible-xs {
display: table-cell !important;
}
}
-.visible-sm,
-tr.visible-sm,
-th.visible-sm,
-td.visible-sm {
- display: none !important;
-}
@media (min-width: 768px) and (max-width: 991px) {
.visible-sm {
display: block !important;
@@ -5642,12 +5626,6 @@ td.visible-sm {
display: table-cell !important;
}
}
-.visible-md,
-tr.visible-md,
-th.visible-md,
-td.visible-md {
- display: none !important;
-}
@media (min-width: 992px) and (max-width: 1199px) {
.visible-md {
display: block !important;
@@ -5663,12 +5641,6 @@ td.visible-md {
display: table-cell !important;
}
}
-.visible-lg,
-tr.visible-lg,
-th.visible-lg,
-td.visible-lg {
- display: none !important;
-}
@media (min-width: 1200px) {
.visible-lg {
display: block !important;
@@ -5685,41 +5657,26 @@ td.visible-lg {
}
}
@media (max-width: 767px) {
- .hidden-xs,
- tr.hidden-xs,
- th.hidden-xs,
- td.hidden-xs {
+ .hidden-xs {
display: none !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
- .hidden-sm,
- tr.hidden-sm,
- th.hidden-sm,
- td.hidden-sm {
+ .hidden-sm {
display: none !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
- .hidden-md,
- tr.hidden-md,
- th.hidden-md,
- td.hidden-md {
+ .hidden-md {
display: none !important;
}
}
@media (min-width: 1200px) {
- .hidden-lg,
- tr.hidden-lg,
- th.hidden-lg,
- td.hidden-lg {
+ .hidden-lg {
display: none !important;
}
}
-.visible-print,
-tr.visible-print,
-th.visible-print,
-td.visible-print {
+.visible-print {
display: none !important;
}
@media print {
@@ -5738,10 +5695,7 @@ td.visible-print {
}
}
@media print {
- .hidden-print,
- tr.hidden-print,
- th.hidden-print,
- td.hidden-print {
+ .hidden-print {
display: none !important;
}
}