2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'master' into pr/11299

Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
This commit is contained in:
Mark Otto
2013-11-30 00:55:00 -08:00
68 changed files with 814 additions and 856 deletions
+1 -3
View File
@@ -1,9 +1,7 @@
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default,
+1 -3
View File
File diff suppressed because one or more lines are too long
+205 -279
View File
@@ -1,9 +1,7 @@
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
@@ -333,7 +331,7 @@ a:focus {
}
a:focus {
outline: thin dotted #333;
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -426,35 +424,35 @@ cite {
}
.text-warning {
color: #c09853;
color: #8a6d3b;
}
.text-warning:hover {
color: #a47e3c;
color: #66512c;
}
.text-danger {
color: #b94a48;
color: #a94442;
}
.text-danger:hover {
color: #953b39;
color: #843534;
}
.text-success {
color: #468847;
color: #3c763d;
}
.text-success:hover {
color: #356635;
color: #2b542c;
}
.text-info {
color: #3a87ad;
color: #31708f;
}
.text-info:hover {
color: #2d6987;
color: #245269;
}
.text-left {
@@ -692,13 +690,15 @@ blockquote p:last-child {
margin-bottom: 0;
}
blockquote small {
blockquote small,
blockquote .small {
display: block;
line-height: 1.428571429;
color: #999999;
}
blockquote small:before {
blockquote small:before,
blockquote .small:before {
content: '\2014 \00A0';
}
@@ -740,7 +740,7 @@ code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
@@ -807,6 +807,24 @@ pre code {
clear: both;
}
@media (min-width: 768px) {
.container {
width: 750px;
}
}
@media (min-width: 992px) {
.container {
width: 970px;
}
}
@media (min-width: 1200px) {
.container {
width: 1170px;
}
}
.row {
margin-right: -15px;
margin-left: -15px;
@@ -996,6 +1014,10 @@ pre code {
right: 8.333333333333332%;
}
.col-xs-pull-0 {
right: 0;
}
.col-xs-push-12 {
left: 100%;
}
@@ -1044,6 +1066,10 @@ pre code {
left: 8.333333333333332%;
}
.col-xs-push-0 {
left: 0;
}
.col-xs-offset-12 {
margin-left: 100%;
}
@@ -1092,10 +1118,11 @@ pre code {
margin-left: 8.333333333333332%;
}
.col-xs-offset-0 {
margin-left: 0;
}
@media (min-width: 768px) {
.container {
width: 750px;
}
.col-sm-1,
.col-sm-2,
.col-sm-3,
@@ -1181,6 +1208,9 @@ pre code {
.col-sm-pull-1 {
right: 8.333333333333332%;
}
.col-sm-pull-0 {
right: 0;
}
.col-sm-push-12 {
left: 100%;
}
@@ -1217,6 +1247,9 @@ pre code {
.col-sm-push-1 {
left: 8.333333333333332%;
}
.col-sm-push-0 {
left: 0;
}
.col-sm-offset-12 {
margin-left: 100%;
}
@@ -1253,12 +1286,12 @@ pre code {
.col-sm-offset-1 {
margin-left: 8.333333333333332%;
}
.col-sm-offset-0 {
margin-left: 0;
}
}
@media (min-width: 992px) {
.container {
width: 970px;
}
.col-md-1,
.col-md-2,
.col-md-3,
@@ -1344,6 +1377,9 @@ pre code {
.col-md-pull-1 {
right: 8.333333333333332%;
}
.col-md-pull-0 {
right: 0;
}
.col-md-push-12 {
left: 100%;
}
@@ -1380,6 +1416,9 @@ pre code {
.col-md-push-1 {
left: 8.333333333333332%;
}
.col-md-push-0 {
left: 0;
}
.col-md-offset-12 {
margin-left: 100%;
}
@@ -1416,12 +1455,12 @@ pre code {
.col-md-offset-1 {
margin-left: 8.333333333333332%;
}
.col-md-offset-0 {
margin-left: 0;
}
}
@media (min-width: 1200px) {
.container {
width: 1170px;
}
.col-lg-1,
.col-lg-2,
.col-lg-3,
@@ -1507,6 +1546,9 @@ pre code {
.col-lg-pull-1 {
right: 8.333333333333332%;
}
.col-lg-pull-0 {
right: 0;
}
.col-lg-push-12 {
left: 100%;
}
@@ -1543,6 +1585,9 @@ pre code {
.col-lg-push-1 {
left: 8.333333333333332%;
}
.col-lg-push-0 {
left: 0;
}
.col-lg-offset-12 {
margin-left: 100%;
}
@@ -1579,6 +1624,9 @@ pre code {
.col-lg-offset-1 {
margin-left: 8.333333333333332%;
}
.col-lg-offset-0 {
margin-left: 0;
}
}
table {
@@ -1677,84 +1725,75 @@ table th[class*="col-"] {
float: none;
}
.table > thead > tr > td.active,
.table > tbody > tr > td.active,
.table > tfoot > tr > td.active,
.table > thead > tr > th.active,
.table > tbody > tr > th.active,
.table > tfoot > tr > th.active,
.table > thead > tr.active > td,
.table > tbody > tr.active > td,
.table > tfoot > tr.active > td,
.table > thead > tr.active > th,
.table > tbody > tr.active > th,
.table > tfoot > tr.active > th {
.table > thead > tr > .active,
.table > tbody > tr > .active,
.table > tfoot > tr > .active,
.table > thead > .active > td,
.table > tbody > .active > td,
.table > tfoot > .active > td,
.table > thead > .active > th,
.table > tbody > .active > th,
.table > tfoot > .active > th {
background-color: #f5f5f5;
}
.table > thead > tr > td.success,
.table > tbody > tr > td.success,
.table > tfoot > tr > td.success,
.table > thead > tr > th.success,
.table > tbody > tr > th.success,
.table > tfoot > tr > th.success,
.table > thead > tr.success > td,
.table > tbody > tr.success > td,
.table > tfoot > tr.success > td,
.table > thead > tr.success > th,
.table > tbody > tr.success > th,
.table > tfoot > tr.success > th {
.table-hover > tbody > tr > .active:hover,
.table-hover > tbody > .active:hover > td,
.table-hover > tbody > .active:hover > th {
background-color: #e8e8e8;
}
.table > thead > tr > .success,
.table > tbody > tr > .success,
.table > tfoot > tr > .success,
.table > thead > .success > td,
.table > tbody > .success > td,
.table > tfoot > .success > td,
.table > thead > .success > th,
.table > tbody > .success > th,
.table > tfoot > .success > th {
background-color: #dff0d8;
}
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr.success:hover > th {
.table-hover > tbody > tr > .success:hover,
.table-hover > tbody > .success:hover > td,
.table-hover > tbody > .success:hover > th {
background-color: #d0e9c6;
}
.table > thead > tr > td.danger,
.table > tbody > tr > td.danger,
.table > tfoot > tr > td.danger,
.table > thead > tr > th.danger,
.table > tbody > tr > th.danger,
.table > tfoot > tr > th.danger,
.table > thead > tr.danger > td,
.table > tbody > tr.danger > td,
.table > tfoot > tr.danger > td,
.table > thead > tr.danger > th,
.table > tbody > tr.danger > th,
.table > tfoot > tr.danger > th {
.table > thead > tr > .danger,
.table > tbody > tr > .danger,
.table > tfoot > tr > .danger,
.table > thead > .danger > td,
.table > tbody > .danger > td,
.table > tfoot > .danger > td,
.table > thead > .danger > th,
.table > tbody > .danger > th,
.table > tfoot > .danger > th {
background-color: #f2dede;
}
.table-hover > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover,
.table-hover > tbody > tr.danger:hover > td,
.table-hover > tbody > tr.danger:hover > th {
.table-hover > tbody > tr > .danger:hover,
.table-hover > tbody > .danger:hover > td,
.table-hover > tbody > .danger:hover > th {
background-color: #ebcccc;
}
.table > thead > tr > td.warning,
.table > tbody > tr > td.warning,
.table > tfoot > tr > td.warning,
.table > thead > tr > th.warning,
.table > tbody > tr > th.warning,
.table > tfoot > tr > th.warning,
.table > thead > tr.warning > td,
.table > tbody > tr.warning > td,
.table > tfoot > tr.warning > td,
.table > thead > tr.warning > th,
.table > tbody > tr.warning > th,
.table > tfoot > tr.warning > th {
.table > thead > tr > .warning,
.table > tbody > tr > .warning,
.table > tfoot > tr > .warning,
.table > thead > .warning > td,
.table > tbody > .warning > td,
.table > tfoot > .warning > td,
.table > thead > .warning > th,
.table > tbody > .warning > th,
.table > tfoot > .warning > th {
background-color: #fcf8e3;
}
.table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover,
.table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr.warning:hover > th {
.table-hover > tbody > tr > .warning:hover,
.table-hover > tbody > .warning:hover > td,
.table-hover > tbody > .warning:hover > th {
background-color: #faf2cc;
}
@@ -1863,7 +1902,7 @@ select optgroup {
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
outline: thin dotted #333;
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -1882,22 +1921,6 @@ output {
vertical-align: middle;
}
.form-control:-moz-placeholder {
color: #999999;
}
.form-control::-moz-placeholder {
color: #999999;
}
.form-control:-ms-input-placeholder {
color: #999999;
}
.form-control::-webkit-input-placeholder {
color: #999999;
}
.form-control {
display: block;
width: 100%;
@@ -1924,6 +1947,23 @@ output {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
}
.form-control:-moz-placeholder {
color: #999999;
}
.form-control::-moz-placeholder {
color: #999999;
opacity: 1;
}
.form-control:-ms-input-placeholder {
color: #999999;
}
.form-control::-webkit-input-placeholder {
color: #999999;
}
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
@@ -2019,7 +2059,7 @@ textarea.input-sm {
}
.input-lg {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
@@ -2027,8 +2067,8 @@ textarea.input-sm {
}
select.input-lg {
height: 45px;
line-height: 45px;
height: 46px;
line-height: 46px;
}
textarea.input-lg {
@@ -2041,25 +2081,25 @@ textarea.input-lg {
.has-warning .checkbox,
.has-warning .radio-inline,
.has-warning .checkbox-inline {
color: #c09853;
color: #8a6d3b;
}
.has-warning .form-control {
border-color: #c09853;
border-color: #8a6d3b;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-warning .form-control:focus {
border-color: #a47e3c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
border-color: #66512c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
}
.has-warning .input-group-addon {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #c09853;
border-color: #8a6d3b;
}
.has-error .help-block,
@@ -2068,25 +2108,25 @@ textarea.input-lg {
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline {
color: #b94a48;
color: #a94442;
}
.has-error .form-control {
border-color: #b94a48;
border-color: #a94442;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-error .form-control:focus {
border-color: #953b39;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
border-color: #843534;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
}
.has-error .input-group-addon {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #b94a48;
border-color: #a94442;
}
.has-success .help-block,
@@ -2095,25 +2135,25 @@ textarea.input-lg {
.has-success .checkbox,
.has-success .radio-inline,
.has-success .checkbox-inline {
color: #468847;
color: #3c763d;
}
.has-success .form-control {
border-color: #468847;
border-color: #3c763d;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-success .form-control:focus {
border-color: #356635;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
border-color: #2b542c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
}
.has-success .input-group-addon {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #468847;
border-color: #3c763d;
}
.form-control-static {
@@ -2217,7 +2257,7 @@ textarea.input-lg {
}
.btn:focus {
outline: thin dotted #333;
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -3421,9 +3461,8 @@ input[type="button"].btn-block {
height: 0;
margin-left: 2px;
vertical-align: middle;
border-top: 4px solid #000000;
border-top: 4px solid;
border-right: 4px solid transparent;
border-bottom: 0 dotted;
border-left: 4px solid transparent;
}
@@ -3541,8 +3580,8 @@ input[type="button"].btn-block {
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0 dotted;
border-bottom: 4px solid #000000;
border-top: 0;
border-bottom: 4px solid;
content: "";
}
@@ -3560,30 +3599,6 @@ input[type="button"].btn-block {
}
}
.btn-default .caret {
border-top-color: #333333;
}
.btn-primary .caret,
.btn-success .caret,
.btn-warning .caret,
.btn-danger .caret,
.btn-info .caret {
border-top-color: #fff;
}
.dropup .btn-default .caret {
border-bottom-color: #333333;
}
.dropup .btn-primary .caret,
.dropup .btn-success .caret,
.dropup .btn-warning .caret,
.dropup .btn-danger .caret,
.dropup .btn-info .caret {
border-bottom-color: #fff;
}
.btn-group,
.btn-group-vertical {
position: relative;
@@ -3750,7 +3765,8 @@ input[type="button"].btn-block {
}
.btn-group-vertical > .btn,
.btn-group-vertical > .btn-group {
.btn-group-vertical > .btn-group,
.btn-group-vertical > .btn-group > .btn {
display: block;
float: none;
width: 100%;
@@ -3858,7 +3874,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
@@ -3868,8 +3884,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
height: 45px;
line-height: 45px;
height: 46px;
line-height: 46px;
}
textarea.input-group-lg > .form-control,
@@ -4063,13 +4079,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-color: #428bca;
}
.nav .open > a .caret,
.nav .open > a:hover .caret,
.nav .open > a:focus .caret {
border-top-color: #2a6496;
border-bottom-color: #2a6496;
}
.nav .nav-divider {
height: 1px;
margin: 9px 0;
@@ -4182,13 +4191,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #428bca;
}
.nav-pills > li.active > a .caret,
.nav-pills > li.active > a:hover .caret,
.nav-pills > li.active > a:focus .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
.nav-stacked > li {
float: none;
}
@@ -4261,16 +4263,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: block;
}
.nav .caret {
border-top-color: #428bca;
border-bottom-color: #428bca;
}
.nav a:hover .caret {
border-top-color: #2a6496;
border-bottom-color: #2a6496;
}
.nav-tabs .dropdown-menu {
margin-top: -1px;
border-top-right-radius: 0;
@@ -4473,6 +4465,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
margin-right: 15px;
margin-bottom: 8px;
background-color: transparent;
background-image: none;
border: 1px solid transparent;
border-radius: 4px;
}
@@ -4627,13 +4620,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-text {
float: left;
margin-top: 15px;
margin-bottom: 15px;
}
@media (min-width: 768px) {
.navbar-text {
float: left;
margin-right: 15px;
margin-left: 15px;
}
@@ -4700,12 +4693,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-color: #e7e7e7;
}
.navbar-default .navbar-nav > .dropdown > a:hover .caret,
.navbar-default .navbar-nav > .dropdown > a:focus .caret {
border-top-color: #333333;
border-bottom-color: #333333;
}
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus {
@@ -4713,18 +4700,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #e7e7e7;
}
.navbar-default .navbar-nav > .open > a .caret,
.navbar-default .navbar-nav > .open > a:hover .caret,
.navbar-default .navbar-nav > .open > a:focus .caret {
border-top-color: #555555;
border-bottom-color: #555555;
}
.navbar-default .navbar-nav > .dropdown > a .caret {
border-top-color: #777777;
border-bottom-color: #777777;
}
@media (max-width: 767px) {
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #777777;
@@ -4824,27 +4799,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #080808;
}
.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
.navbar-inverse .navbar-nav > .dropdown > a .caret {
border-top-color: #999999;
border-bottom-color: #999999;
}
.navbar-inverse .navbar-nav > .open > a .caret,
.navbar-inverse .navbar-nav > .open > a:hover .caret,
.navbar-inverse .navbar-nav > .open > a:focus .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
@media (max-width: 767px) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #080808;
}
.navbar-inverse .navbar-nav .open .dropdown-menu .divider {
background-color: #080808;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #999999;
}
@@ -5209,6 +5170,10 @@ a.list-group-item.active > .badge,
border-radius: 6px;
}
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 768px) {
.jumbotron {
padding-top: 48px;
@@ -5225,10 +5190,7 @@ a.list-group-item.active > .badge,
}
.thumbnail {
display: inline-block;
display: block;
height: auto;
max-width: 100%;
padding: 4px;
margin-bottom: 20px;
line-height: 1.428571429;
@@ -5295,7 +5257,7 @@ a.thumbnail.active {
}
.alert-success {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
@@ -5305,11 +5267,11 @@ a.thumbnail.active {
}
.alert-success .alert-link {
color: #356635;
color: #2b542c;
}
.alert-info {
color: #3a87ad;
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
@@ -5319,11 +5281,11 @@ a.thumbnail.active {
}
.alert-info .alert-link {
color: #2d6987;
color: #245269;
}
.alert-warning {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
@@ -5333,11 +5295,11 @@ a.thumbnail.active {
}
.alert-warning .alert-link {
color: #a47e3c;
color: #66512c;
}
.alert-danger {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
@@ -5347,7 +5309,7 @@ a.thumbnail.active {
}
.alert-danger .alert-link {
color: #953b39;
color: #843534;
}
@-webkit-keyframes progress-bar-stripes {
@@ -5359,24 +5321,6 @@ a.thumbnail.active {
}
}
@-moz-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
}
to {
background-position: 0 0;
}
}
@-o-keyframes progress-bar-stripes {
from {
background-position: 0 0;
}
to {
background-position: 40px 0;
}
}
@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
@@ -5637,7 +5581,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel > .table,
.panel > .table-responsive {
.panel > .table-responsive > .table {
margin-bottom: 0;
}
@@ -5646,6 +5590,11 @@ a.list-group-item.active:focus .list-group-item-text {
border-top: 1px solid #dddddd;
}
.panel > .table > tbody:first-child th,
.panel > .table > tbody:first-child td {
border-top: 0;
}
.panel > .table-bordered,
.panel > .table-responsive > .table-bordered {
border: 0;
@@ -5765,10 +5714,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #dddddd;
}
.panel-default > .panel-heading > .dropdown .caret {
border-color: #333333 transparent;
}
.panel-default > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #dddddd;
}
@@ -5787,10 +5732,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #428bca;
}
.panel-primary > .panel-heading > .dropdown .caret {
border-color: #ffffff transparent;
}
.panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca;
}
@@ -5800,7 +5741,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-success > .panel-heading {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
@@ -5809,10 +5750,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #d6e9c6;
}
.panel-success > .panel-heading > .dropdown .caret {
border-color: #468847 transparent;
}
.panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6;
}
@@ -5822,7 +5759,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-warning > .panel-heading {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
@@ -5831,10 +5768,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #faebcc;
}
.panel-warning > .panel-heading > .dropdown .caret {
border-color: #c09853 transparent;
}
.panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #faebcc;
}
@@ -5844,7 +5777,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-danger > .panel-heading {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
@@ -5853,10 +5786,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #ebccd1;
}
.panel-danger > .panel-heading > .dropdown .caret {
border-color: #b94a48 transparent;
}
.panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #ebccd1;
}
@@ -5866,7 +5795,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-info > .panel-heading {
color: #3a87ad;
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
@@ -5875,10 +5804,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #bce8f1;
}
.panel-info > .panel-heading > .dropdown .caret {
border-color: #3a87ad transparent;
}
.panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1;
}
@@ -5973,7 +5898,7 @@ button.close {
position: relative;
z-index: 1050;
width: auto;
padding: 10px;
margin: 10px;
margin-right: auto;
margin-left: auto;
}
@@ -6073,8 +5998,8 @@ button.close {
@media screen and (min-width: 768px) {
.modal-dialog {
width: 600px;
padding-top: 30px;
padding-bottom: 30px;
margin-top: 30px;
margin-bottom: 30px;
}
.modal-content {
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
@@ -6434,6 +6359,7 @@ button.close {
.carousel-control:focus {
color: #ffffff;
text-decoration: none;
outline: none;
opacity: 0.9;
filter: alpha(opacity=90);
}
+2 -4
View File
File diff suppressed because one or more lines are too long
+43 -39
View File
@@ -1,15 +1,13 @@
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
/* ========================================================================
* Bootstrap: transition.js v3.0.0
* Bootstrap: transition.js v3.0.2
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -63,10 +61,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$.support.transition = transitionEnd()
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: alert.js v3.0.0
* Bootstrap: alert.js v3.0.2
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -162,10 +160,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: button.js v3.0.0
* Bootstrap: button.js v3.0.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -220,15 +218,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
Button.prototype.toggle = function () {
var $parent = this.$element.closest('[data-toggle="buttons"]')
var changed = true
if ($parent.length) {
var $input = this.$element.find('input')
.prop('checked', !this.$element.hasClass('active'))
.trigger('change')
if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
if ($input.prop('type') === 'radio') {
// see if clicking on current one
if ($input.prop('checked') && this.$element.hasClass('active'))
changed = false
else
$parent.find('.active').removeClass('active')
}
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
}
this.$element.toggleClass('active')
if (changed) this.$element.toggleClass('active')
}
@@ -272,10 +276,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
e.preventDefault()
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: carousel.js v3.0.0
* Bootstrap: carousel.js v3.0.2
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -345,7 +349,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (pos > (this.$items.length - 1) || pos < 0) return
if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
if (activeIndex == pos) return this.pause().cycle()
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -397,7 +401,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (this.$indicators.length) {
this.$indicators.find('.active').removeClass('active')
this.$element.one('slid', function () {
this.$element.one('slid.bs.carousel', function () {
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
$nextIndicator && $nextIndicator.addClass('active')
})
@@ -415,7 +419,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
})
.emulateTransitionEnd(600)
} else {
@@ -424,7 +428,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
this.$element.trigger('slid.bs.carousel')
}
isCycling && this.cycle()
@@ -490,10 +494,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
})
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: collapse.js v3.0.0
* Bootstrap: collapse.js v3.0.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -670,10 +674,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$target.collapse(option)
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: dropdown.js v3.0.0
* Bootstrap: dropdown.js v3.0.2
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -715,7 +719,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (!isActive) {
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
// if mobile we we use a backdrop because click events don't delegate
// if mobile we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
}
@@ -797,9 +801,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('dropdown')
var data = $this.data('bs.dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this)
})
}
@@ -825,10 +829,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: modal.js v3.0.0
* Bootstrap: modal.js v3.0.2
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1072,10 +1076,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.0.0
* Bootstrap: tooltip.js v3.0.2
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@@ -1459,10 +1463,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
return this
}
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: popover.js v3.0.0
* Bootstrap: popover.js v3.0.2
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1577,10 +1581,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
return this
}
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: scrollspy.js v3.0.0
* Bootstrap: scrollspy.js v3.0.2
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1694,7 +1698,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.addClass('active')
}
active.trigger('activate')
active.trigger('activate.bs.scrollspy')
}
@@ -1736,10 +1740,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
})
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: tab.js v3.0.0
* Bootstrap: tab.js v3.0.2
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1872,10 +1876,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$(this).tab('show')
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: affix.js v3.0.0
* Bootstrap: affix.js v3.0.2
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1999,4 +2003,4 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
})
})
}(window.jQuery);
}(jQuery);
+2 -4
View File
File diff suppressed because one or more lines are too long