Skip to content

Commit

Permalink
mod_bootstrap: update to v3.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurClemens committed Apr 15, 2015
1 parent 96c2972 commit 15d092e
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 126 deletions.
4 changes: 1 addition & 3 deletions modules/mod_base_site/templates/tablet/base.tpl
Expand Up @@ -13,9 +13,7 @@

{% all include "_html_head.tpl" %}
{% lib
"bootstrap/css/bootstrap.css"
%}
{% lib
"bootstrap/css/bootstrap.min.css"
"bootstrap/css/bootstrap-base-site.css"
"css/jquery.loadmask.css"
"css/z.icons.css"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

54 changes: 36 additions & 18 deletions modules/mod_bootstrap/lib/bootstrap/css/bootstrap.css
@@ -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)
*/
Expand Down Expand Up @@ -267,8 +267,8 @@ th {
@font-face {
font-family: 'Glyphicons Halflings';

src: url('../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
src: url('/lib/bootstrap/fonts/glyphicons-halflings-regular.eot');
src: url('/lib/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('/lib/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('/lib/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
.glyphicon {
position: relative;
Expand Down Expand Up @@ -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";
}
Expand Down Expand Up @@ -1161,6 +1173,9 @@ hr {
overflow: visible;
clip: auto;
}
[role="button"] {
cursor: pointer;
}
h1,
h2,
h3,
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -2634,6 +2652,7 @@ input[type="search"] {
}
.radio-inline,
.checkbox-inline {
position: relative;
display: inline-block;
padding-left: 20px;
margin-bottom: 0;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -5828,7 +5848,6 @@ button.close {
font-size: 12px;
font-weight: normal;
line-height: 1.4;
visibility: visible;
filter: alpha(opacity=0);
opacity: 0;
}
Expand Down Expand Up @@ -6348,7 +6367,6 @@ button.close {
}
.hidden {
display: none !important;
visibility: hidden !important;
}
.affix {
position: fixed;
Expand Down Expand Up @@ -6563,4 +6581,4 @@ button.close {
display: none !important;
}
}
/*# sourceMappingURL=bootstrap.css.map */
/* sourceMappingURL=bootstrap.css.map */
2 changes: 1 addition & 1 deletion modules/mod_bootstrap/lib/bootstrap/css/bootstrap.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/mod_bootstrap/lib/bootstrap/css/bootstrap.min.css

Large diffs are not rendered by default.

0 comments on commit 15d092e

Please sign in to comment.