--- ui/css/bootstrap.custom.css | 649 ++++++++++++---------------------------- ui/css/datatables.bootstrap.css | 10 +- ui/css/settings.css | 12 +- ui/css/wok.css | 83 ++--- 4 files changed, 220 insertions(+), 534 deletions(-) diff --git a/ui/css/bootstrap.custom.css b/ui/css/bootstrap.custom.css index d4894f5..1b615a0 100644 --- a/ui/css/bootstrap.custom.css +++ b/ui/css/bootstrap.custom.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* * Project Wok * @@ -166,7 +167,8 @@ select { } button, -html input[type="button"], input[type="reset"], +html input[type="button"], +input[type="reset"], input[type="submit"] { -webkit-appearance: button; cursor: pointer; @@ -349,8 +351,7 @@ a { text-decoration: none; } -a:hover, -a:focus { +a:hover, a:focus { color: #141314; text-decoration: underline; } @@ -415,8 +416,7 @@ hr { border: 0; } -.sr-only-focusable:active, -.sr-only-focusable:focus { +.sr-only-focusable:active, .sr-only-focusable:focus { position: static; width: auto; height: auto; @@ -597,7 +597,7 @@ a.text-primary:focus { a.text-success:hover, a.text-success:focus { - color: #525252; + color: #535353; } .text-info { @@ -606,7 +606,7 @@ a.text-success:focus { a.text-info:hover, a.text-info:focus { - color: #525252; + color: #535353; } .text-warning { @@ -615,7 +615,7 @@ a.text-info:focus { a.text-warning:hover, a.text-warning:focus { - color: #525252; + color: #535353; } .text-danger { @@ -624,7 +624,7 @@ a.text-warning:focus { a.text-danger:hover, a.text-danger:focus { - color: #525252; + color: #535353; } .bg-primary { @@ -730,8 +730,7 @@ dd { margin-left: 0; } -.dl-horizontal dd:before, -.dl-horizontal dd:after { +.dl-horizontal dd:before, .dl-horizontal dd:after { content: " "; display: table; } @@ -892,8 +891,7 @@ pre code { padding-right: 0; } -.container:before, -.container:after { +.container:before, .container:after { content: " "; display: table; } @@ -929,8 +927,7 @@ pre code { padding-right: 0; } -.container-fluid:before, -.container-fluid:after { +.container-fluid:before, .container-fluid:after { content: " "; display: table; } @@ -944,8 +941,7 @@ pre code { margin-right: 0; } -.row:before, -.row:after { +.row:before, .row:after { content: " "; display: table; } @@ -2031,8 +2027,7 @@ output { color: #999; } -.form-control[disabled], -.form-control[readonly], +.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { background-color: #eee; opacity: 1; @@ -2058,8 +2053,7 @@ input[type="search"] { input[type="month"].form-control { line-height: 34px; } - input[type="date"].input-sm, - .input-group-sm > input[type="date"].form-control, + input[type="date"].input-sm, .input-group-sm > input[type="date"].form-control, .input-group-sm > input[type="date"].input-group-addon, .input-group-sm > .input-group-btn > input[type="date"].btn, .input-group-sm input[type="date"], @@ -2067,21 +2061,23 @@ input[type="search"] { .input-group-sm > input[type="time"].form-control, .input-group-sm > input[type="time"].input-group-addon, .input-group-sm > .input-group-btn > input[type="time"].btn, - .input-group-sm input[type="time"], + .input-group-sm + input[type="time"], input[type="datetime-local"].input-sm, .input-group-sm > input[type="datetime-local"].form-control, .input-group-sm > input[type="datetime-local"].input-group-addon, .input-group-sm > .input-group-btn > input[type="datetime-local"].btn, - .input-group-sm input[type="datetime-local"], + .input-group-sm + input[type="datetime-local"], input[type="month"].input-sm, .input-group-sm > input[type="month"].form-control, .input-group-sm > input[type="month"].input-group-addon, .input-group-sm > .input-group-btn > input[type="month"].btn, - .input-group-sm input[type="month"] { + .input-group-sm + input[type="month"] { line-height: 30px; } - input[type="date"].input-lg, - .input-group-lg > input[type="date"].form-control, + input[type="date"].input-lg, .input-group-lg > input[type="date"].form-control, .input-group-lg > input[type="date"].input-group-addon, .input-group-lg > .input-group-btn > input[type="date"].btn, .input-group-lg input[type="date"], @@ -2089,17 +2085,20 @@ input[type="search"] { .input-group-lg > input[type="time"].form-control, .input-group-lg > input[type="time"].input-group-addon, .input-group-lg > .input-group-btn > input[type="time"].btn, - .input-group-lg input[type="time"], + .input-group-lg + input[type="time"], input[type="datetime-local"].input-lg, .input-group-lg > input[type="datetime-local"].form-control, .input-group-lg > input[type="datetime-local"].input-group-addon, .input-group-lg > .input-group-btn > input[type="datetime-local"].btn, - .input-group-lg input[type="datetime-local"], + .input-group-lg + input[type="datetime-local"], input[type="month"].input-lg, .input-group-lg > input[type="month"].form-control, .input-group-lg > input[type="month"].input-group-addon, .input-group-lg > .input-group-btn > input[type="month"].btn, - .input-group-lg input[type="month"] { + .input-group-lg + input[type="month"] { line-height: 46px; } } @@ -2156,26 +2155,28 @@ input[type="search"] { margin-left: 10px; } -input[type="radio"][disabled], -input[type="radio"].disabled, +input[type="radio"][disabled], input[type="radio"].disabled, fieldset[disabled] input[type="radio"], input[type="checkbox"][disabled], input[type="checkbox"].disabled, -fieldset[disabled] input[type="checkbox"] { +fieldset[disabled] +input[type="checkbox"] { cursor: not-allowed; } .radio-inline.disabled, fieldset[disabled] .radio-inline, .checkbox-inline.disabled, -fieldset[disabled] .checkbox-inline { +fieldset[disabled] +.checkbox-inline { cursor: not-allowed; } .radio.disabled label, fieldset[disabled] .radio label, .checkbox.disabled label, -fieldset[disabled] .checkbox label { +fieldset[disabled] +.checkbox label { cursor: not-allowed; } @@ -2186,11 +2187,9 @@ fieldset[disabled] .checkbox label { min-height: 34px; } -.form-control-static.input-lg, -.input-group-lg > .form-control-static.form-control, +.form-control-static.input-lg, .input-group-lg > .form-control-static.form-control, .input-group-lg > .form-control-static.input-group-addon, -.input-group-lg > .input-group-btn > .form-control-static.btn, -.form-control-static.input-sm, .input-group-sm > .form-control-static.form-control, +.input-group-lg > .input-group-btn > .form-control-static.btn, .form-control-static.input-sm, .input-group-sm > .form-control-static.form-control, .input-group-sm > .form-control-static.input-group-addon, .input-group-sm > .input-group-btn > .form-control-static.btn { padding-left: 0; @@ -2214,11 +2213,11 @@ select.input-sm, .input-group-sm > select.form-control, line-height: 30px; } -textarea.input-sm, -.input-group-sm > textarea.form-control, +textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > textarea.input-group-addon, .input-group-sm > .input-group-btn > textarea.btn, -select[multiple].input-sm, .input-group-sm > select[multiple].form-control, +select[multiple].input-sm, +.input-group-sm > select[multiple].form-control, .input-group-sm > select[multiple].input-group-addon, .input-group-sm > .input-group-btn > select[multiple].btn { height: auto; @@ -2267,11 +2266,11 @@ select.input-lg, .input-group-lg > select.form-control, line-height: 46px; } -textarea.input-lg, -.input-group-lg > textarea.form-control, +textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, -select[multiple].input-lg, .input-group-lg > select[multiple].form-control, +select[multiple].input-lg, +.input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn { height: auto; @@ -2324,8 +2323,7 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, pointer-events: none; } -.input-lg + .form-control-feedback, -.input-group-lg > .form-control + .form-control-feedback, +.input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback, .input-group-lg + .form-control-feedback, @@ -2335,8 +2333,7 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, line-height: 46px; } -.input-sm + .form-control-feedback, -.input-group-sm > .form-control + .form-control-feedback, +.input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback, .input-group-sm + .form-control-feedback, @@ -2366,7 +2363,7 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, } .has-success .form-control:focus { - border-color: #525252; + border-color: #535353; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f9f9f; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f9f9f; } @@ -2401,7 +2398,7 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, } .has-warning .form-control:focus { - border-color: #525252; + border-color: #535353; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f9f9f; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f9f9f; } @@ -2436,7 +2433,7 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, } .has-error .form-control:focus { - border-color: #525252; + border-color: #535353; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f9f9f; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f9f9f; } @@ -2536,8 +2533,7 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, margin-right: 0; } -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { +.form-horizontal .form-group:before, .form-horizontal .form-group:after { content: " "; display: table; } @@ -2593,34 +2589,25 @@ select[multiple].input-lg, .input-group-lg > select[multiple].form-control, user-select: none; } -.btn:focus, -.btn.focus, -.btn:active:focus, -.btn:active.focus, -.btn.active:focus, -.btn.active.focus { +.btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -.btn:hover, -.btn:focus, -.btn.focus { +.btn:hover, .btn:focus, .btn.focus { color: #444; text-decoration: none; } -.btn:active, -.btn.active { +.btn:active, .btn.active { outline: 0; background-image: none; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } -.btn.disabled, -.btn[disabled], +.btn.disabled, .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; opacity: 0.65; @@ -2640,8 +2627,7 @@ fieldset[disabled] a.btn { border-color: #ccc; } -.btn-default:focus, -.btn-default.focus { +.btn-default:focus, .btn-default.focus { color: #444; background-color: #e6e6e6; border-color: #8c8c8c; @@ -2653,20 +2639,14 @@ fieldset[disabled] a.btn { border-color: #adadad; } -.btn-default:active, -.btn-default.active, +.btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { color: #444; background-color: #e6e6e6; border-color: #adadad; } -.btn-default:active:hover, -.btn-default:active:focus, -.btn-default:active.focus, -.btn-default.active:hover, -.btn-default.active:focus, -.btn-default.active.focus, +.btn-default:active:hover, .btn-default:active:focus, .btn-default:active.focus, .btn-default.active:hover, .btn-default.active:focus, .btn-default.active.focus, .open > .btn-default.dropdown-toggle:hover, .open > .btn-default.dropdown-toggle:focus, .open > .btn-default.dropdown-toggle.focus { @@ -2675,24 +2655,12 @@ fieldset[disabled] a.btn { border-color: #8c8c8c; } -.btn-default:active, -.btn-default.active, +.btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { background-image: none; } -.btn-default.disabled, -.btn-default.disabled:hover, -.btn-default.disabled:focus, -.btn-default.disabled.focus, -.btn-default.disabled:active, -.btn-default.disabled.active, -.btn-default[disabled], -.btn-default[disabled]:hover, -.btn-default[disabled]:focus, -.btn-default[disabled].focus, -.btn-default[disabled]:active, -.btn-default[disabled].active, +.btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled.focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled].focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, @@ -2714,8 +2682,7 @@ fieldset[disabled] .btn-default.active { border-color: #3a393b; } -.btn-primary:focus, -.btn-primary.focus { +.btn-primary:focus, .btn-primary.focus { color: #fff; background-color: #212021; border-color: black; @@ -2727,20 +2694,14 @@ fieldset[disabled] .btn-default.active { border-color: #1b1b1c; } -.btn-primary:active, -.btn-primary.active, +.btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { color: #fff; background-color: #212021; border-color: #1b1b1c; } -.btn-primary:active:hover, -.btn-primary:active:focus, -.btn-primary:active.focus, -.btn-primary.active:hover, -.btn-primary.active:focus, -.btn-primary.active.focus, +.btn-primary:active:hover, .btn-primary:active:focus, .btn-primary:active.focus, .btn-primary.active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .open > .btn-primary.dropdown-toggle:hover, .open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus { @@ -2749,24 +2710,12 @@ fieldset[disabled] .btn-default.active { border-color: black; } -.btn-primary:active, -.btn-primary.active, +.btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { background-image: none; } -.btn-primary.disabled, -.btn-primary.disabled:hover, -.btn-primary.disabled:focus, -.btn-primary.disabled.focus, -.btn-primary.disabled:active, -.btn-primary.disabled.active, -.btn-primary[disabled], -.btn-primary[disabled]:hover, -.btn-primary[disabled]:focus, -.btn-primary[disabled].focus, -.btn-primary[disabled]:active, -.btn-primary[disabled].active, +.btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, @@ -2788,8 +2737,7 @@ fieldset[disabled] .btn-primary.active { border-color: #5cb85c; } -.btn-success:focus, -.btn-success.focus { +.btn-success:focus, .btn-success.focus { color: #fff; background-color: #449d44; border-color: #2d672d; @@ -2801,20 +2749,14 @@ fieldset[disabled] .btn-primary.active { border-color: #419641; } -.btn-success:active, -.btn-success.active, +.btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle { color: #fff; background-color: #449d44; border-color: #419641; } -.btn-success:active:hover, -.btn-success:active:focus, -.btn-success:active.focus, -.btn-success.active:hover, -.btn-success.active:focus, -.btn-success.active.focus, +.btn-success:active:hover, .btn-success:active:focus, .btn-success:active.focus, .btn-success.active:hover, .btn-success.active:focus, .btn-success.active.focus, .open > .btn-success.dropdown-toggle:hover, .open > .btn-success.dropdown-toggle:focus, .open > .btn-success.dropdown-toggle.focus { @@ -2823,24 +2765,12 @@ fieldset[disabled] .btn-primary.active { border-color: #2d672d; } -.btn-success:active, -.btn-success.active, +.btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle { background-image: none; } -.btn-success.disabled, -.btn-success.disabled:hover, -.btn-success.disabled:focus, -.btn-success.disabled.focus, -.btn-success.disabled:active, -.btn-success.disabled.active, -.btn-success[disabled], -.btn-success[disabled]:hover, -.btn-success[disabled]:focus, -.btn-success[disabled].focus, -.btn-success[disabled]:active, -.btn-success[disabled].active, +.btn-success.disabled, .btn-success.disabled:hover, .btn-success.disabled:focus, .btn-success.disabled.focus, .btn-success.disabled:active, .btn-success.disabled.active, .btn-success[disabled], .btn-success[disabled]:hover, .btn-success[disabled]:focus, .btn-success[disabled].focus, .btn-success[disabled]:active, .btn-success[disabled].active, fieldset[disabled] .btn-success, fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:focus, @@ -2862,8 +2792,7 @@ fieldset[disabled] .btn-success.active { border-color: #5bc0de; } -.btn-info:focus, -.btn-info.focus { +.btn-info:focus, .btn-info.focus { color: #fff; background-color: #31b0d5; border-color: #1f7e9a; @@ -2875,20 +2804,14 @@ fieldset[disabled] .btn-success.active { border-color: #2aabd2; } -.btn-info:active, -.btn-info.active, +.btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle { color: #fff; background-color: #31b0d5; border-color: #2aabd2; } -.btn-info:active:hover, -.btn-info:active:focus, -.btn-info:active.focus, -.btn-info.active:hover, -.btn-info.active:focus, -.btn-info.active.focus, +.btn-info:active:hover, .btn-info:active:focus, .btn-info:active.focus, .btn-info.active:hover, .btn-info.active:focus, .btn-info.active.focus, .open > .btn-info.dropdown-toggle:hover, .open > .btn-info.dropdown-toggle:focus, .open > .btn-info.dropdown-toggle.focus { @@ -2897,24 +2820,12 @@ fieldset[disabled] .btn-success.active { border-color: #1f7e9a; } -.btn-info:active, -.btn-info.active, +.btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle { background-image: none; } -.btn-info.disabled, -.btn-info.disabled:hover, -.btn-info.disabled:focus, -.btn-info.disabled.focus, -.btn-info.disabled:active, -.btn-info.disabled.active, -.btn-info[disabled], -.btn-info[disabled]:hover, -.btn-info[disabled]:focus, -.btn-info[disabled].focus, -.btn-info[disabled]:active, -.btn-info[disabled].active, +.btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled.focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled].focus, .btn-info[disabled]:active, .btn-info[disabled].active, fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, @@ -2936,8 +2847,7 @@ fieldset[disabled] .btn-info.active { border-color: #f0ad4e; } -.btn-warning:focus, -.btn-warning.focus { +.btn-warning:focus, .btn-warning.focus { color: #fff; background-color: #ec971f; border-color: #b06d0f; @@ -2949,20 +2859,14 @@ fieldset[disabled] .btn-info.active { border-color: #eb9316; } -.btn-warning:active, -.btn-warning.active, +.btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle { color: #fff; background-color: #ec971f; border-color: #eb9316; } -.btn-warning:active:hover, -.btn-warning:active:focus, -.btn-warning:active.focus, -.btn-warning.active:hover, -.btn-warning.active:focus, -.btn-warning.active.focus, +.btn-warning:active:hover, .btn-warning:active:focus, .btn-warning:active.focus, .btn-warning.active:hover, .btn-warning.active:focus, .btn-warning.active.focus, .open > .btn-warning.dropdown-toggle:hover, .open > .btn-warning.dropdown-toggle:focus, .open > .btn-warning.dropdown-toggle.focus { @@ -2971,24 +2875,12 @@ fieldset[disabled] .btn-info.active { border-color: #b06d0f; } -.btn-warning:active, -.btn-warning.active, +.btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle { background-image: none; } -.btn-warning.disabled, -.btn-warning.disabled:hover, -.btn-warning.disabled:focus, -.btn-warning.disabled.focus, -.btn-warning.disabled:active, -.btn-warning.disabled.active, -.btn-warning[disabled], -.btn-warning[disabled]:hover, -.btn-warning[disabled]:focus, -.btn-warning[disabled].focus, -.btn-warning[disabled]:active, -.btn-warning[disabled].active, +.btn-warning.disabled, .btn-warning.disabled:hover, .btn-warning.disabled:focus, .btn-warning.disabled.focus, .btn-warning.disabled:active, .btn-warning.disabled.active, .btn-warning[disabled], .btn-warning[disabled]:hover, .btn-warning[disabled]:focus, .btn-warning[disabled].focus, .btn-warning[disabled]:active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning, fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus, @@ -3010,8 +2902,7 @@ fieldset[disabled] .btn-warning.active { border-color: #d9534f; } -.btn-danger:focus, -.btn-danger.focus { +.btn-danger:focus, .btn-danger.focus { color: #fff; background-color: #c9302c; border-color: #8b211e; @@ -3023,20 +2914,14 @@ fieldset[disabled] .btn-warning.active { border-color: #c12e2a; } -.btn-danger:active, -.btn-danger.active, +.btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle { color: #fff; background-color: #c9302c; border-color: #c12e2a; } -.btn-danger:active:hover, -.btn-danger:active:focus, -.btn-danger:active.focus, -.btn-danger.active:hover, -.btn-danger.active:focus, -.btn-danger.active.focus, +.btn-danger:active:hover, .btn-danger:active:focus, .btn-danger:active.focus, .btn-danger.active:hover, .btn-danger.active:focus, .btn-danger.active.focus, .open > .btn-danger.dropdown-toggle:hover, .open > .btn-danger.dropdown-toggle:focus, .open > .btn-danger.dropdown-toggle.focus { @@ -3045,24 +2930,12 @@ fieldset[disabled] .btn-warning.active { border-color: #8b211e; } -.btn-danger:active, -.btn-danger.active, +.btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle { background-image: none; } -.btn-danger.disabled, -.btn-danger.disabled:hover, -.btn-danger.disabled:focus, -.btn-danger.disabled.focus, -.btn-danger.disabled:active, -.btn-danger.disabled.active, -.btn-danger[disabled], -.btn-danger[disabled]:hover, -.btn-danger[disabled]:focus, -.btn-danger[disabled].focus, -.btn-danger[disabled]:active, -.btn-danger[disabled].active, +.btn-danger.disabled, .btn-danger.disabled:hover, .btn-danger.disabled:focus, .btn-danger.disabled.focus, .btn-danger.disabled:active, .btn-danger.disabled.active, .btn-danger[disabled], .btn-danger[disabled]:hover, .btn-danger[disabled]:focus, .btn-danger[disabled].focus, .btn-danger[disabled]:active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger, fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:focus, @@ -3084,32 +2957,24 @@ fieldset[disabled] .btn-danger.active { border-radius: 0; } -.btn-link, -.btn-link:active, -.btn-link.active, -.btn-link[disabled], +.btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; -webkit-box-shadow: none; box-shadow: none; } -.btn-link, -.btn-link:hover, -.btn-link:focus, -.btn-link:active { +.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent; } -.btn-link:hover, -.btn-link:focus { +.btn-link:hover, .btn-link:focus { color: #141314; text-decoration: underline; background-color: transparent; } -.btn-link[disabled]:hover, -.btn-link[disabled]:focus, +.btn-link[disabled]:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:hover, fieldset[disabled] .btn-link:focus { color: #999; @@ -3256,30 +3121,24 @@ tbody.collapse.in { white-space: nowrap; } -.dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus { +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; color: #151515; background-color: #f5f5f5; } -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:hover, -.dropdown-menu > .active > a:focus { +.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { color: #fff; text-decoration: none; outline: 0; background-color: #3a393b; } -.dropdown-menu > .disabled > a, -.dropdown-menu > .disabled > a:hover, -.dropdown-menu > .disabled > a:focus { +.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #999; } -.dropdown-menu > .disabled > a:hover, -.dropdown-menu > .disabled > a:focus { +.dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; @@ -3367,10 +3226,7 @@ tbody.collapse.in { float: left; } -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active, +.btn-group > .btn:hover, .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn:hover, .btn-group-vertical > .btn:focus, .btn-group-vertical > .btn:active, @@ -3389,8 +3245,7 @@ tbody.collapse.in { margin-left: -5px; } -.btn-toolbar:before, -.btn-toolbar:after { +.btn-toolbar:before, .btn-toolbar:after { content: " "; display: table; } @@ -3496,8 +3351,7 @@ tbody.collapse.in { max-width: 100%; } -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after { +.btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after { content: " "; display: table; } @@ -3631,14 +3485,16 @@ tbody.collapse.in { border-radius: 3px; } -.input-group-addon.input-sm, .input-group-sm > .input-group-addon, +.input-group-addon.input-sm, +.input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .input-group-addon.btn { padding: 5px 10px; font-size: 12px; border-radius: 3px; } -.input-group-addon.input-lg, .input-group-lg > .input-group-addon, +.input-group-addon.input-lg, +.input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .input-group-addon.btn { padding: 10px 16px; font-size: 18px; @@ -3694,9 +3550,7 @@ tbody.collapse.in { margin-left: -1px; } -.input-group-btn > .btn:hover, -.input-group-btn > .btn:focus, -.input-group-btn > .btn:active { +.input-group-btn > .btn:hover, .input-group-btn > .btn:focus, .input-group-btn > .btn:active { z-index: 2; } @@ -3717,8 +3571,7 @@ tbody.collapse.in { list-style: none; } -.nav:before, -.nav:after { +.nav:before, .nav:after { content: " "; display: table; } @@ -3738,8 +3591,7 @@ tbody.collapse.in { padding: 10px 15px; } -.nav > li > a:hover, -.nav > li > a:focus { +.nav > li > a:hover, .nav > li > a:focus { text-decoration: none; background-color: #fff; } @@ -3748,17 +3600,14 @@ tbody.collapse.in { color: #999; } -.nav > li.disabled > a:hover, -.nav > li.disabled > a:focus { +.nav > li.disabled > a:hover, .nav > li.disabled > a:focus { color: #999; text-decoration: none; background-color: transparent; cursor: not-allowed; } -.nav .open > a, -.nav .open > a:hover, -.nav .open > a:focus { +.nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #fff; border-color: #3a393b; } @@ -3794,9 +3643,7 @@ tbody.collapse.in { border-color: #fff #fff #ddd; } -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover, -.nav-tabs > li.active > a:focus { +.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #444; background-color: #fff; border: 1px solid #ddd; @@ -3816,9 +3663,7 @@ tbody.collapse.in { margin-left: 2px; } -.nav-pills > li.active > a, -.nav-pills > li.active > a:hover, -.nav-pills > li.active > a:focus { +.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; background-color: #3a393b; } @@ -3869,9 +3714,9 @@ tbody.collapse.in { border-radius: 3px; } -.nav-tabs-justified > .active > a, -.nav-tabs.nav-justified > .active > a, .nav-tabs-justified > .active > a:hover, -.nav-tabs.nav-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus, .nav-tabs.nav-justified > .active > a:focus { +.nav-tabs-justified > .active > a, .nav-tabs.nav-justified > .active > a, +.nav-tabs-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:hover, +.nav-tabs-justified > .active > a:focus, .nav-tabs.nav-justified > .active > a:focus { border: 1px solid #ddd; } @@ -3880,9 +3725,9 @@ tbody.collapse.in { border-bottom: 1px solid #ddd; border-radius: 3px 3px 0 0; } - .nav-tabs-justified > .active > a, - .nav-tabs.nav-justified > .active > a, .nav-tabs-justified > .active > a:hover, - .nav-tabs.nav-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus, .nav-tabs.nav-justified > .active > a:focus { + .nav-tabs-justified > .active > a, .nav-tabs.nav-justified > .active > a, + .nav-tabs-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:hover, + .nav-tabs-justified > .active > a:focus, .nav-tabs.nav-justified > .active > a:focus { border-bottom-color: #fff; } } @@ -3908,8 +3753,7 @@ tbody.collapse.in { border: 0; } -.navbar:before, -.navbar:after { +.navbar:before, .navbar:after { content: " "; display: table; } @@ -3924,8 +3768,7 @@ tbody.collapse.in { } } -.navbar-header:before, -.navbar-header:after { +.navbar-header:before, .navbar-header:after { content: " "; display: table; } @@ -3949,8 +3792,7 @@ tbody.collapse.in { -webkit-overflow-scrolling: touch; } -.navbar-collapse:before, -.navbar-collapse:after { +.navbar-collapse:before, .navbar-collapse:after { content: " "; display: table; } @@ -4069,8 +3911,7 @@ tbody.collapse.in { user-select: none; } -.navbar-brand:hover, -.navbar-brand:focus { +.navbar-brand:hover, .navbar-brand:focus { text-decoration: none; } @@ -4142,8 +3983,7 @@ tbody.collapse.in { .navbar-nav .open .dropdown-menu > li > a { line-height: 20px; } - .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-nav .open .dropdown-menu > li > a:focus { + .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus { background-image: none; } } @@ -4330,8 +4170,7 @@ tbody.collapse.in { white-space: nowrap; } -.navbar-nav > li > .dropdown-menu > li > a:hover, -.navbar-nav > li > .dropdown-menu > li > a:focus, +.navbar-nav > li > .dropdown-menu > li > a:hover, .navbar-nav > li > .dropdown-menu > li > a:focus, .navbar-nav > li > .dropdown-menu > li > span:hover, .navbar-nav > li > .dropdown-menu > li > span:focus { text-decoration: none; @@ -4425,8 +4264,7 @@ tbody.collapse.in { color: #fff; } -.navbar-default .navbar-brand:hover, -.navbar-default .navbar-brand:focus { +.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { color: #e6e6e6; background-color: transparent; } @@ -4438,8 +4276,7 @@ tbody.collapse.in { padding-right: 0; } -.navbar-default .container:before, -.navbar-default .container:after { +.navbar-default .container:before, .navbar-default .container:after { content: " "; display: table; } @@ -4500,108 +4337,79 @@ tbody.collapse.in { } } -.navbar-default .navbar-nav > li > a:hover, -.navbar-default .navbar-nav > li > a:focus { +.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { color: #fff; background-color: transparent; } -.navbar-default .navbar-nav > .active > a, -.navbar-default .navbar-nav > .active > a:hover, -.navbar-default .navbar-nav > .active > a:focus { +.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #fff; background-color: transparent; } -.navbar-default .navbar-nav > .disabled > a, -.navbar-default .navbar-nav > .disabled > a:hover, -.navbar-default .navbar-nav > .disabled > a:focus { +.navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { cursor: default; color: #999; background-color: transparent; } -.navbar-default .navbar-nav > .active > a.hostSelected, -.navbar-default .navbar-nav > .active > a.hostSelected:hover, -.navbar-default .navbar-nav > .active > a.hostSelected:focus { +.navbar-default .navbar-nav > .active > a.hostSelected, .navbar-default .navbar-nav > .active > a.hostSelected:hover, .navbar-default .navbar-nav > .active > a.hostSelected:focus { height: 41px; background-color: #008abf !important; } -.navbar-default .navbar-nav > .active > a.host, -.navbar-default .navbar-nav > .active > a.host:hover, -.navbar-default .navbar-nav > .active > a.host:focus { +.navbar-default .navbar-nav > .active > a.host, .navbar-default .navbar-nav > .active > a.host:hover, .navbar-default .navbar-nav > .active > a.host:focus { height: 41px; background-color: #008abf !important; } -.navbar-default .navbar-nav > .active > a.guests, -.navbar-default .navbar-nav > .active > a.guests:hover, -.navbar-default .navbar-nav > .active > a.guests:focus { +.navbar-default .navbar-nav > .active > a.guests, .navbar-default .navbar-nav > .active > a.guests:hover, .navbar-default .navbar-nav > .active > a.guests:focus { height: 41px; background-color: #8cc63f !important; } -.navbar-default .navbar-nav > .active > a.templates, -.navbar-default .navbar-nav > .active > a.templates:hover, -.navbar-default .navbar-nav > .active > a.templates:focus { +.navbar-default .navbar-nav > .active > a.templates, .navbar-default .navbar-nav > .active > a.templates:hover, .navbar-default .navbar-nav > .active > a.templates:focus { height: 41px; background-color: #00a6a0 !important; } -.navbar-default .navbar-nav > .active > a.storage, -.navbar-default .navbar-nav > .active > a.storage:hover, -.navbar-default .navbar-nav > .active > a.storage:focus { +.navbar-default .navbar-nav > .active > a.storage, .navbar-default .navbar-nav > .active > a.storage:hover, .navbar-default .navbar-nav > .active > a.storage:focus { height: 41px; background-color: #feb813 !important; color: #000 !important; } -.navbar-default .navbar-nav > .active > a.network, -.navbar-default .navbar-nav > .active > a.network:hover, -.navbar-default .navbar-nav > .active > a.network:focus { +.navbar-default .navbar-nav > .active > a.network, .navbar-default .navbar-nav > .active > a.network:hover, .navbar-default .navbar-nav > .active > a.network:focus { height: 41px; background-color: #7f1c7d !important; } -.navbar-default .navbar-nav > .active > a.wok, -.navbar-default .navbar-nav > .active > a.wok:hover, -.navbar-default .navbar-nav > .active > a.wok:focus { +.navbar-default .navbar-nav > .active > a.wok, .navbar-default .navbar-nav > .active > a.wok:hover, .navbar-default .navbar-nav > .active > a.wok:focus { height: 41px; background-color: #d9182d !important; } -.navbar-default .navbar-nav > .active > a.virtualizationTab, -.navbar-default .navbar-nav > .active > a.virtualizationTab:hover, -.navbar-default .navbar-nav > .active > a.virtualizationTab:focus { +.navbar-default .navbar-nav > .active > a.virtualizationTab, .navbar-default .navbar-nav > .active > a.virtualizationTab:hover, .navbar-default .navbar-nav > .active > a.virtualizationTab:focus { height: 41px; background-color: #59930c !important; } -.navbar-default .navbar-nav > .active > a.hostTab, -.navbar-default .navbar-nav > .active > a.hostTab:hover, -.navbar-default .navbar-nav > .active > a.hostTab:focus { +.navbar-default .navbar-nav > .active > a.hostTab, .navbar-default .navbar-nav > .active > a.hostTab:hover, .navbar-default .navbar-nav > .active > a.hostTab:focus { height: 41px; background-color: #00578c !important; } -.navbar-default .navbar-nav > .active > a.virtualizationSelected, -.navbar-default .navbar-nav > .active > a.virtualizationSelected:hover, -.navbar-default .navbar-nav > .active > a.virtualizationSelected:focus { +.navbar-default .navbar-nav > .active > a.virtualizationSelected, .navbar-default .navbar-nav > .active > a.virtualizationSelected:hover, .navbar-default .navbar-nav > .active > a.virtualizationSelected:focus { height: 41px; background-color: #8cc63f !important; } -.navbar-default .navbar-nav > .active > a.wokTab, -.navbar-default .navbar-nav > .active > a.wokTab:hover, -.navbar-default .navbar-nav > .active > a.wokTab:focus { +.navbar-default .navbar-nav > .active > a.wokTab, .navbar-default .navbar-nav > .active > a.wokTab:hover, .navbar-default .navbar-nav > .active > a.wokTab:focus { height: 41px; background-color: #930c0c !important; } -.navbar-default .navbar-nav > .active > a.wokSelected, -.navbar-default .navbar-nav > .active > a.wokSelected:hover, -.navbar-default .navbar-nav > .active > a.wokSelected:focus { +.navbar-default .navbar-nav > .active > a.wokSelected, .navbar-default .navbar-nav > .active > a.wokSelected:hover, .navbar-default .navbar-nav > .active > a.wokSelected:focus { height: 41px; background-color: #d9182d !important; } @@ -4650,8 +4458,7 @@ tbody.collapse.in { border-color: #ddd; } -.navbar-default .navbar-toggle:hover, -.navbar-default .navbar-toggle:focus { +.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #ddd; } @@ -4664,9 +4471,7 @@ tbody.collapse.in { border-color: #3a393b; } -.navbar-default .navbar-nav > .open > a, -.navbar-default .navbar-nav > .open > a:hover, -.navbar-default .navbar-nav > .open > a:focus { +.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: transparent; color: #fff; } @@ -4675,20 +4480,15 @@ tbody.collapse.in { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #fff; } - .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; background-color: transparent; } - .navbar-default .navbar-nav .open .dropdown-menu > .active > a, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff; background-color: transparent; } - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #999; background-color: transparent; } @@ -4706,13 +4506,11 @@ tbody.collapse.in { color: #fff; } -.navbar-default .btn-link:hover, -.navbar-default .btn-link:focus { +.navbar-default .btn-link:hover, .navbar-default .btn-link:focus { color: #fff; } -.navbar-default .btn-link[disabled]:hover, -.navbar-default .btn-link[disabled]:focus, +.navbar-default .btn-link[disabled]:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:hover, fieldset[disabled] .navbar-default .btn-link:focus { color: #999; @@ -4727,8 +4525,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #fff; } -.navbar-inverse .navbar-brand:hover, -.navbar-inverse .navbar-brand:focus { +.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { color: #fff; background-color: transparent; } @@ -4741,22 +4538,17 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #fff; } -.navbar-inverse .navbar-nav > li > a:hover, -.navbar-inverse .navbar-nav > li > a:focus { +.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #fff; background-color: transparent; } -.navbar-inverse .navbar-nav > .active > a, -.navbar-inverse .navbar-nav > .active > a:hover, -.navbar-inverse .navbar-nav > .active > a:focus { +.navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { color: #fff; background-color: transparent; } -.navbar-inverse .navbar-nav > .disabled > a, -.navbar-inverse .navbar-nav > .disabled > a:hover, -.navbar-inverse .navbar-nav > .disabled > a:focus { +.navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { color: #999; background-color: transparent; } @@ -4765,8 +4557,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-color: #333; } -.navbar-inverse .navbar-toggle:hover, -.navbar-inverse .navbar-toggle:focus { +.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { background-color: transparent; } @@ -4779,9 +4570,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-color: #101010; } -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { +.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background-color: transparent; color: #fff; } @@ -4796,20 +4585,15 @@ fieldset[disabled] .navbar-default .btn-link:focus { .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #fff; } - .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; background-color: transparent; } - .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, - .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff; background-color: transparent; } - .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #999; background-color: transparent; } @@ -4827,13 +4611,11 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #fff; } -.navbar-inverse .btn-link:hover, -.navbar-inverse .btn-link:focus { +.navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { color: #fff; } -.navbar-inverse .btn-link[disabled]:hover, -.navbar-inverse .btn-link[disabled]:focus, +.navbar-inverse .btn-link[disabled]:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:hover, fieldset[disabled] .navbar-inverse .btn-link:focus { color: #999; @@ -4852,7 +4634,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .breadcrumb > li + li:before { - content: "/\\00a0"; + content: "/ "; padding: 0 5px; color: #ccc; } @@ -4898,8 +4680,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { border-top-right-radius: 3px; } -.pagination > li > a:hover, -.pagination > li > a:focus, +.pagination > li > a:hover, .pagination > li > a:focus, .pagination > li > span:hover, .pagination > li > span:focus { z-index: 3; @@ -4908,9 +4689,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { border-color: #ddd; } -.pagination > .active > a, -.pagination > .active > a:hover, -.pagination > .active > a:focus, +.pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus, .pagination > .active > span, .pagination > .active > span:hover, .pagination > .active > span:focus { @@ -4978,8 +4757,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { text-align: center; } -.pager:before, -.pager:after { +.pager:before, .pager:after { content: " "; display: table; } @@ -5028,7 +4806,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .label { display: inline; - padding: 0.2em 0.6em 0.3em; + padding: .2em .6em .3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -5048,8 +4826,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { top: -1px; } -a.label:hover, -a.label:focus { +a.label:hover, a.label:focus { color: #fff; text-decoration: none; cursor: pointer; @@ -5059,8 +4836,7 @@ a.label:focus { background-color: #999; } -.label-default[href]:hover, -.label-default[href]:focus { +.label-default[href]:hover, .label-default[href]:focus { background-color: gray; } @@ -5068,8 +4844,7 @@ a.label:focus { background-color: #3a393b; } -.label-primary[href]:hover, -.label-primary[href]:focus { +.label-primary[href]:hover, .label-primary[href]:focus { background-color: #212021; } @@ -5077,8 +4852,7 @@ a.label:focus { background-color: #5cb85c; } -.label-success[href]:hover, -.label-success[href]:focus { +.label-success[href]:hover, .label-success[href]:focus { background-color: #449d44; } @@ -5086,8 +4860,7 @@ a.label:focus { background-color: #5bc0de; } -.label-info[href]:hover, -.label-info[href]:focus { +.label-info[href]:hover, .label-info[href]:focus { background-color: #31b0d5; } @@ -5095,8 +4868,7 @@ a.label:focus { background-color: #f0ad4e; } -.label-warning[href]:hover, -.label-warning[href]:focus { +.label-warning[href]:hover, .label-warning[href]:focus { background-color: #ec971f; } @@ -5104,8 +4876,7 @@ a.label:focus { background-color: #d9534f; } -.label-danger[href]:hover, -.label-danger[href]:focus { +.label-danger[href]:hover, .label-danger[href]:focus { background-color: #c9302c; } @@ -5133,8 +4904,7 @@ a.label:focus { top: -1px; } -.btn-xs .badge, -.btn-group-xs > .btn .badge, +.btn-xs .badge, .btn-group-xs > .btn .badge, .btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; @@ -5158,8 +4928,7 @@ a.label:focus { margin-left: 3px; } -a.badge:hover, -a.badge:focus { +a.badge:hover, a.badge:focus { color: #fff; text-decoration: none; cursor: pointer; @@ -5279,11 +5048,13 @@ a.thumbnail.active { margin-top: 5px; } -.alert-dismissable, .alert-dismissible { +.alert-dismissable, +.alert-dismissible { padding-right: 8px 15px20; } -.alert-dismissable .close, .alert-dismissible .close { +.alert-dismissable .close, +.alert-dismissible .close { opacity: 1; position: absolute; top: 6px; @@ -5302,7 +5073,7 @@ a.thumbnail.active { } .alert-success .alert-link { - color: #525252; + color: #535353; } .alert-info { @@ -5316,7 +5087,7 @@ a.thumbnail.active { } .alert-info .alert-link { - color: #525252; + color: #535353; } .alert-warning { @@ -5330,7 +5101,7 @@ a.thumbnail.active { } .alert-warning .alert-link { - color: #525252; + color: #535353; } .alert-danger { @@ -5344,7 +5115,7 @@ a.thumbnail.active { } .alert-danger .alert-link { - color: #525252; + color: #535353; } @-webkit-keyframes progress-bar-stripes { @@ -5542,8 +5313,7 @@ button.list-group-item .list-group-item-heading { color: #333; } -a.list-group-item:hover, -a.list-group-item:focus, +a.list-group-item:hover, a.list-group-item:focus, button.list-group-item:hover, button.list-group-item:focus { text-decoration: none; @@ -5556,29 +5326,21 @@ button.list-group-item { text-align: left; } -.list-group-item.disabled, -.list-group-item.disabled:hover, -.list-group-item.disabled:focus { +.list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { background-color: #fff; color: #999; cursor: not-allowed; } -.list-group-item.disabled .list-group-item-heading, -.list-group-item.disabled:hover .list-group-item-heading, -.list-group-item.disabled:focus .list-group-item-heading { +.list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, .list-group-item.disabled:focus .list-group-item-heading { color: inherit; } -.list-group-item.disabled .list-group-item-text, -.list-group-item.disabled:hover .list-group-item-text, -.list-group-item.disabled:focus .list-group-item-text { +.list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { color: #999; } -.list-group-item.active, -.list-group-item.active:hover, -.list-group-item.active:focus { +.list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #fff; background-color: #3a393b; @@ -5587,19 +5349,15 @@ button.list-group-item { .list-group-item.active .list-group-item-heading, .list-group-item.active .list-group-item-heading > small, -.list-group-item.active .list-group-item-heading > .small, -.list-group-item.active:hover .list-group-item-heading, +.list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading > small, -.list-group-item.active:hover .list-group-item-heading > .small, -.list-group-item.active:focus .list-group-item-heading, +.list-group-item.active:hover .list-group-item-heading > .small, .list-group-item.active:focus .list-group-item-heading, .list-group-item.active:focus .list-group-item-heading > small, .list-group-item.active:focus .list-group-item-heading > .small { color: inherit; } -.list-group-item.active .list-group-item-text, -.list-group-item.active:hover .list-group-item-text, -.list-group-item.active:focus .list-group-item-text { +.list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { color: #a09ea2; } @@ -5618,17 +5376,14 @@ button.list-group-item-success .list-group-item-heading { color: inherit; } -a.list-group-item-success:hover, -a.list-group-item-success:focus, +a.list-group-item-success:hover, a.list-group-item-success:focus, button.list-group-item-success:hover, button.list-group-item-success:focus { color: #6c6c6c; background-color: #cedeba; } -a.list-group-item-success.active, -a.list-group-item-success.active:hover, -a.list-group-item-success.active:focus, +a.list-group-item-success.active, a.list-group-item-success.active:hover, a.list-group-item-success.active:focus, button.list-group-item-success.active, button.list-group-item-success.active:hover, button.list-group-item-success.active:focus { @@ -5652,17 +5407,14 @@ button.list-group-item-info .list-group-item-heading { color: inherit; } -a.list-group-item-info:hover, -a.list-group-item-info:focus, +a.list-group-item-info:hover, a.list-group-item-info:focus, button.list-group-item-info:hover, button.list-group-item-info:focus { color: #6c6c6c; background-color: #c4e3f3; } -a.list-group-item-info.active, -a.list-group-item-info.active:hover, -a.list-group-item-info.active:focus, +a.list-group-item-info.active, a.list-group-item-info.active:hover, a.list-group-item-info.active:focus, button.list-group-item-info.active, button.list-group-item-info.active:hover, button.list-group-item-info.active:focus { @@ -5686,17 +5438,14 @@ button.list-group-item-warning .list-group-item-heading { color: inherit; } -a.list-group-item-warning:hover, -a.list-group-item-warning:focus, +a.list-group-item-warning:hover, a.list-group-item-warning:focus, button.list-group-item-warning:hover, button.list-group-item-warning:focus { color: #6c6c6c; background-color: #ecd9ad; } -a.list-group-item-warning.active, -a.list-group-item-warning.active:hover, -a.list-group-item-warning.active:focus, +a.list-group-item-warning.active, a.list-group-item-warning.active:hover, a.list-group-item-warning.active:focus, button.list-group-item-warning.active, button.list-group-item-warning.active:hover, button.list-group-item-warning.active:focus { @@ -5720,17 +5469,14 @@ button.list-group-item-danger .list-group-item-heading { color: inherit; } -a.list-group-item-danger:hover, -a.list-group-item-danger:focus, +a.list-group-item-danger:hover, a.list-group-item-danger:focus, button.list-group-item-danger:hover, button.list-group-item-danger:focus { color: #6c6c6c; background-color: #e3b0b5; } -a.list-group-item-danger.active, -a.list-group-item-danger.active:hover, -a.list-group-item-danger.active:focus, +a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus, button.list-group-item-danger.active, button.list-group-item-danger.active:hover, button.list-group-item-danger.active:focus { @@ -5762,8 +5508,7 @@ button.list-group-item-danger.active:focus { padding: 11px 0; } -.panel-body:before, -.panel-body:after { +.panel-body:before, .panel-body:after { content: " "; display: table; } @@ -6238,8 +5983,7 @@ button.list-group-item-danger.active:focus { filter: alpha(opacity=20); } -.close:hover, -.close:focus { +.close:hover, .close:focus { color: #555; text-decoration: none; cursor: pointer; @@ -6367,8 +6111,7 @@ button.close { background-color: #8cc63f; } -.modal-footer:before, -.modal-footer:after { +.modal-footer:before, .modal-footer:after { content: " "; display: table; } @@ -6684,8 +6427,7 @@ button.close { padding: 9px 14px; } -.popover > .arrow, -.popover > .arrow:after { +.popover > .arrow, .popover > .arrow:after { position: absolute; display: block; width: 0; @@ -6771,8 +6513,7 @@ button.close { bottom: -10px; } -.clearfix:before, -.clearfix:after { +.clearfix:before, .clearfix:after { content: " "; display: table; } diff --git a/ui/css/datatables.bootstrap.css b/ui/css/datatables.bootstrap.css index 87eec2a..6d4e19d 100644 --- a/ui/css/datatables.bootstrap.css +++ b/ui/css/datatables.bootstrap.css @@ -111,9 +111,7 @@ div.dataTables_wrapper div.dataTables_processing { padding: 1em 0; } -table.dataTable thead > tr > th.sorting_asc, -table.dataTable thead > tr > th.sorting_desc, -table.dataTable thead > tr > th.sorting, +table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sorting_desc, table.dataTable thead > tr > th.sorting, table.dataTable thead > tr > td.sorting_asc, table.dataTable thead > tr > td.sorting_desc, table.dataTable thead > tr > td.sorting { @@ -134,8 +132,7 @@ table.dataTable thead .sorting_desc_disabled { position: relative; } -table.dataTable thead .sorting:before, -table.dataTable thead .sorting:after, +table.dataTable thead .sorting:before, table.dataTable thead .sorting:after, table.dataTable thead .sorting_asc:before, table.dataTable thead .sorting_asc:after, table.dataTable thead .sorting_desc:before, @@ -246,8 +243,7 @@ table.table-bordered.dataTable td { border-left-width: 0; } -table.table-bordered.dataTable th:last-child, -table.table-bordered.dataTable th:last-child, +table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable td:last-child, table.table-bordered.dataTable td:last-child { border-right-width: 0; diff --git a/ui/css/settings.css b/ui/css/settings.css index 1fe0a04..8c0b8cb 100644 --- a/ui/css/settings.css +++ b/ui/css/settings.css @@ -121,8 +121,7 @@ div#user-log-actions { background-color: #d9182d; } -.label-primary.label-wok[href]:hover, -.label-primary.label-wok[href]:focus { +.label-primary.label-wok[href]:hover, .label-primary.label-wok[href]:focus { background-color: #ab1323; } @@ -130,8 +129,7 @@ div#user-log-actions { background-color: #8cc63f; } -.label-primary.label-kimchi[href]:hover, -.label-primary.label-kimchi[href]:focus { +.label-primary.label-kimchi[href]:hover, .label-primary.label-kimchi[href]:focus { background-color: #71a230; } @@ -139,8 +137,7 @@ div#user-log-actions { background-color: #00578c; } -.label-primary.label-ginger[href]:hover, -.label-primary.label-ginger[href]:focus { +.label-primary.label-ginger[href]:hover, .label-primary.label-ginger[href]:focus { background-color: #003759; } @@ -148,8 +145,7 @@ div#user-log-actions { background-color: #008abf; } -.label-primary.label-gingerbase[href]:hover, -.label-primary.label-gingerbase[href]:focus { +.label-primary.label-gingerbase[href]:hover, .label-primary.label-gingerbase[href]:focus { background-color: #00658c; } diff --git a/ui/css/wok.css b/ui/css/wok.css index 95d903b..ca98e38 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -137,9 +137,7 @@ html.in-progress .disabled { position: relative; } -.pagination > .active > a, -.pagination > .active > a:hover, -.pagination > .active > a:focus, +.pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus, .pagination > .active > span, .pagination > .active > span:hover, .pagination > .active > span:focus { @@ -430,8 +428,7 @@ html.in-progress .disabled { border-color: #008abf; } -.btn-login:focus, -.btn-login.focus { +.btn-login:focus, .btn-login.focus { color: #fff; background-color: #00658c; border-color: #002e40; @@ -443,20 +440,14 @@ html.in-progress .disabled { border-color: #005e82; } -.btn-login:active, -.btn-login.active, +.btn-login:active, .btn-login.active, .open > .btn-login.dropdown-toggle { color: #fff; background-color: #00658c; border-color: #005e82; } -.btn-login:active:hover, -.btn-login:active:focus, -.btn-login:active.focus, -.btn-login.active:hover, -.btn-login.active:focus, -.btn-login.active.focus, +.btn-login:active:hover, .btn-login:active:focus, .btn-login:active.focus, .btn-login.active:hover, .btn-login.active:focus, .btn-login.active.focus, .open > .btn-login.dropdown-toggle:hover, .open > .btn-login.dropdown-toggle:focus, .open > .btn-login.dropdown-toggle.focus { @@ -465,24 +456,12 @@ html.in-progress .disabled { border-color: #002e40; } -.btn-login:active, -.btn-login.active, +.btn-login:active, .btn-login.active, .open > .btn-login.dropdown-toggle { background-image: none; } -.btn-login.disabled, -.btn-login.disabled:hover, -.btn-login.disabled:focus, -.btn-login.disabled.focus, -.btn-login.disabled:active, -.btn-login.disabled.active, -.btn-login[disabled], -.btn-login[disabled]:hover, -.btn-login[disabled]:focus, -.btn-login[disabled].focus, -.btn-login[disabled]:active, -.btn-login[disabled].active, +.btn-login.disabled, .btn-login.disabled:hover, .btn-login.disabled:focus, .btn-login.disabled.focus, .btn-login.disabled:active, .btn-login.disabled.active, .btn-login[disabled], .btn-login[disabled]:hover, .btn-login[disabled]:focus, .btn-login[disabled].focus, .btn-login[disabled]:active, .btn-login[disabled].active, fieldset[disabled] .btn-login, fieldset[disabled] .btn-login:hover, fieldset[disabled] .btn-login:focus, @@ -509,8 +488,7 @@ fieldset[disabled] .btn-login.active { padding: 4px 12px; } -.btn-group > span > .btn:focus, -.btn-group > span > .btn.focus { +.btn-group > span > .btn:focus, .btn-group > span > .btn.focus { color: #fff; background-color: #343334; border-color: #0d0d0d; @@ -522,20 +500,14 @@ fieldset[disabled] .btn-login.active { border-color: #2e2e2f; } -.btn-group > span > .btn:active, -.btn-group > span > .btn.active, +.btn-group > span > .btn:active, .btn-group > span > .btn.active, .open > .btn-group > span > .btn.dropdown-toggle { color: #fff; background-color: #343334; border-color: #2e2e2f; } -.btn-group > span > .btn:active:hover, -.btn-group > span > .btn:active:focus, -.btn-group > span > .btn:active.focus, -.btn-group > span > .btn.active:hover, -.btn-group > span > .btn.active:focus, -.btn-group > span > .btn.active.focus, +.btn-group > span > .btn:active:hover, .btn-group > span > .btn:active:focus, .btn-group > span > .btn:active.focus, .btn-group > span > .btn.active:hover, .btn-group > span > .btn.active:focus, .btn-group > span > .btn.active.focus, .open > .btn-group > span > .btn.dropdown-toggle:hover, .open > .btn-group > span > .btn.dropdown-toggle:focus, .open > .btn-group > span > .btn.dropdown-toggle.focus { @@ -544,24 +516,12 @@ fieldset[disabled] .btn-login.active { border-color: #0d0d0d; } -.btn-group > span > .btn:active, -.btn-group > span > .btn.active, +.btn-group > span > .btn:active, .btn-group > span > .btn.active, .open > .btn-group > span > .btn.dropdown-toggle { background-image: none; } -.btn-group > span > .btn.disabled, -.btn-group > span > .btn.disabled:hover, -.btn-group > span > .btn.disabled:focus, -.btn-group > span > .btn.disabled.focus, -.btn-group > span > .btn.disabled:active, -.btn-group > span > .btn.disabled.active, -.btn-group > span > .btn[disabled], -.btn-group > span > .btn[disabled]:hover, -.btn-group > span > .btn[disabled]:focus, -.btn-group > span > .btn[disabled].focus, -.btn-group > span > .btn[disabled]:active, -.btn-group > span > .btn[disabled].active, +.btn-group > span > .btn.disabled, .btn-group > span > .btn.disabled:hover, .btn-group > span > .btn.disabled:focus, .btn-group > span > .btn.disabled.focus, .btn-group > span > .btn.disabled:active, .btn-group > span > .btn.disabled.active, .btn-group > span > .btn[disabled], .btn-group > span > .btn[disabled]:hover, .btn-group > span > .btn[disabled]:focus, .btn-group > span > .btn[disabled].focus, .btn-group > span > .btn[disabled]:active, .btn-group > span > .btn[disabled].active, fieldset[disabled] .btn-group > span > .btn, fieldset[disabled] .btn-group > span > .btn:hover, fieldset[disabled] .btn-group > span > .btn:focus, @@ -668,15 +628,14 @@ fieldset[disabled] .btn-group > span > .btn.active { text-decoration: inherit; width: 1.2em; height: 1.2em; - margin: 0.5em 0.85em; + margin: .5em .85em; text-align: center; font-variant: normal; text-transform: none; line-height: 2em; } -.menu-flat.dropup, -.menu-flat.dropdown { +.menu-flat.dropup, .menu-flat.dropdown { position: relative; } @@ -757,16 +716,13 @@ fieldset[disabled] .btn-group > span > .btn.active { display: inline-block; } -.menu-flat .dropdown-menu > li > a:hover, -.menu-flat .dropdown-menu > li > a:focus { +.menu-flat .dropdown-menu > li > a:hover, .menu-flat .dropdown-menu > li > a:focus { text-decoration: none; color: #fff; background-color: #3a393b; } -.menu-flat .dropdown-menu > .active > a, -.menu-flat .dropdown-menu > .active > a:hover, -.menu-flat .dropdown-menu > .active > a:focus { +.menu-flat .dropdown-menu > .active > a, .menu-flat .dropdown-menu > .active > a:hover, .menu-flat .dropdown-menu > .active > a:focus { color: #fff; text-decoration: none; outline: 0; @@ -783,14 +739,11 @@ fieldset[disabled] .btn-group > span > .btn.active { background-color: #3a393b; } -.menu-flat .dropdown-menu > .disabled > a, -.menu-flat .dropdown-menu > .disabled > a:hover, -.menu-flat .dropdown-menu > .disabled > a:focus { +.menu-flat .dropdown-menu > .disabled > a, .menu-flat .dropdown-menu > .disabled > a:hover, .menu-flat .dropdown-menu > .disabled > a:focus { color: #999; } -.menu-flat .dropdown-menu > .disabled > a:hover, -.menu-flat .dropdown-menu > .disabled > a:focus { +.menu-flat .dropdown-menu > .disabled > a:hover, .menu-flat .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; @@ -1353,7 +1306,7 @@ input[type=checkbox].wok-checkbox + label:before { input[type=checkbox].wok-checkbox:checked + label:before { content: "\f14a"; letter-spacing: 8px; - margin-right: 0.9px // Sub-pixel unit for Chrome and Firefox anti-alias; + margin-right: 0.9px; } input[type=radio].wok-radio + label:before { -- 2.7.4

That way the plugin only needs to worry about the main content instead of duplicating the navbar for each tab HTML. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- ui/css/src/modules/_toolbar.scss | 25 ++++++++++--------------- ui/css/wok.css | 20 ++++---------------- ui/js/src/wok.main.js | 8 ++++++++ ui/pages/tabs/settings.html.tmpl | 5 ----- ui/pages/wok-ui.html.tmpl | 7 +++++++ 5 files changed, 29 insertions(+), 36 deletions(-) diff --git a/ui/css/src/modules/_toolbar.scss b/ui/css/src/modules/_toolbar.scss index e9d5131..4cdb2ba 100644 --- a/ui/css/src/modules/_toolbar.scss +++ b/ui/css/src/modules/_toolbar.scss @@ -57,19 +57,16 @@ } } -@each $page, -$bgcolor in $colors { - ##{$page}-root-container .navbar-default.toolbar { - @if $page=='guests' or $page=='templates' or $page=='storage' or $page=='network' { - background-color: map-get($colors, guests) !important; - } - @else if $page=='host' { - background-color: map-get($colors, host) !important; - } - @else if $page=='wok' { - background-color: map-get($colors, wok) !important; - } - } +.navbar-default.toolbar.virtualizationSelected { + background-color: map-get($colors, guests) !important; +} + +.navbar-default.toolbar.hostSelected { + background-color: map-get($colors, host) !important; +} + +.navbar-default.toolbar.wokSelected { + background-color: map-get($colors, wok) !important; } @each $tab, @@ -79,8 +76,6 @@ $bgcolor in $colors { } } - - @media (min-width: $screen-sm-max) and (max-width: $screen-md-min) { .host-dashboard .container { diff --git a/ui/css/wok.css b/ui/css/wok.css index ca98e38..24b5b81 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -316,27 +316,15 @@ html.in-progress .disabled { margin-right: 15px; } -#host-root-container .navbar-default.toolbar { - background-color: #008abf !important; -} - -#guests-root-container .navbar-default.toolbar { - background-color: #8cc63f !important; -} - -#templates-root-container .navbar-default.toolbar { +.navbar-default.toolbar.virtualizationSelected { background-color: #8cc63f !important; } -#storage-root-container .navbar-default.toolbar { - background-color: #8cc63f !important; -} - -#network-root-container .navbar-default.toolbar { - background-color: #8cc63f !important; +.navbar-default.toolbar.hostSelected { + background-color: #008abf !important; } -#wok-root-container .navbar-default.toolbar { +.navbar-default.toolbar.wokSelected { background-color: #d9182d !important; } diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 3872580..e4e762f 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -208,10 +208,17 @@ wok.main = function() { $('#main').html('No plugins installed currently.You can download the available plugins <a href="https://github.com/kimchi-project/kimchi">Kimchi</a> and <a href="https://github.com/kimchi-project/ginger">Ginger</a> from Github').addClass('noPluginMessage'); } else { var plugin = $(tab).parent().find("input[name='funcTab']").val(); + var toolbar = $('#toolbar').closest('.navbar-default.toolbar'); + $('#toolbar ul.tools').html(''); $('#tabPanel').removeClass(function(i, css) { return (css.match(/\S+Tab/g) || []).join(' '); }); + + $(toolbar).removeClass(function(i, css) { + return (css.match(/\S+Selected/g) || []).join(' '); + }); + $('#tabPanel').addClass(plugin + 'Tab'); $('#tabPanel ul li').removeClass('active'); $.each($('#tabPanel li'), function(i, t) { @@ -224,6 +231,7 @@ wok.main = function() { $(tab).parent().addClass('active'); $(tab).addClass(plugin + 'Selected').focus(); + $(toolbar).addClass(plugin + 'Selected'); $('#functionalTabPanel ul li').removeClass('active'); $('#functionalTabPanel ul .' + plugin + 'Tab').parent().addClass('active').focus(); diff --git a/ui/pages/tabs/settings.html.tmpl b/ui/pages/tabs/settings.html.tmpl index 7bb03d4..dde05c8 100644 --- a/ui/pages/tabs/settings.html.tmpl +++ b/ui/pages/tabs/settings.html.tmpl @@ -32,11 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <body> <div id="wok-root-container" class="wok"> - <nav class="navbar navbar-default toolbar"> - <div class="container"> - <div id="toolbar"></div> - </div> - </nav> <div class="container"> <div id="wokSettings" class="wok-settings"> <!-- User Log Panel --> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index 22a67e7..c76082a 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -160,6 +160,13 @@ </div> </div> </nav> + <nav class="navbar navbar-default toolbar"> + <div class="container"> + <div id="toolbar"> + <ul class="nav navbar-nav navbar-right tools"></ul> + </div> + </div> + </nav> </div> <div class="content"> <div id="main"> -- 2.7.4

The user log activity lists all the actions done on Wok and its plugins. To better represent the action for a given plugin, the plugin color is display in addition to the plugin name. As plugin color is now specified on tab-ext.xml, store the value per plugin to be used on user log UI. This patch also removes CSS configuration used to set the plugin color. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- ui/css/settings.css | 32 -------------------------------- ui/css/src/settings.scss | 16 ---------------- ui/js/src/wok.main.js | 12 +++++++----- ui/js/wok.bootgrid.js | 2 +- 4 files changed, 8 insertions(+), 54 deletions(-) diff --git a/ui/css/settings.css b/ui/css/settings.css index 8c0b8cb..641b805 100644 --- a/ui/css/settings.css +++ b/ui/css/settings.css @@ -117,38 +117,6 @@ div#user-log-actions { vertical-align: middle; } -.label-primary.label-wok { - background-color: #d9182d; -} - -.label-primary.label-wok[href]:hover, .label-primary.label-wok[href]:focus { - background-color: #ab1323; -} - -.label-primary.label-kimchi { - background-color: #8cc63f; -} - -.label-primary.label-kimchi[href]:hover, .label-primary.label-kimchi[href]:focus { - background-color: #71a230; -} - -.label-primary.label-ginger { - background-color: #00578c; -} - -.label-primary.label-ginger[href]:hover, .label-primary.label-ginger[href]:focus { - background-color: #003759; -} - -.label-primary.label-gingerbase { - background-color: #008abf; -} - -.label-primary.label-gingerbase[href]:hover, .label-primary.label-gingerbase[href]:focus { - background-color: #00658c; -} - .bootgrid-table th > .column-header-anchor > .icon.fa { right: 6px; top: 4px; diff --git a/ui/css/src/settings.scss b/ui/css/src/settings.scss index 7a40a76..19abf9d 100644 --- a/ui/css/src/settings.scss +++ b/ui/css/src/settings.scss @@ -71,22 +71,6 @@ div#user-log-actions { vertical-align: middle; } -.label-primary.label-wok { - @include label-variant(map-get($colors, wok)); -} - -.label-primary.label-kimchi { - @include label-variant(map-get($colors, virtualizationSelected)); -} - -.label-primary.label-ginger { - @include label-variant(map-get($colors, hostTab)); -} - -.label-primary.label-gingerbase { - @include label-variant(map-get($colors, hostSelected)); -} - .bootgrid-table th>.column-header-anchor>.icon.fa { right: 6px; top: 4px; diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 90f3b1b..4b36400 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -20,6 +20,7 @@ wok.NOTIFICATION_INTERVAL = 2000 wok.tabMode = {}; +wok.pluginsColor = {}; wok.config = undefined; wok.getConfig(function(result) { @@ -81,7 +82,7 @@ wok.main = function() { return functionalTabHtml.join(''); }; - var parseTabs = function(xmlData) { + var parseTabs = function(plugin, xmlData) { var tabs = []; var funcNode = $(xmlData).find('functionality'); var functionality = funcNode.text(); @@ -117,13 +118,14 @@ wok.main = function() { return tabs; }; - var retrieveTabs = function(url) { + var retrieveTabs = function(plugin, url) { var tabs = []; $.ajax({ url : url, async : false, + context: plugin, success : function(xmlData) { - tabs = parseTabs(xmlData); + tabs = parseTabs(this, xmlData); }, statusCode : { 404: function() { @@ -139,7 +141,7 @@ wok.main = function() { var pluginI18nUrl = 'plugins/{plugin}/i18n.json'; var DEFAULT_HASH; var buildTabs = function(callback) { - var tabs = retrieveTabs(wokConfigUrl); + var tabs = retrieveTabs('wok', wokConfigUrl); wok.listPlugins(function(plugins) { $(plugins).each(function(i, p) { var url = wok.substitute(pluginConfigUrl, { @@ -151,7 +153,7 @@ wok.main = function() { wok.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)}, function(i18nObj){ //i18n is not define by plugin }, i18nUrl, true); - var pluginTabs = retrieveTabs(url); + var pluginTabs = retrieveTabs(p, url); if(pluginTabs.length > 0){ tabs.push.apply(tabs, pluginTabs); } diff --git a/ui/js/wok.bootgrid.js b/ui/js/wok.bootgrid.js index 7d634bb..ec3afd6 100644 --- a/ui/js/wok.bootgrid.js +++ b/ui/js/wok.bootgrid.js @@ -69,7 +69,7 @@ wok.createBootgrid = function(opts) { rowSelect: false, formatters: { "settings-user-log-app": function(column, row) { - return '<span class="label label-primary label-'+row.app+'">' +row.app+ '</span> '; + return '<span class="label label-primary" style="background-color:' + wok.pluginsColor[row.app] + '">' + row.app + '</span> '; }, "settings-user-log-message": function(column, row) { return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.message+'">' +row.message+ '</span> '; -- 2.7.4

The SCSS variables related to plugins must be specifiec on plugin source code instead of Wok. So remove them. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- ui/css/src/modules/_wok-variables.scss | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/ui/css/src/modules/_wok-variables.scss b/ui/css/src/modules/_wok-variables.scss index bed2588..57f88ba 100644 --- a/ui/css/src/modules/_wok-variables.scss +++ b/ui/css/src/modules/_wok-variables.scss @@ -44,7 +44,6 @@ $brand-success: #5cb85c !default; $brand-info: #5bc0de !default; $brand-warning: #f0ad4e !default; $brand-danger: #d9534f !default; -$storages-low: #8BC53E !default; $wok-dropdown: #4d4c4e !default; $fa-green: #a8d46f !default; $vnc-blue: #5ab3d4; @@ -52,35 +51,7 @@ $toggle-checkbox-trigger-bg: #a7a7a8; $toggle-checkbox-trigger-checked-bg: $brand-primary; $toggle-checkbox-label-bg: #d6d6d6; -$guestCharts: ( - lightGray: #e6e7e8, - mediumGray: #bbbdbf, - darkGray: #929497 -); - -//## Kimchi default colors - TODO remove these references and link do Sass Maps below - -$hosts-color: #008abf !default; -$guests-color: #8cc63f !default; -$templates-color: #00a6a0 !default; -$storage-color: #feb813 !default; -$networks-color: #7f1c7d !default; -$administration-color: #d9182d !default; - -$colors: ( - hostSelected: #008abf, - host: #008abf, - guests: #8cc63f, - templates: #00a6a0, - storage: #feb813, - network: #7f1c7d, - wok: #d9182d, - virtualizationTab: #59930c, - hostTab: #00578c, - virtualizationSelected: #8cc63f, - wokTab: #930c0c, - wokSelected: #d9182d -); + //== Scaffolding -- 2.7.4

Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- ui/pages/i18n.json.tmpl | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 220f8e5..ba29532 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -24,8 +24,6 @@ #silent _ = t.gettext #silent _t = t.gettext { - "Host": "$_("Host")", - "Virtualization": "$_("Virtualization")", "Wok": "$_("Wok")", "Settings": "$_("Settings")", -- 2.7.4

Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- ui/css/src/modules/_toolbar.scss | 9 --------- ui/css/wok.css | 7 ------- 2 files changed, 16 deletions(-) diff --git a/ui/css/src/modules/_toolbar.scss b/ui/css/src/modules/_toolbar.scss index dba1106..30d1022 100644 --- a/ui/css/src/modules/_toolbar.scss +++ b/ui/css/src/modules/_toolbar.scss @@ -57,15 +57,6 @@ } } -@media (min-width: $screen-sm-max) and (max-width: $screen-md-min) { - - .host-dashboard .container { - padding-right: 10px; - padding-left: 10px; - } - -} - @media (min-width: $screen-md-max) and (max-width: $screen-lg) { .navbar-default.toolbar .navbar-right.tools > li > a { diff --git a/ui/css/wok.css b/ui/css/wok.css index ba1246e..b1b63b4 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -316,13 +316,6 @@ html.in-progress .disabled { margin-right: 15px; } -@media (min-width: 991px) and (max-width: 992px) { - .host-dashboard .container { - padding-right: 10px; - padding-left: 10px; - } -} - @media (min-width: 1199px) and (max-width: 1200px) { .navbar-default.toolbar .navbar-right.tools > li > a { margin-left: 50px; -- 2.7.4