Commit 0b99e59d authored by Thomas Park's avatar Thomas Park
Browse files

update bootswatch to 3.3.4

parent 66e5c761
{ {
"version": "3.3.2", "version": "3.3.4",
"themes": [ "themes": [
{ {
"name": "Cerulean", "name": "Cerulean",
......
{ {
"name": "bootswatch", "name": "bootswatch",
"description": "Bootswatch is a collection of themes for Bootstrap.", "description": "Bootswatch is a collection of themes for Bootstrap.",
"version": "3.3.2", "version": "3.3.4",
"author": "Thomas Park", "author": "Thomas Park",
"homepage": "http://bootswatch.com", "homepage": "http://bootswatch.com",
"repository": { "repository": {
......
// Cerulean 3.3.2 // Cerulean 3.3.4
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cerulean 3.3.2 // Cerulean 3.3.4
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -207,6 +207,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) + ...@@ -207,6 +207,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
//** 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: $text-color; $legend-color: $text-color;
$legend-border-color: #e5e5e5; $legend-border-color: #e5e5e5;
...@@ -266,7 +269,8 @@ $zindex-dropdown: 1000; ...@@ -266,7 +269,8 @@ $zindex-dropdown: 1000;
$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
......
...@@ -956,12 +956,24 @@ th { ...@@ -956,12 +956,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";
} }
...@@ -1158,6 +1170,9 @@ hr { ...@@ -1158,6 +1170,9 @@ hr {
overflow: visible; overflow: visible;
clip: auto; clip: auto;
} }
[role="button"] {
cursor: pointer;
}
h1, h1,
h2, h2,
h3, h3,
...@@ -2561,10 +2576,13 @@ output { ...@@ -2561,10 +2576,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: #eeeeee; background-color: #eeeeee;
opacity: 1; opacity: 1;
} }
.form-control[disabled],
fieldset[disabled] .form-control {
cursor: not-allowed;
}
textarea.form-control { textarea.form-control {
height: auto; height: auto;
} }
...@@ -2631,6 +2649,7 @@ input[type="search"] { ...@@ -2631,6 +2649,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 {
padding-top: 9px; padding-top: 9px;
padding-bottom: 9px; padding-bottom: 9px;
margin-bottom: 0; margin-bottom: 0;
min-height: 34px;
} }
.form-control-static.input-lg, .form-control-static.input-lg,
.form-control-static.input-sm { .form-control-static.input-sm {
...@@ -2708,6 +2728,7 @@ select[multiple].form-group-sm .form-control { ...@@ -2708,6 +2728,7 @@ select[multiple].form-group-sm .form-control {
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
min-height: 32px;
} }
.input-lg { .input-lg {
height: 54px; height: 54px;
...@@ -2744,6 +2765,7 @@ select[multiple].form-group-lg .form-control { ...@@ -2744,6 +2765,7 @@ select[multiple].form-group-lg .form-control {
padding: 14px 16px; padding: 14px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.3333333; line-height: 1.3333333;
min-height: 38px;
} }
.has-feedback { .has-feedback {
position: relative; position: relative;
...@@ -3362,11 +3384,9 @@ input[type="button"].btn-block { ...@@ -3362,11 +3384,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;
...@@ -3394,7 +3414,7 @@ tbody.collapse.in { ...@@ -3394,7 +3414,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;
} }
...@@ -4034,11 +4054,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4034,11 +4054,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;
...@@ -4082,7 +4100,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4082,7 +4100,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.navbar-collapse.collapse { .navbar-collapse.collapse {
display: block !important; display: block !important;
visibility: visible !important;
height: auto !important; height: auto !important;
padding-bottom: 0; padding-bottom: 0;
overflow: visible !important; overflow: visible !important;
...@@ -4810,7 +4827,8 @@ a.label:focus { ...@@ -4810,7 +4827,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;
} }
...@@ -5642,10 +5660,10 @@ a.list-group-item-danger.active:focus { ...@@ -5642,10 +5660,10 @@ a.list-group-item-danger.active:focus {
width: 100%; width: 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 {
...@@ -5706,7 +5724,7 @@ button.close { ...@@ -5706,7 +5724,7 @@ button.close {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1040; z-index: 1050;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
outline: 0; outline: 0;
} }
...@@ -5747,10 +5765,12 @@ button.close { ...@@ -5747,10 +5765,12 @@ button.close {
outline: 0; outline: 0;
} }
.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: #000000; background-color: #000000;
} }
.modal-backdrop.fade { .modal-backdrop.fade {
...@@ -5821,7 +5841,6 @@ button.close { ...@@ -5821,7 +5841,6 @@ button.close {
position: absolute; position: absolute;
z-index: 1070; z-index: 1070;
display: block; display: block;
visibility: visible;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
...@@ -6344,7 +6363,6 @@ button.close { ...@@ -6344,7 +6363,6 @@ button.close {
} }
.hidden { .hidden {
display: none !important; display: none !important;
visibility: hidden !important;
} }
.affix { .affix {
position: fixed; position: fixed;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
// Cerulean 3.3.2 // Cerulean 3.3.4
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cerulean 3.3.2 // Cerulean 3.3.4
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -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: @text-color; @legend-color: @text-color;
@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
......
// Cosmo 3.3.2 // Cosmo 3.3.4
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cosmo 3.3.2 // Cosmo 3.3.4
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -207,6 +207,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) + ...@@ -207,6 +207,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
//** 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: $text-color; $legend-color: $text-color;
$legend-border-color: #e5e5e5; $legend-border-color: #e5e5e5;
...@@ -266,7 +269,8 @@ $zindex-dropdown: 1000; ...@@ -266,7 +269,8 @@ $zindex-dropdown: 1000;
$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
......
...@@ -957,12 +957,24 @@ th { ...@@ -957,12 +957,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";
} }
...@@ -1159,6 +1171,9 @@ hr { ...@@ -1159,6 +1171,9 @@ hr {
overflow: visible; overflow: visible;
clip: auto; clip: auto;
} }
[role="button"] {
cursor: pointer;
}
h1, h1,
h2, h2,
h3, h3,
...@@ -2562,10 +2577,13 @@ output { ...@@ -2562,10 +2577,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: #e6e6e6; background-color: #e6e6e6;
opacity: 1; opacity: 1;
} }
.form-control[disabled],
fieldset[disabled] .form-control {
cursor: not-allowed;
}
textarea.form-control { textarea.form-control {
height: auto; height: auto;
} }
...@@ -2632,6 +2650,7 @@ input[type="search"] { ...@@ -2632,6 +2650,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;
...@@ -2668,6 +2687,7 @@ fieldset[disabled] .checkbox label { ...@@ -2668,6 +2687,7 @@ fieldset[disabled] .checkbox label {
padding-top: 11px; padding-top: 11px;
padding-bottom: 11px; padding-bottom: 11px;
margin-bottom: 0; margin-bottom: 0;
min-height: 36px;
} }
.form-control-static.input-lg, .form-control-static.input-lg,
.form-control-static.input-sm { .form-control-static.input-sm {
...@@ -2709,6 +2729,7 @@ select[multiple].form-group-sm .form-control { ...@@ -2709,6 +2729,7 @@ select[multiple].form-group-sm .form-control {
padding: 5px 10px; padding: 5px 10px;
font-size: 13px; font-size: 13px;
line-height: 1.5; line-height: 1.5;
min-height: 34px;
} }
.input-lg { .input-lg {
height: 64px; height: 64px;
...@@ -2745,6 +2766,7 @@ select[multiple].form-group-lg .form-control { ...@@ -2745,6 +2766,7 @@ select[multiple].form-group-lg .form-control {
padding: 18px 30px; padding: 18px 30px;
font-size: 19px; font-size: 19px;
line-height: 1.3333333; line-height: 1.3333333;
min-height: 40px;
} }
.has-feedback { .has-feedback {
position: relative; position: relative;
...@@ -3363,11 +3385,9 @@ input[type="button"].btn-block { ...@@ -3363,11 +3385,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;
...@@ -3395,7 +3415,7 @@ tbody.collapse.in { ...@@ -3395,7 +3415,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;
} }
...@@ -4035,11 +4055,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4035,11 +4055,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;
...@@ -4083,7 +4101,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4083,7 +4101,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.navbar-collapse.collapse { .navbar-collapse.collapse {
display: block !important; display: block !important;
visibility: visible !important;
height: auto !important; height: auto !important;
padding-bottom: 0; padding-bottom: 0;
overflow: visible !important; overflow: visible !important;
...@@ -4811,7 +4828,8 @@ a.label:focus { ...@@ -4811,7 +4828,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;