iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update bootstrap to 3.3.6

This commit is contained in:
Philip Häusler 2015-12-12 19:15:44 +01:00
parent d68c91be18
commit 1b4afa0c71
4 changed files with 94 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
public/css/theme0.css
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (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)
*/ */
@ -269,10 +269,10 @@ th {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.glyphicon-asterisk:before { .glyphicon-asterisk:before {
content: "\2a"; content: "\002a";
} }
.glyphicon-plus:before { .glyphicon-plus:before {
content: "\2b"; content: "\002b";
} }
.glyphicon-euro:before, .glyphicon-euro:before,
.glyphicon-eur:before { .glyphicon-eur:before {
@ -2569,6 +2569,10 @@ output {
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: #999999; color: #999999;
} }
.form-control::-ms-expand {
border: 0;
background-color: transparent;
}
.form-control[disabled], .form-control[disabled],
.form-control[readonly], .form-control[readonly],
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
@ -2975,7 +2979,7 @@ select[multiple].input-lg {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 14.333333px; padding-top: 11px;
font-size: 18px; font-size: 18px;
} }
} }
@ -3082,9 +3086,6 @@ fieldset[disabled] a.btn {
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
background-image: none; background-image: none;
} }
.btn-default.disabled,
.btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover, .btn-default.disabled:hover,
.btn-default[disabled]:hover, .btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:hover,
@ -3093,13 +3094,7 @@ fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus, .btn-default.disabled.focus,
.btn-default[disabled].focus, .btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default.focus {
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #ffffff; background-color: #ffffff;
border-color: #cccccc; border-color: #cccccc;
} }
@ -3148,9 +3143,6 @@ fieldset[disabled] .btn-default.active {
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
background-image: none; background-image: none;
} }
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover, .btn-primary.disabled:hover,
.btn-primary[disabled]:hover, .btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:hover,
@ -3159,13 +3151,7 @@ fieldset[disabled] .btn-primary:hover,
fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus, .btn-primary.disabled.focus,
.btn-primary[disabled].focus, .btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary.focus {
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #337ab7; background-color: #337ab7;
border-color: #2e6da4; border-color: #2e6da4;
} }
@ -3214,9 +3200,6 @@ fieldset[disabled] .btn-primary.active {
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
background-image: none; background-image: none;
} }
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover, .btn-success.disabled:hover,
.btn-success[disabled]:hover, .btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:hover,
@ -3225,13 +3208,7 @@ fieldset[disabled] .btn-success:hover,
fieldset[disabled] .btn-success:focus, fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus, .btn-success.disabled.focus,
.btn-success[disabled].focus, .btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus, fieldset[disabled] .btn-success.focus {
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #4cae4c; border-color: #4cae4c;
} }
@ -3280,9 +3257,6 @@ fieldset[disabled] .btn-success.active {
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
background-image: none; background-image: none;
} }
.btn-info.disabled,
.btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover, .btn-info.disabled:hover,
.btn-info[disabled]:hover, .btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:hover,
@ -3291,13 +3265,7 @@ fieldset[disabled] .btn-info:hover,
fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus, .btn-info.disabled.focus,
.btn-info[disabled].focus, .btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus, fieldset[disabled] .btn-info.focus {
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #46b8da; border-color: #46b8da;
} }
@ -3346,9 +3314,6 @@ fieldset[disabled] .btn-info.active {
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
background-image: none; background-image: none;
} }
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover, .btn-warning.disabled:hover,
.btn-warning[disabled]:hover, .btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:hover,
@ -3357,13 +3322,7 @@ fieldset[disabled] .btn-warning:hover,
fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus, .btn-warning.disabled.focus,
.btn-warning[disabled].focus, .btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus, fieldset[disabled] .btn-warning.focus {
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #eea236; border-color: #eea236;
} }
@ -3412,9 +3371,6 @@ fieldset[disabled] .btn-warning.active {
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
background-image: none; background-image: none;
} }
.btn-danger.disabled,
.btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover, .btn-danger.disabled:hover,
.btn-danger[disabled]:hover, .btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:hover,
@ -3423,13 +3379,7 @@ fieldset[disabled] .btn-danger:hover,
fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus, .btn-danger.disabled.focus,
.btn-danger[disabled].focus, .btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus, fieldset[disabled] .btn-danger.focus {
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #d9534f; background-color: #d9534f;
border-color: #d43f3a; border-color: #d43f3a;
} }
@ -3800,13 +3750,15 @@ tbody.collapse.in {
} }
.btn-group-vertical > .btn:first-child:not(:last-child) { .btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-top-left-radius: 4px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.btn-group-vertical > .btn:last-child:not(:first-child) { .btn-group-vertical > .btn:last-child:not(:first-child) {
border-bottom-left-radius: 4px;
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
@ -3863,6 +3815,9 @@ tbody.collapse.in {
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
} }
.input-group .form-control:focus {
z-index: 3;
}
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
@ -4771,7 +4726,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover, .pagination > li > span:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus { .pagination > li > span:focus {
z-index: 3; z-index: 2;
color: #23527c; color: #23527c;
background-color: #eeeeee; background-color: #eeeeee;
border-color: #dddddd; border-color: #dddddd;
@ -4782,7 +4737,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:hover, .pagination > .active > span:hover,
.pagination > .active > a:focus, .pagination > .active > a:focus,
.pagination > .active > span:focus { .pagination > .active > span:focus {
z-index: 2; z-index: 3;
color: #ffffff; color: #ffffff;
background-color: #337ab7; background-color: #337ab7;
border-color: #337ab7; border-color: #337ab7;
@ -5004,6 +4959,8 @@ a.badge:focus {
.container .jumbotron, .container .jumbotron,
.container-fluid .jumbotron { .container-fluid .jumbotron {
border-radius: 6px; border-radius: 6px;
padding-left: 15px;
padding-right: 15px;
} }
.jumbotron .container { .jumbotron .container {
max-width: 100%; max-width: 100%;
@ -5950,7 +5907,6 @@ button.close {
.modal-header { .modal-header {
padding: 15px; padding: 15px;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
min-height: 16.42857143px;
} }
.modal-header .close { .modal-header .close {
margin-top: -2px; margin-top: -2px;
@ -6342,6 +6298,7 @@ button.close {
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
background-color: rgba(0, 0, 0, 0);
} }
.carousel-control.left { .carousel-control.left {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
@ -6451,16 +6408,16 @@ button.close {
.carousel-control .icon-next { .carousel-control .icon-next {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-top: -15px; margin-top: -10px;
font-size: 30px; font-size: 30px;
} }
.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-left,
.carousel-control .icon-prev { .carousel-control .icon-prev {
margin-left: -15px; margin-left: -10px;
} }
.carousel-control .glyphicon-chevron-right, .carousel-control .glyphicon-chevron-right,
.carousel-control .icon-next { .carousel-control .icon-next {
margin-right: -15px; margin-right: -10px;
} }
.carousel-caption { .carousel-caption {
left: 20%; left: 20%;
@ -6499,6 +6456,8 @@ button.close {
.pager:after, .pager:after,
.panel-body:before, .panel-body:before,
.panel-body:after, .panel-body:after,
.modal-header:before,
.modal-header:after,
.modal-footer:before, .modal-footer:before,
.modal-footer:after { .modal-footer:after {
content: " "; content: " ";
@ -6518,6 +6477,7 @@ button.close {
.navbar-collapse:after, .navbar-collapse:after,
.pager:after, .pager:after,
.panel-body:after, .panel-body:after,
.modal-header:after,
.modal-footer:after { .modal-footer:after {
clear: both; clear: both;
} }

102
public/css/theme1.css
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (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)
*/ */
@ -292,10 +292,10 @@ th {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.glyphicon-asterisk:before { .glyphicon-asterisk:before {
content: "\2a"; content: "\002a";
} }
.glyphicon-plus:before { .glyphicon-plus:before {
content: "\2b"; content: "\002b";
} }
.glyphicon-euro:before, .glyphicon-euro:before,
.glyphicon-eur:before { .glyphicon-eur:before {
@ -2592,6 +2592,10 @@ output {
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: #888888; color: #888888;
} }
.form-control::-ms-expand {
border: 0;
background-color: transparent;
}
.form-control[disabled], .form-control[disabled],
.form-control[readonly], .form-control[readonly],
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
@ -2998,7 +3002,7 @@ select[multiple].input-lg {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 19.62px; padding-top: 15px;
font-size: 18px; font-size: 18px;
} }
} }
@ -3105,9 +3109,6 @@ fieldset[disabled] a.btn {
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
background-image: none; background-image: none;
} }
.btn-default.disabled,
.btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover, .btn-default.disabled:hover,
.btn-default[disabled]:hover, .btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:hover,
@ -3116,13 +3117,7 @@ fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus, .btn-default.disabled.focus,
.btn-default[disabled].focus, .btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default.focus {
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #424242; background-color: #424242;
border-color: #282828; border-color: #282828;
} }
@ -3171,9 +3166,6 @@ fieldset[disabled] .btn-default.active {
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
background-image: none; background-image: none;
} }
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover, .btn-primary.disabled:hover,
.btn-primary[disabled]:hover, .btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:hover,
@ -3182,13 +3174,7 @@ fieldset[disabled] .btn-primary:hover,
fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus, .btn-primary.disabled.focus,
.btn-primary[disabled].focus, .btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary.focus {
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #428bca; background-color: #428bca;
border-color: #282828; border-color: #282828;
} }
@ -3237,9 +3223,6 @@ fieldset[disabled] .btn-primary.active {
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
background-image: none; background-image: none;
} }
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover, .btn-success.disabled:hover,
.btn-success[disabled]:hover, .btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:hover,
@ -3248,13 +3231,7 @@ fieldset[disabled] .btn-success:hover,
fieldset[disabled] .btn-success:focus, fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus, .btn-success.disabled.focus,
.btn-success[disabled].focus, .btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus, fieldset[disabled] .btn-success.focus {
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #282828; border-color: #282828;
} }
@ -3303,9 +3280,6 @@ fieldset[disabled] .btn-success.active {
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
background-image: none; background-image: none;
} }
.btn-info.disabled,
.btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover, .btn-info.disabled:hover,
.btn-info[disabled]:hover, .btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:hover,
@ -3314,13 +3288,7 @@ fieldset[disabled] .btn-info:hover,
fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus, .btn-info.disabled.focus,
.btn-info[disabled].focus, .btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus, fieldset[disabled] .btn-info.focus {
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #282828; border-color: #282828;
} }
@ -3369,9 +3337,6 @@ fieldset[disabled] .btn-info.active {
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
background-image: none; background-image: none;
} }
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover, .btn-warning.disabled:hover,
.btn-warning[disabled]:hover, .btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:hover,
@ -3380,13 +3345,7 @@ fieldset[disabled] .btn-warning:hover,
fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus, .btn-warning.disabled.focus,
.btn-warning[disabled].focus, .btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus, fieldset[disabled] .btn-warning.focus {
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #282828; border-color: #282828;
} }
@ -3435,9 +3394,6 @@ fieldset[disabled] .btn-warning.active {
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
background-image: none; background-image: none;
} }
.btn-danger.disabled,
.btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover, .btn-danger.disabled:hover,
.btn-danger[disabled]:hover, .btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:hover,
@ -3446,13 +3402,7 @@ fieldset[disabled] .btn-danger:hover,
fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus, .btn-danger.disabled.focus,
.btn-danger[disabled].focus, .btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus, fieldset[disabled] .btn-danger.focus {
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #d9534f; background-color: #d9534f;
border-color: #282828; border-color: #282828;
} }
@ -3823,13 +3773,15 @@ tbody.collapse.in {
} }
.btn-group-vertical > .btn:first-child:not(:last-child) { .btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-top-left-radius: 4px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.btn-group-vertical > .btn:last-child:not(:first-child) { .btn-group-vertical > .btn:last-child:not(:first-child) {
border-bottom-left-radius: 4px;
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
@ -3886,6 +3838,9 @@ tbody.collapse.in {
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
} }
.input-group .form-control:focus {
z-index: 3;
}
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
@ -4794,7 +4749,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover, .pagination > li > span:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus { .pagination > li > span:focus {
z-index: 3; z-index: 2;
color: #ffffff; color: #ffffff;
background-color: #428bca; background-color: #428bca;
border-color: transparent; border-color: transparent;
@ -4805,7 +4760,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:hover, .pagination > .active > span:hover,
.pagination > .active > a:focus, .pagination > .active > a:focus,
.pagination > .active > span:focus { .pagination > .active > span:focus {
z-index: 2; z-index: 3;
color: #ffffff; color: #ffffff;
background-color: #428bca; background-color: #428bca;
border-color: transparent; border-color: transparent;
@ -5027,6 +4982,8 @@ a.badge:focus {
.container .jumbotron, .container .jumbotron,
.container-fluid .jumbotron { .container-fluid .jumbotron {
border-radius: 6px; border-radius: 6px;
padding-left: 15px;
padding-right: 15px;
} }
.jumbotron .container { .jumbotron .container {
max-width: 100%; max-width: 100%;
@ -5973,7 +5930,6 @@ button.close {
.modal-header { .modal-header {
padding: 15px; padding: 15px;
border-bottom: 1px solid #282828; border-bottom: 1px solid #282828;
min-height: 16.42857143px;
} }
.modal-header .close { .modal-header .close {
margin-top: -2px; margin-top: -2px;
@ -6365,6 +6321,7 @@ button.close {
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
background-color: rgba(0, 0, 0, 0);
} }
.carousel-control.left { .carousel-control.left {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
@ -6474,16 +6431,16 @@ button.close {
.carousel-control .icon-next { .carousel-control .icon-next {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-top: -15px; margin-top: -10px;
font-size: 30px; font-size: 30px;
} }
.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-left,
.carousel-control .icon-prev { .carousel-control .icon-prev {
margin-left: -15px; margin-left: -10px;
} }
.carousel-control .glyphicon-chevron-right, .carousel-control .glyphicon-chevron-right,
.carousel-control .icon-next { .carousel-control .icon-next {
margin-right: -15px; margin-right: -10px;
} }
.carousel-caption { .carousel-caption {
left: 20%; left: 20%;
@ -6522,6 +6479,8 @@ button.close {
.pager:after, .pager:after,
.panel-body:before, .panel-body:before,
.panel-body:after, .panel-body:after,
.modal-header:before,
.modal-header:after,
.modal-footer:before, .modal-footer:before,
.modal-footer:after { .modal-footer:after {
content: " "; content: " ";
@ -6541,6 +6500,7 @@ button.close {
.navbar-collapse:after, .navbar-collapse:after,
.pager:after, .pager:after,
.panel-body:after, .panel-body:after,
.modal-header:after,
.modal-footer:after { .modal-footer:after {
clear: both; clear: both;
} }

102
public/css/theme2.css
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (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)
*/ */
@ -269,10 +269,10 @@ th {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.glyphicon-asterisk:before { .glyphicon-asterisk:before {
content: "\2a"; content: "\002a";
} }
.glyphicon-plus:before { .glyphicon-plus:before {
content: "\2b"; content: "\002b";
} }
.glyphicon-euro:before, .glyphicon-euro:before,
.glyphicon-eur:before { .glyphicon-eur:before {
@ -2569,6 +2569,10 @@ output {
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: #999999; color: #999999;
} }
.form-control::-ms-expand {
border: 0;
background-color: transparent;
}
.form-control[disabled], .form-control[disabled],
.form-control[readonly], .form-control[readonly],
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
@ -2975,7 +2979,7 @@ select[multiple].input-lg {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 14.333333px; padding-top: 11px;
font-size: 18px; font-size: 18px;
} }
} }
@ -3082,9 +3086,6 @@ fieldset[disabled] a.btn {
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
background-image: none; background-image: none;
} }
.btn-default.disabled,
.btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover, .btn-default.disabled:hover,
.btn-default[disabled]:hover, .btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:hover,
@ -3093,13 +3094,7 @@ fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus, .btn-default.disabled.focus,
.btn-default[disabled].focus, .btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default.focus {
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #ffffff; background-color: #ffffff;
border-color: #cccccc; border-color: #cccccc;
} }
@ -3148,9 +3143,6 @@ fieldset[disabled] .btn-default.active {
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
background-image: none; background-image: none;
} }
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover, .btn-primary.disabled:hover,
.btn-primary[disabled]:hover, .btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:hover,
@ -3159,13 +3151,7 @@ fieldset[disabled] .btn-primary:hover,
fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus, .btn-primary.disabled.focus,
.btn-primary[disabled].focus, .btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary.focus {
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #758499; background-color: #758499;
border-color: #68778d; border-color: #68778d;
} }
@ -3214,9 +3200,6 @@ fieldset[disabled] .btn-primary.active {
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
background-image: none; background-image: none;
} }
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover, .btn-success.disabled:hover,
.btn-success[disabled]:hover, .btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:hover,
@ -3225,13 +3208,7 @@ fieldset[disabled] .btn-success:hover,
fieldset[disabled] .btn-success:focus, fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus, .btn-success.disabled.focus,
.btn-success[disabled].focus, .btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus, fieldset[disabled] .btn-success.focus {
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #7b9c41; background-color: #7b9c41;
border-color: #6d8a39; border-color: #6d8a39;
} }
@ -3280,9 +3257,6 @@ fieldset[disabled] .btn-success.active {
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
background-image: none; background-image: none;
} }
.btn-info.disabled,
.btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover, .btn-info.disabled:hover,
.btn-info[disabled]:hover, .btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:hover,
@ -3291,13 +3265,7 @@ fieldset[disabled] .btn-info:hover,
fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus, .btn-info.disabled.focus,
.btn-info[disabled].focus, .btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus, fieldset[disabled] .btn-info.focus {
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #9c7357; background-color: #9c7357;
border-color: #8c674e; border-color: #8c674e;
} }
@ -3346,9 +3314,6 @@ fieldset[disabled] .btn-info.active {
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
background-image: none; background-image: none;
} }
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover, .btn-warning.disabled:hover,
.btn-warning[disabled]:hover, .btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:hover,
@ -3357,13 +3322,7 @@ fieldset[disabled] .btn-warning:hover,
fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus, .btn-warning.disabled.focus,
.btn-warning[disabled].focus, .btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus, fieldset[disabled] .btn-warning.focus {
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #e3a14d; background-color: #e3a14d;
border-color: #e09537; border-color: #e09537;
} }
@ -3412,9 +3371,6 @@ fieldset[disabled] .btn-warning.active {
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
background-image: none; background-image: none;
} }
.btn-danger.disabled,
.btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover, .btn-danger.disabled:hover,
.btn-danger[disabled]:hover, .btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:hover,
@ -3423,13 +3379,7 @@ fieldset[disabled] .btn-danger:hover,
fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus, .btn-danger.disabled.focus,
.btn-danger[disabled].focus, .btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus, fieldset[disabled] .btn-danger.focus {
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #7f528b; background-color: #7f528b;
border-color: #70497b; border-color: #70497b;
} }
@ -3800,13 +3750,15 @@ tbody.collapse.in {
} }
.btn-group-vertical > .btn:first-child:not(:last-child) { .btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-top-left-radius: 4px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.btn-group-vertical > .btn:last-child:not(:first-child) { .btn-group-vertical > .btn:last-child:not(:first-child) {
border-bottom-left-radius: 4px;
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
@ -3863,6 +3815,9 @@ tbody.collapse.in {
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
} }
.input-group .form-control:focus {
z-index: 3;
}
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
@ -4771,7 +4726,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover, .pagination > li > span:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus { .pagination > li > span:focus {
z-index: 3; z-index: 2;
color: #323233; color: #323233;
background-color: #eeeeee; background-color: #eeeeee;
border-color: #dddddd; border-color: #dddddd;
@ -4782,7 +4737,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:hover, .pagination > .active > span:hover,
.pagination > .active > a:focus, .pagination > .active > a:focus,
.pagination > .active > span:focus { .pagination > .active > span:focus {
z-index: 2; z-index: 3;
color: #ffffff; color: #ffffff;
background-color: #758499; background-color: #758499;
border-color: #758499; border-color: #758499;
@ -5004,6 +4959,8 @@ a.badge:focus {
.container .jumbotron, .container .jumbotron,
.container-fluid .jumbotron { .container-fluid .jumbotron {
border-radius: 6px; border-radius: 6px;
padding-left: 15px;
padding-right: 15px;
} }
.jumbotron .container { .jumbotron .container {
max-width: 100%; max-width: 100%;
@ -5950,7 +5907,6 @@ button.close {
.modal-header { .modal-header {
padding: 15px; padding: 15px;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
min-height: 16.42857143px;
} }
.modal-header .close { .modal-header .close {
margin-top: -2px; margin-top: -2px;
@ -6342,6 +6298,7 @@ button.close {
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
background-color: rgba(0, 0, 0, 0);
} }
.carousel-control.left { .carousel-control.left {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
@ -6451,16 +6408,16 @@ button.close {
.carousel-control .icon-next { .carousel-control .icon-next {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-top: -15px; margin-top: -10px;
font-size: 30px; font-size: 30px;
} }
.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-left,
.carousel-control .icon-prev { .carousel-control .icon-prev {
margin-left: -15px; margin-left: -10px;
} }
.carousel-control .glyphicon-chevron-right, .carousel-control .glyphicon-chevron-right,
.carousel-control .icon-next { .carousel-control .icon-next {
margin-right: -15px; margin-right: -10px;
} }
.carousel-caption { .carousel-caption {
left: 20%; left: 20%;
@ -6499,6 +6456,8 @@ button.close {
.pager:after, .pager:after,
.panel-body:before, .panel-body:before,
.panel-body:after, .panel-body:after,
.modal-header:before,
.modal-header:after,
.modal-footer:before, .modal-footer:before,
.modal-footer:after { .modal-footer:after {
content: " "; content: " ";
@ -6518,6 +6477,7 @@ button.close {
.navbar-collapse:after, .navbar-collapse:after,
.pager:after, .pager:after,
.panel-body:after, .panel-body:after,
.modal-header:after,
.modal-footer:after { .modal-footer:after {
clear: both; clear: both;
} }

2
vendor/bootstrap vendored

@ -1 +1 @@
Subproject commit 16b48259a62f576e52c903c476bd42b90ab22482 Subproject commit ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c