Merge pull request #143 from polyphenolic/update-bootstrap-3.3.4
Bootstrap update
This commit is contained in:
commit
96b882f75a
48
css/bootstrap.css
vendored
48
css/bootstrap.css
vendored
|
@ -1,5 +1,5 @@
|
|||
/*!
|
||||
* Bootstrap v3.3.2 (http://getbootstrap.com)
|
||||
* Bootstrap v3.3.4 (http://getbootstrap.com)
|
||||
* Copyright 2011-2015 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
*/
|
||||
|
@ -958,12 +958,24 @@ th {
|
|||
.glyphicon-bitcoin:before {
|
||||
content: "\e227";
|
||||
}
|
||||
.glyphicon-btc:before {
|
||||
content: "\e227";
|
||||
}
|
||||
.glyphicon-xbt:before {
|
||||
content: "\e227";
|
||||
}
|
||||
.glyphicon-yen:before {
|
||||
content: "\00a5";
|
||||
}
|
||||
.glyphicon-jpy:before {
|
||||
content: "\00a5";
|
||||
}
|
||||
.glyphicon-ruble:before {
|
||||
content: "\20bd";
|
||||
}
|
||||
.glyphicon-rub:before {
|
||||
content: "\20bd";
|
||||
}
|
||||
.glyphicon-scale:before {
|
||||
content: "\e230";
|
||||
}
|
||||
|
@ -1161,6 +1173,9 @@ hr {
|
|||
overflow: visible;
|
||||
clip: auto;
|
||||
}
|
||||
[role="button"] {
|
||||
cursor: pointer;
|
||||
}
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
|
@ -2564,10 +2579,13 @@ output {
|
|||
.form-control[disabled],
|
||||
.form-control[readonly],
|
||||
fieldset[disabled] .form-control {
|
||||
cursor: not-allowed;
|
||||
background-color: #eee;
|
||||
opacity: 1;
|
||||
}
|
||||
.form-control[disabled],
|
||||
fieldset[disabled] .form-control {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
textarea.form-control {
|
||||
height: auto;
|
||||
}
|
||||
|
@ -2634,6 +2652,7 @@ input[type="search"] {
|
|||
}
|
||||
.radio-inline,
|
||||
.checkbox-inline {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
padding-left: 20px;
|
||||
margin-bottom: 0;
|
||||
|
@ -2667,6 +2686,7 @@ fieldset[disabled] .checkbox label {
|
|||
cursor: not-allowed;
|
||||
}
|
||||
.form-control-static {
|
||||
min-height: 34px;
|
||||
padding-top: 7px;
|
||||
padding-bottom: 7px;
|
||||
margin-bottom: 0;
|
||||
|
@ -2708,6 +2728,7 @@ select[multiple].form-group-sm .form-control {
|
|||
}
|
||||
.form-group-sm .form-control-static {
|
||||
height: 30px;
|
||||
min-height: 32px;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
|
@ -2744,6 +2765,7 @@ select[multiple].form-group-lg .form-control {
|
|||
}
|
||||
.form-group-lg .form-control-static {
|
||||
height: 46px;
|
||||
min-height: 38px;
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.3333333;
|
||||
|
@ -3365,11 +3387,9 @@ input[type="button"].btn-block {
|
|||
}
|
||||
.collapse {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
.collapse.in {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
}
|
||||
tr.collapse.in {
|
||||
display: table-row;
|
||||
|
@ -3397,7 +3417,7 @@ tbody.collapse.in {
|
|||
height: 0;
|
||||
margin-left: 2px;
|
||||
vertical-align: middle;
|
||||
border-top: 4px solid;
|
||||
border-top: 4px dashed;
|
||||
border-right: 4px solid transparent;
|
||||
border-left: 4px solid transparent;
|
||||
}
|
||||
|
@ -4037,11 +4057,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
|||
}
|
||||
.tab-content > .tab-pane {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
.tab-content > .active {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
}
|
||||
.nav-tabs .dropdown-menu {
|
||||
margin-top: -1px;
|
||||
|
@ -4088,7 +4106,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
|||
height: auto !important;
|
||||
padding-bottom: 0;
|
||||
overflow: visible !important;
|
||||
visibility: visible !important;
|
||||
}
|
||||
.navbar-collapse.in {
|
||||
overflow-y: visible;
|
||||
|
@ -4813,7 +4830,8 @@ a.label:focus {
|
|||
position: relative;
|
||||
top: -1px;
|
||||
}
|
||||
.btn-xs .badge {
|
||||
.btn-xs .badge,
|
||||
.btn-group-xs > .btn .badge {
|
||||
top: 0;
|
||||
padding: 1px 5px;
|
||||
}
|
||||
|
@ -5645,10 +5663,10 @@ a.list-group-item-danger.active:focus {
|
|||
height: 100%;
|
||||
border: 0;
|
||||
}
|
||||
.embed-responsive.embed-responsive-16by9 {
|
||||
.embed-responsive-16by9 {
|
||||
padding-bottom: 56.25%;
|
||||
}
|
||||
.embed-responsive.embed-responsive-4by3 {
|
||||
.embed-responsive-4by3 {
|
||||
padding-bottom: 75%;
|
||||
}
|
||||
.well {
|
||||
|
@ -5707,7 +5725,7 @@ button.close {
|
|||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 1040;
|
||||
z-index: 1050;
|
||||
display: none;
|
||||
overflow: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
|
@ -5750,10 +5768,12 @@ button.close {
|
|||
box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
|
||||
}
|
||||
.modal-backdrop {
|
||||
position: absolute;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 1040;
|
||||
background-color: #000;
|
||||
}
|
||||
.modal-backdrop.fade {
|
||||
|
@ -5828,7 +5848,6 @@ button.close {
|
|||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
line-height: 1.4;
|
||||
visibility: visible;
|
||||
filter: alpha(opacity=0);
|
||||
opacity: 0;
|
||||
}
|
||||
|
@ -6348,7 +6367,6 @@ button.close {
|
|||
}
|
||||
.hidden {
|
||||
display: none !important;
|
||||
visibility: hidden !important;
|
||||
}
|
||||
.affix {
|
||||
position: fixed;
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
.modal-backdrop {
|
||||
bottom: 0; /* for some reason this is missing from bootstrap.css */
|
||||
}
|
||||
|
||||
.modal-body textarea {
|
||||
width: 100%;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
body {
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
input[type=checkbox], input[type=radio] {
|
||||
vertical-align: middle;
|
||||
|
|
1435
js/libs/angularui-bootstrap.js
vendored
1435
js/libs/angularui-bootstrap.js
vendored
File diff suppressed because it is too large
Load Diff
2306
js/libs/bootstrap.js
vendored
2306
js/libs/bootstrap.js
vendored
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user