提交 ed56daaf 编写于 作者: A Abdullah Almsaeed

Merge pull request #337 from gabel/bootstrap-3.3.4

Updated bootstrap to 3.3.4
/*! /*!
* Bootstrap v3.3.2 (http://getbootstrap.com) * Bootstrap v3.3.4 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
...@@ -958,12 +958,24 @@ th { ...@@ -958,12 +958,24 @@ th {
.glyphicon-bitcoin:before { .glyphicon-bitcoin:before {
content: "\e227"; content: "\e227";
} }
.glyphicon-btc:before {
content: "\e227";
}
.glyphicon-xbt:before {
content: "\e227";
}
.glyphicon-yen:before { .glyphicon-yen:before {
content: "\00a5"; content: "\00a5";
} }
.glyphicon-jpy:before {
content: "\00a5";
}
.glyphicon-ruble:before { .glyphicon-ruble:before {
content: "\20bd"; content: "\20bd";
} }
.glyphicon-rub:before {
content: "\20bd";
}
.glyphicon-scale:before { .glyphicon-scale:before {
content: "\e230"; content: "\e230";
} }
...@@ -1161,6 +1173,9 @@ hr { ...@@ -1161,6 +1173,9 @@ hr {
overflow: visible; overflow: visible;
clip: auto; clip: auto;
} }
[role="button"] {
cursor: pointer;
}
h1, h1,
h2, h2,
h3, h3,
...@@ -2564,10 +2579,13 @@ output { ...@@ -2564,10 +2579,13 @@ output {
.form-control[disabled], .form-control[disabled],
.form-control[readonly], .form-control[readonly],
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
cursor: not-allowed;
background-color: #eee; background-color: #eee;
opacity: 1; opacity: 1;
} }
.form-control[disabled],
fieldset[disabled] .form-control {
cursor: not-allowed;
}
textarea.form-control { textarea.form-control {
height: auto; height: auto;
} }
...@@ -2634,6 +2652,7 @@ input[type="search"] { ...@@ -2634,6 +2652,7 @@ input[type="search"] {
} }
.radio-inline, .radio-inline,
.checkbox-inline { .checkbox-inline {
position: relative;
display: inline-block; display: inline-block;
padding-left: 20px; padding-left: 20px;
margin-bottom: 0; margin-bottom: 0;
...@@ -2667,6 +2686,7 @@ fieldset[disabled] .checkbox label { ...@@ -2667,6 +2686,7 @@ fieldset[disabled] .checkbox label {
cursor: not-allowed; cursor: not-allowed;
} }
.form-control-static { .form-control-static {
min-height: 34px;
padding-top: 7px; padding-top: 7px;
padding-bottom: 7px; padding-bottom: 7px;
margin-bottom: 0; margin-bottom: 0;
...@@ -2708,6 +2728,7 @@ select[multiple].form-group-sm .form-control { ...@@ -2708,6 +2728,7 @@ select[multiple].form-group-sm .form-control {
} }
.form-group-sm .form-control-static { .form-group-sm .form-control-static {
height: 30px; height: 30px;
min-height: 32px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
...@@ -2744,6 +2765,7 @@ select[multiple].form-group-lg .form-control { ...@@ -2744,6 +2765,7 @@ select[multiple].form-group-lg .form-control {
} }
.form-group-lg .form-control-static { .form-group-lg .form-control-static {
height: 46px; height: 46px;
min-height: 38px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.3333333; line-height: 1.3333333;
...@@ -3365,11 +3387,9 @@ input[type="button"].btn-block { ...@@ -3365,11 +3387,9 @@ input[type="button"].btn-block {
} }
.collapse { .collapse {
display: none; display: none;
visibility: hidden;
} }
.collapse.in { .collapse.in {
display: block; display: block;
visibility: visible;
} }
tr.collapse.in { tr.collapse.in {
display: table-row; display: table-row;
...@@ -3397,7 +3417,7 @@ tbody.collapse.in { ...@@ -3397,7 +3417,7 @@ tbody.collapse.in {
height: 0; height: 0;
margin-left: 2px; margin-left: 2px;
vertical-align: middle; vertical-align: middle;
border-top: 4px solid; border-top: 4px dashed;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-left: 4px solid transparent; border-left: 4px solid transparent;
} }
...@@ -4037,11 +4057,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4037,11 +4057,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.tab-content > .tab-pane { .tab-content > .tab-pane {
display: none; display: none;
visibility: hidden;
} }
.tab-content > .active { .tab-content > .active {
display: block; display: block;
visibility: visible;
} }
.nav-tabs .dropdown-menu { .nav-tabs .dropdown-menu {
margin-top: -1px; margin-top: -1px;
...@@ -4088,7 +4106,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4088,7 +4106,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
height: auto !important; height: auto !important;
padding-bottom: 0; padding-bottom: 0;
overflow: visible !important; overflow: visible !important;
visibility: visible !important;
} }
.navbar-collapse.in { .navbar-collapse.in {
overflow-y: visible; overflow-y: visible;
...@@ -4813,7 +4830,8 @@ a.label:focus { ...@@ -4813,7 +4830,8 @@ a.label:focus {
position: relative; position: relative;
top: -1px; top: -1px;
} }
.btn-xs .badge { .btn-xs .badge,
.btn-group-xs > .btn .badge {
top: 0; top: 0;
padding: 1px 5px; padding: 1px 5px;
} }
...@@ -5645,10 +5663,10 @@ a.list-group-item-danger.active:focus { ...@@ -5645,10 +5663,10 @@ a.list-group-item-danger.active:focus {
height: 100%; height: 100%;
border: 0; border: 0;
} }
.embed-responsive.embed-responsive-16by9 { .embed-responsive-16by9 {
padding-bottom: 56.25%; padding-bottom: 56.25%;
} }
.embed-responsive.embed-responsive-4by3 { .embed-responsive-4by3 {
padding-bottom: 75%; padding-bottom: 75%;
} }
.well { .well {
...@@ -5707,7 +5725,7 @@ button.close { ...@@ -5707,7 +5725,7 @@ button.close {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1040; z-index: 1050;
display: none; display: none;
overflow: hidden; overflow: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
...@@ -5750,10 +5768,12 @@ button.close { ...@@ -5750,10 +5768,12 @@ button.close {
box-shadow: 0 3px 9px rgba(0, 0, 0, .5); box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
} }
.modal-backdrop { .modal-backdrop {
position: absolute; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0;
left: 0; left: 0;
z-index: 1040;
background-color: #000; background-color: #000;
} }
.modal-backdrop.fade { .modal-backdrop.fade {
...@@ -5828,7 +5848,6 @@ button.close { ...@@ -5828,7 +5848,6 @@ button.close {
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
line-height: 1.4; line-height: 1.4;
visibility: visible;
filter: alpha(opacity=0); filter: alpha(opacity=0);
opacity: 0; opacity: 0;
} }
...@@ -6348,7 +6367,6 @@ button.close { ...@@ -6348,7 +6367,6 @@ button.close {
} }
.hidden { .hidden {
display: none !important; display: none !important;
visibility: hidden !important;
} }
.affix { .affix {
position: fixed; position: fixed;
......
此差异已折叠。
因为 它太大了无法显示 source diff 。你可以改为 查看blob
此差异已折叠。
此差异已折叠。
// Progress bars // Progress bars
.progress-bar-variant(@color) { .progress-bar-variant(@color) {
background-color: @color; background-color: @color;
......
...@@ -207,6 +207,9 @@ ...@@ -207,6 +207,9 @@
//** Small `.form-control` height //** Small `.form-control` height
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
//** `.form-group` margin
@form-group-margin-bottom: 15px;
@legend-color: @gray-dark; @legend-color: @gray-dark;
@legend-border-color: #e5e5e5; @legend-border-color: #e5e5e5;
...@@ -266,7 +269,8 @@ ...@@ -266,7 +269,8 @@
@zindex-popover: 1060; @zindex-popover: 1060;
@zindex-tooltip: 1070; @zindex-tooltip: 1070;
@zindex-navbar-fixed: 1030; @zindex-navbar-fixed: 1030;
@zindex-modal: 1040; @zindex-modal-background: 1040;
@zindex-modal: 1050;
//== Media queries breakpoints //== Media queries breakpoints
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册