From 2d3d923a4e80bb1903cfc25660dda9ffc88befb7 Mon Sep 17 00:00:00 2001 From: benweet Date: Tue, 3 Dec 2013 09:27:15 +0000 Subject: [PATCH] Fixed School theme --- public/cache.manifest | 2 +- public/res-min/img/school-line.png | Bin 4789 -> 4770 bytes public/res-min/main.js | 5 +- public/res-min/themes/school.css | 198 +++++++++++----------- public/res/constants.js | 1 + public/res/extensions/workingIndicator.js | 2 +- public/res/img/school-line.png | Bin 4789 -> 4770 bytes public/res/themes/school.less | 35 +++- 8 files changed, 132 insertions(+), 111 deletions(-) diff --git a/public/cache.manifest b/public/cache.manifest index 7a033465..8abdaa6b 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Tue Dec 03 2013 00:20:09 +#Date Tue Dec 03 2013 09:23:45 CACHE: res/worker.js diff --git a/public/res-min/img/school-line.png b/public/res-min/img/school-line.png index cef43c77f98300eafc4b274331c9f6c5b06913fe..e60afbf18ba266bfcb64ac9d66a5a7100fda9694 100644 GIT binary patch delta 4649 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 diff --git a/public/res-min/main.js b/public/res-min/main.js index e8870271..cadcadaa 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -11549,7 +11549,8 @@ function printStackTrace(e) { e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-beta.herokuapp.com/"), e.THEME_LIST = { "default": "Default", gray: "Gray", - night: "Night" + night: "Night", + school: "School" }, e; }), define("storage", [ "underscore" ], function(e) { function t(t) { @@ -20484,7 +20485,7 @@ function() { }), define("extensions/workingIndicator", [ "jquery", "underscore", "classes/Extension" ], function(e, t, n) { var i, o, r = new n("workingIndicator", "Working Indicator"); return r.onAsyncRunning = function(e) { - i.toggleClass("working", e), o.toggleClass("hide", !1); + i.toggleClass("working", e), o.toggleClass("hide", !e); }, r.onReady = function() { i = e(document.body), o = e('
'), e(".working-indicator").append(o); for (var t = 0; 3 > t; t++) o.append(e('
').css({ diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index b7f6f7ed..83d18b22 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -38,7 +38,7 @@ textarea{overflow:auto;vertical-align:top} table{border-collapse:collapse;border-spacing:0} @media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important} a,a:visited{text-decoration:underline} a[href]:after{content:" (" attr(href) ")"} abbr[title]:after{content:" (" attr(title) ")"} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""} pre,blockquote{border:1px solid #999;page-break-inside:avoid} thead{display:table-header-group} tr,img{page-break-inside:avoid} img{max-width:100% !important} @page {margin:2cm .5cm}p,h2,h3{orphans:3;widows:3} h2,h3{page-break-after:avoid} .navbar{display:none} .table td,.table th{background-color:#fff !important} .btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important} .label{border:1px solid #000} .table{border-collapse:collapse !important} .table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)} -body{font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;font-size:14px;line-height:1.428571429;color:#1d1915;background-color:#f3f1ef} +body{font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;font-size:14px;line-height:1.428571429;color:#112130;background-color:#f5f3f2} input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit} button,input,select[multiple],textarea{background-image:none} a{color:#2080df;text-decoration:none}a:hover,a:focus{color:#165a9c;text-decoration:underline} @@ -46,9 +46,9 @@ a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outli img{vertical-align:middle} .img-responsive{display:block;max-width:100%;height:auto} .img-rounded{border-radius:6px} -.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#f3f1ef;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto} +.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#f5f3f2;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto} .img-circle{border-radius:50%} -hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid rgba(140,118,102,0.1)} +hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid rgba(143,121,104,0.1)} .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0} p{margin:0 0 10px} .lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}} @@ -75,7 +75,7 @@ h6,.h6{font-size:12px} h1 small,.h1 small{font-size:24px} h2 small,.h2 small{font-size:18px} h3 small,.h3 small,h4 small,.h4 small{font-size:14px} -.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #f3f1ef} +.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #f5f3f2} ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0} .list-unstyled{padding-left:0;list-style:none} .list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px} @@ -85,17 +85,17 @@ dt{font-weight:bold} dd{margin-left:0} @media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table;} .dl-horizontal dd:after{clear:both} .dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table;} .dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999} abbr.initialism{font-size:90%;text-transform:uppercase} -blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid rgba(140,118,102,0.075)}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25} +blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid rgba(143,121,104,0.075)}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25} blockquote p:last-child{margin-bottom:0} blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'} -blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid rgba(140,118,102,0.075);border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right} +blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid rgba(143,121,104,0.075);border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right} blockquote.pull-right small:before{content:''} blockquote.pull-right small:after{content:'\00A0 \2014'} q:before,q:after,blockquote:before,blockquote:after{content:""} address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429} code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace} -code{padding:2px 4px;font-size:90%;color:#1d1915;background-color:rgba(140,118,102,0.05);white-space:nowrap;border-radius:4px} -pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333;background-color:rgba(140,118,102,0.05);border:1px solid #e4deda;border-radius:4px}pre.prettyprint{margin-bottom:20px} +code{padding:2px 4px;font-size:90%;color:#112130;background-color:rgba(143,121,104,0.05);white-space:nowrap;border-radius:4px} +pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333;background-color:rgba(143,121,104,0.05);border:1px solid #dfdfdf;border-radius:4px}pre.prettyprint{margin-bottom:20px} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0} .pre-scrollable{max-height:340px;overflow-y:scroll} .container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container:before,.container:after{content:" ";display:table;} @@ -126,7 +126,7 @@ th{text-align:left} .table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd} .table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0} .table tbody+tbody{border-top:2px solid #ddd} -.table .table{background-color:#f3f1ef} +.table .table{background-color:#f5f3f2} .table-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px} .table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd} .table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px} @@ -151,13 +151,13 @@ select[multiple],select[size]{height:auto} select optgroup{font-size:inherit;font-style:inherit;font-family:inherit} input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto} -.form-control:-moz-placeholder{color:#d9d2cd} -.form-control::-moz-placeholder{color:#d9d2cd} -.form-control:-ms-input-placeholder{color:#d9d2cd} -.form-control::-webkit-input-placeholder{color:#d9d2cd} -.form-control{display:block;width:100%;height:38px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#67574b;vertical-align:middle;background-color:#fff;border:1px solid #e4deda;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)} -.form-control:focus{border-color:#e4deda;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(140, 118, 102, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(140, 118, 102, 0.6)} -.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#f3f1ef} +.form-control:-moz-placeholder{color:#c1d6e9} +.form-control::-moz-placeholder{color:#c1d6e9} +.form-control:-ms-input-placeholder{color:#c1d6e9} +.form-control::-webkit-input-placeholder{color:#c1d6e9} +.form-control{display:block;width:100%;height:38px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#32638e;vertical-align:middle;background-color:#fff;border:1px solid #dfdfdf;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)} +.form-control:focus{border-color:#dfdfdf;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(143, 121, 104, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(143, 121, 104, 0.6)} +.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#f5f3f2} textarea.form-control{height:auto} .form-group{margin-bottom:15px} .radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer} @@ -180,7 +180,7 @@ textarea.input-lg{height:auto} .has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b} .has-success .input-group-addon{color:#468847;border-color:#468847;background-color:#dff0d8} .form-control-static{margin-bottom:0;padding-top:7px} -.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#67574b} +.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#32638e} @media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle} .form-inline .form-control{display:inline-block} .form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0} .form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}} .form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px} .form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{content:" ";display:table;} @@ -189,15 +189,15 @@ textarea.input-lg{height:auto} .form-horizontal .form-group:after{clear:both} @media (min-width:768px){.form-horizontal .control-label{text-align:right}} .btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} -.btn:hover,.btn:focus{color:#423830;text-decoration:none} +.btn:hover,.btn:focus{color:#21425f;text-decoration:none} .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],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} -.btn-default{color:#423830;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#423830;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} +.btn-default{color:#21425f;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#21425f;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none} .btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]: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:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} -.btn-primary{color:#423830;background-color:#e8e3e0;border-color:rgba(140,118,102,0.05)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#423830;background-color:#d7cfc8;border-color:rgba(105,88,76,0.05)} +.btn-primary{color:#21425f;background-color:#e4e4e4;border-color:rgba(121,121,121,0.05)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#21425f;background-color:#d0d0d0;border-color:rgba(90,90,90,0.05)} .btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none} -.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]: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:#e8e3e0;border-color:rgba(140,118,102,0.05)} +.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]: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:#e4e4e4;border-color:rgba(121,121,121,0.05)} .btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512} .btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none} .btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]: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;border-color:#eea236} @@ -207,7 +207,7 @@ textarea.input-lg{height:auto} .btn-success{color:#eee;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#eee;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none} .btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]: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:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} -.btn-info{color:rgba(140,118,102,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:rgba(140,118,102,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} +.btn-info{color:rgba(143,121,104,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:rgba(143,121,104,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none} .btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]: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:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-link{color:#2080df;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none} @@ -427,23 +427,23 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button" .caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;border-bottom:0 dotted;content:""} .dropdown{position:relative} .dropdown-toggle:focus{outline:0} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid #e4deda;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto} -.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e4deda} -.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#1d1915;white-space:nowrap} -.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#423830;background-color:rgba(140,118,102,0.04)} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid #dfdfdf;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto} +.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#dfdfdf} +.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#112130;white-space:nowrap} +.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#393939;background-color:rgba(143,121,104,0.04)} .dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca} -.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#d9d2cd} +.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#c1d6e9} .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed} .open>.dropdown-menu{display:block} .open>a{outline:0} -.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:rgba(140,118,102,0.5)} +.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:rgba(67,131,189,0.5)} .dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990} .pull-right>.dropdown-menu{right:0;left:auto} .dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""} .dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px} -@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#423830} +@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#21425f} .btn-primary .caret,.btn-success .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret{border-top-color:#fff} -.dropup .btn-default .caret{border-bottom-color:#423830} +.dropup .btn-default .caret{border-bottom-color:#21425f} .dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff} .btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2} .btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:none} @@ -494,7 +494,7 @@ textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto} .input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0} .input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle} -.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#f3f1ef;border:1px solid #e4deda;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px} +.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#f5f3f2;border:1px solid #dfdfdf;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px} .input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px} .input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0} .input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0} @@ -508,16 +508,16 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav:after{clear:both} .nav:before,.nav:after{content:" ";display:table;} .nav:after{clear:both} -.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:rgba(140,118,102,0.04)} -.nav>li.disabled>a{color:#d9d2cd}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#d9d2cd;text-decoration:none;background-color:transparent;cursor:not-allowed} -.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:rgba(140,118,102,0.04);border-color:#2080df} +.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:rgba(143,121,104,0.04)} +.nav>li.disabled>a{color:#c1d6e9}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#c1d6e9;text-decoration:none;background-color:transparent;cursor:not-allowed} +.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:rgba(143,121,104,0.04);border-color:#2080df} .nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5} .nav>li>a>img{max-width:none} .nav-tabs{border-bottom:1px solid rgba(0,0,0,0)}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0)} -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#f3f1ef;border:1px solid #ddd;border-bottom-color:transparent;cursor:default} +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#f5f3f2;border:1px solid #ddd;border-bottom-color:transparent;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center} @media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}}.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;margin-right:0} -.nav-tabs.nav-justified>.active>a{border-bottom-color:#f3f1ef} +.nav-tabs.nav-justified>.active>a{border-bottom-color:#f5f3f2} .nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px} .nav-pills>li+li{margin-left:2px} .nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca} @@ -525,7 +525,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center} @media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}} .nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;margin-right:0} -.nav-tabs-justified>.active>a{border-bottom-color:#f3f1ef} +.nav-tabs-justified>.active>a{border-bottom-color:#f5f3f2} .tabbable:before,.tabbable:after{content:" ";display:table;} .tabbable:after{clear:both} .tabbable:before,.tabbable:after{content:" ";display:table;} @@ -616,7 +616,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd;margin-left:-1px} .pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px} .pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px} -.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#f3f1ef} +.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#f5f3f2} .pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default} .pagination>.disabled>span,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed} .pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px} @@ -630,7 +630,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .pager:before,.pager:after{content:" ";display:table;} .pager:after{clear:both} .pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px} -.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f3f1ef} +.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f3f2} .pager .next>a,.pager .next>span{float:right} .pager .previous>a,.pager .previous>span{float:left} .pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed} @@ -647,14 +647,14 @@ a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} .btn .badge{position:relative;top:-1px} a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#2080df;background-color:#fff} .nav-pills>li>a>.badge{margin-left:3px} -.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#f3f1ef}.jumbotron h1{line-height:1;color:inherit} +.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#f5f3f2}.jumbotron h1{line-height:1;color:inherit} .jumbotron p{line-height:1.4} .container .jumbotron{border-radius:6px} @media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-left:60px;padding-right:60px} .jumbotron h1{font-size:63px}} -.thumbnail{padding:4px;line-height:1.428571429;background-color:#f3f1ef;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto;display:block}.thumbnail>img{height:auto;display:block;max-width:100%;height:auto} +.thumbnail{padding:4px;line-height:1.428571429;background-color:#f5f3f2;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto;display:block}.thumbnail>img{height:auto;display:block;max-width:100%;height:auto} a.thumbnail:hover,a.thumbnail:focus{border-color:#2080df} .thumbnail>img{margin-left:auto;margin-right:auto} -.thumbnail .caption{padding:9px;color:#1d1915} +.thumbnail .caption{padding:9px;color:#112130} .alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit} .alert .alert-link{font-weight:bold} .alert>p,.alert>ul{margin-bottom:0} @@ -685,13 +685,13 @@ a.thumbnail:hover,a.thumbnail:focus{border-color:#2080df} .media>.pull-right{margin-left:10px} .media-list{padding-left:0;list-style:none} .list-group{margin-bottom:20px;padding-left:0} -.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#f3f1ef;border:1px solid rgba(0,0,0,0)}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px} +.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#f5f3f2;border:1px solid rgba(0,0,0,0)}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px} .list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px} .list-group-item>.badge{float:right} .list-group-item>.badge+.badge{margin-right:5px} -a.list-group-item{color:#1d1915}a.list-group-item .list-group-item-heading{color:#333} -a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:rgba(140,118,102,0.04)} -.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#423830;background-color:#e8e3e0;border-color:rgba(140,118,102,0.05)}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit} +a.list-group-item{color:#112130}a.list-group-item .list-group-item-heading{color:#333} +a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:rgba(143,121,104,0.04)} +.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#393939;background-color:#e4e4e4;border-color:rgba(121,121,121,0.05)}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{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{color:#fff} .list-group-item-heading{margin-top:0;margin-bottom:5px} .list-group-item-text{margin-bottom:0;line-height:1.3} @@ -726,20 +726,20 @@ a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background- .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)} .well-lg{padding:24px;border-radius:6px} .well-sm{padding:9px;border-radius:3px} -.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#1d1915;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#1d1915;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)} +.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#112130;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#112130;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)} button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none} .modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px} .modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-transform:translate(0, -25%);transform:translate(0, -25%);-webkit-transition:-webkit-transform 0.3s ease-out;-moz-transition:-moz-transform 0.3s ease-out;-o-transition:-o-transform 0.3s ease-out;transition:transform 0.3s ease-out} .modal.in .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)} .modal-dialog{margin-left:auto;margin-right:auto;width:auto;padding:10px;z-index:1050} -.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid #e4deda;border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none} -.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#8c7666}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)} +.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid #dfdfdf;border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none} +.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#797979}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)} .modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)} -.modal-header{padding:15px;border-bottom:1px solid #ede9e6;min-height:16.428571429px} +.modal-header{padding:15px;border-bottom:1px solid #e9e9e9;min-height:16.428571429px} .modal-header .close{margin-top:-2px} .modal-title{margin:0;line-height:1.428571429} .modal-body{position:relative;padding:20px} -.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #ede9e6}.modal-footer:before,.modal-footer:after{content:" ";display:table;} +.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e9e9e9}.modal-footer:before,.modal-footer:after{content:" ";display:table;} .modal-footer:after{clear:both} .modal-footer:before,.modal-footer:after{content:" ";display:table;} .modal-footer:after{clear:both} @@ -761,7 +761,7 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000} .tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#000} .tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#000} -.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#efebe9;background-clip:padding-box;border:1px solid #ccc;border:1px solid #e4deda;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);white-space:normal}.popover.top{margin-top:-10px} +.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#f1eeec;background-clip:padding-box;border:1px solid #ccc;border:1px solid #dfdfdf;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);white-space:normal}.popover.top{margin-top:-10px} .popover.right{margin-left:10px} .popover.bottom{margin-top:10px} .popover.left{margin-left:-10px} @@ -770,10 +770,10 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap .popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid} .popover .arrow{border-width:11px} .popover .arrow:after{border-width:10px;content:""} -.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:#e4deda;bottom:-11px}.popover.top .arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#efebe9} -.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:#e4deda}.popover.right .arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#efebe9} -.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:#e4deda;top:-11px}.popover.bottom .arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#efebe9} -.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:#e4deda}.popover.left .arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#efebe9;bottom:-10px} +.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:#dfdfdf;bottom:-11px}.popover.top .arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#f1eeec} +.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:#dfdfdf}.popover.right .arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#f1eeec} +.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:#dfdfdf;top:-11px}.popover.bottom .arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#f1eeec} +.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:#dfdfdf}.popover.left .arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#f1eeec;bottom:-10px} .carousel{position:relative} .carousel-inner{position:relative;overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto;line-height:1} .carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block} @@ -1197,7 +1197,7 @@ h4,h5,h6{margin:25px 0 15px} p,pre,blockquote{margin:0 0 15px} hr{margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} -pre{padding:9.5px !important;border:1px solid #e4deda !important}pre code{background-color:transparent !important} +pre{padding:9.5px !important;border:1px solid #dfdfdf !important}pre code{background-color:transparent !important} dt,dd{margin-top:5px;margin-bottom:5px} dd{margin-left:40px} table{margin-bottom:20px} @@ -1206,7 +1206,7 @@ table th{font-weight:bold} table thead th{vertical-align:bottom} table caption+thead tr:first-child th,table caption+thead tr:first-child td,table colgroup+thead tr:first-child th,table colgroup+thead tr:first-child td,table thead:first-child tr:first-child th,table thead:first-child tr:first-child td{border-top:0} table tbody+tbody{border-top:2px solid #dddddd} -blockquote{border-left-width:10px;background-color:rgba(140,118,102,0.05);border-top-right-radius:5px;border-bottom-right-radius:5px;padding:15px 20px}blockquote p{margin-bottom:15px;font-size:14px;line-height:1.428571429} +blockquote{border-left-width:10px;background-color:rgba(143,121,104,0.05);border-top-right-radius:5px;border-bottom-right-radius:5px;padding:15px 20px}blockquote p{margin-bottom:15px;font-size:14px;line-height:1.428571429} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px}ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .toc ul{list-style-type:none;margin-bottom:5px} @@ -1375,25 +1375,25 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .working{cursor:progress} .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} .dropdown-menu,.modal-content,.panel-content,.search-bar{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.125);box-shadow:0 6px 12px rgba(0,0,0,0.125)} -.dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(140,118,102,0.1)} +.dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(121,121,121,0.1)} .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} -.modal-content{background-color:#f3f1ef} +.modal-content{background-color:#f5f3f2} .modal-body{background-color:#fff;padding-bottom:30px} .modal-footer{margin-top:0} a{-webkit-transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s;transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s} -.list-group .nav{border-left:10px solid #e8e3e0;margin-left:15px}.list-group .nav>li>a{border-top:1px solid rgba(0,0,0,0);border-bottom:1px solid rgba(0,0,0,0)}.list-group .nav>li>a:hover,.list-group .nav>li>a:focus{border-top-color:rgba(140,118,102,0.1);border-bottom-color:rgba(140,118,102,0.1)} -.list-group .nav>li>a.active{border-top-color:rgba(140,118,102,0.05);border-bottom-color:rgba(140,118,102,0.05)} -.nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{border-color:rgba(140,118,102,0.1)} +.list-group .nav{border-left:10px solid #e4e4e4;margin-left:15px}.list-group .nav>li>a{border-top:1px solid rgba(0,0,0,0);border-bottom:1px solid rgba(0,0,0,0)}.list-group .nav>li>a:hover,.list-group .nav>li>a:focus{border-top-color:rgba(121,121,121,0.1);border-bottom-color:rgba(121,121,121,0.1)} +.list-group .nav>li>a.active{border-top-color:rgba(121,121,121,0.05);border-bottom-color:rgba(121,121,121,0.05)} +.nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{border-color:rgba(121,121,121,0.1)} .nav-pills>li.disabled>a:hover,.nav-pills>li.disabled>a:focus{border-color:rgba(0,0,0,0)} -.nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{border-color:rgba(140,118,102,0.1)} +.nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{border-color:rgba(121,121,121,0.1)} .list-group-item{padding:10px 15px;margin-bottom:0}.list-group .list-group-item{border-radius:0} -a.list-group-item:hover,a.list-group-item:focus{color:#332b26;border-top-color:rgba(140,118,102,0.1);border-bottom-color:rgba(140,118,102,0.1)} +a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:rgba(121,121,121,0.1);border-bottom-color:rgba(121,121,121,0.1)} .move-to-front{z-index:1050 !important} .btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s;transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s} -.btn-default:hover,.btn-default:focus,.btn-default:active,.open .btn-default.dropdown-toggle{color:#332b26;border-color:rgba(140,118,102,0.1);background-color:rgba(140,118,102,0.04) !important} -.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.open .btn-primary.dropdown-toggle{color:#332b26;border-color:rgba(140,118,102,0.1);background-color:#e1dbd7 !important} -.btn-success:hover,.btn-success:focus,.btn-success:active,.open .btn-success.dropdown-toggle{color:#332b26;border-color:rgba(140,118,102,0.1);background-color:rgba(140,118,102,0.075) !important} -.btn-info:hover,.btn-info:focus,.btn-info:active,.open .btn-info.dropdown-toggle{color:#332b26;border-color:rgba(140,118,102,0.1);background-color:#efebe9 !important} +.btn-default:hover,.btn-default:focus,.btn-default:active,.open .btn-default.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:rgba(143,121,104,0.04) !important} +.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.open .btn-primary.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:#dcdcdc !important} +.btn-success:hover,.btn-success:focus,.btn-success:active,.open .btn-success.dropdown-toggle{color:#2d2d2d;border-color:#6c6c6c;background-color:#4d816e !important} +.btn-info:hover,.btn-info:focus,.btn-info:active,.open .btn-info.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:#f1eeec !important} .btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:0} .btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px} .form-inline .form-control{display:inline-block} @@ -1416,7 +1416,7 @@ a.list-group-item:hover,a.list-group-item:focus{color:#332b26;border-top-color:r .input-group-btn .btn i{font-size:120%} .input-group-btn:first-child .btn{margin-right:6px} .input-group-btn:last-child .btn{margin-left:6px} -.navbar{position:static;padding:0;border:0;border-top:1px solid rgba(140,118,102,0.1);border-radius:0}.navbar .left-space,.navbar .right-space{width:25px;height:38px} +.navbar{position:static;padding:0;border:0;border-top:1px solid #6c6c6c;border-radius:0}.navbar .left-space,.navbar .right-space{width:25px;height:38px} .navbar .nav{float:left;margin:5px 10px;height:38px}.navbar .nav>li{display:inline-block} .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px} @@ -1426,30 +1426,30 @@ a.list-group-item:hover,a.list-group-item:focus{color:#332b26;border-top-color:r .navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:60px;padding-top:9px}.navbar .working-indicator .bar{display:inline-block;width:14px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#eee;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} .navbar .left-buttons-dropdown>.nav,.navbar .right-buttons-dropdown>.nav{margin-left:0;margin-right:0} .navbar div.dropdown-menu{top:initial;padding:5px} -@keyframes indicator{from{opacity:1} to{opacity:0.25}}@-webkit-keyframes indicator /* Safari and Chrome */{from{opacity:1} to{opacity:0.25}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial}.menu-panel .collapse-button,.document-panel .collapse-button{background-color:#fff;height:38px;border-radius:8px;position:absolute;margin-top:6px;-webkit-box-shadow:0 0 1px rgba(0,0,0,.5);box-shadow:0 0 1px rgba(0,0,0,.5)}.menu-panel .collapse-button:active,.document-panel .collapse-button:active{-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5)} +@keyframes indicator{from{opacity:1} to{opacity:0.25}}@-webkit-keyframes indicator /* Safari and Chrome */{from{opacity:1} to{opacity:0.25}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial}.menu-panel .collapse-button,.document-panel .collapse-button{background-color:#ccc;height:38px;border-radius:8px;position:absolute;margin-top:6px;-webkit-box-shadow:0 0 1px rgba(0,0,0,.5);box-shadow:0 0 1px rgba(0,0,0,.5)}.menu-panel .collapse-button:active,.document-panel .collapse-button:active{-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5)} .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#737373;font-size:14px} .menu-panel .collapse-button:hover,.document-panel .collapse-button:hover,.menu-panel.in .collapse-button,.document-panel.in .collapse-button,.menu-panel.collapsing .collapse-button,.document-panel.collapsing .collapse-button{border-width:1px} .menu-panel .panel-content,.document-panel .panel-content{overflow:auto;padding-bottom:30px;height:100%}.menu-panel .panel-content a>i,.document-panel .panel-content a>i{color:inherit} -.menu-panel{width:280px !important;margin-left:-295px;-webkit-transition:margin-left ease-in-out 0.35s;transition:margin-left ease-in-out 0.35s}.menu-panel .sub-menu{background-color:#f3f1ef} +.menu-panel{width:280px !important;margin-left:-295px;-webkit-transition:margin-left ease-in-out 0.35s;transition:margin-left ease-in-out 0.35s}.menu-panel .sub-menu{background-color:#f5f3f2} .menu-panel.in{margin-left:0} .menu-panel .collapse-button{border-top:4px solid rgba(255,217,0,0.75);border-right:5px solid rgba(51,153,255,0.75);border-bottom:4px solid rgba(255,97,13,0.75);right:-50px;z-index:-1;padding:0 13px 0 50px;-webkit-transition:border-width ease-in-out .15s, right ease-in-out 0.15s;transition:border-width ease-in-out .15s, right ease-in-out 0.15s} .menu-panel .collapse-button:hover,.menu-panel.in .collapse-button,.menu-panel.collapsing .collapse-button{right:-55px} -.menu-panel .panel-content{background-color:#f3f1ef;padding-top:6px;border-right:1px solid #ede9e6}.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} +.menu-panel .panel-content{background-color:#f5f3f2;padding-top:6px;border-right:1px solid #e9e9e9}.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} .document-panel{right:0;width:340px !important;margin-right:-355px;-webkit-transition:margin-right ease-in-out 0.35s;transition:margin-right ease-in-out 0.35s}.document-panel.in{margin-right:0} .document-panel .collapse-button{border-top:4px solid rgba(255,217,0,0.75);border-left:5px solid rgba(141,194,19,0.75);border-bottom:4px solid rgba(255,97,13,0.75);left:-50px;padding:0 50px 0 6px;z-index:-1;-webkit-transition:border-width ease-in-out .15s, left ease-in-out 0.15s;transition:border-width ease-in-out .15s, left ease-in-out 0.15s}.document-panel .collapse-button i.icon-folder-open{font-size:19px;padding-bottom:1px} .document-panel .collapse-button:hover,.document-panel.in .collapse-button,.document-panel.collapsing .collapse-button{left:-55px} -.document-panel .panel-content{background-color:#f3f1ef;padding-top:80px;border-left:1px solid #ede9e6}.document-panel .panel-content .icon-layers{font-size:135%} -.document-panel .search-bar{position:absolute;background-color:#efebe9;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #e4deda;border-top:0;border-radius:6px} +.document-panel .panel-content{background-color:#f5f3f2;padding-top:80px;border-left:1px solid #e9e9e9}.document-panel .panel-content .icon-layers{font-size:135%} +.document-panel .search-bar{position:absolute;background-color:#f1eeec;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #dfdfdf;border-top:0;border-radius:6px} .document-panel .list-group-item{margin:0} -.document-panel .folder{font-weight:bold;color:#423830;border-top-color:#f1eeec} +.document-panel .folder{font-weight:bold;color:#21425f;border-top-color:#eee} .document-panel .list-group{margin:0}.document-panel .list-group .nav{border:0;margin:0}.document-panel .list-group .nav .file{padding-left:30px;padding-right:30px} .dropdown-file-selector{top:6px;right:30px;left:auto;margin:0;min-width:280px;max-width:400px;overflow-x:hidden;max-height:400px;overflow-y:auto} .modal-document-manager .nav-pills{margin-bottom:15px} -.modal-document-manager .list-group{background-color:#f3f1ef}.modal-document-manager .list-group .nav{margin-bottom:30px;border:0;margin:0}.modal-document-manager .list-group .nav .file{padding-left:20px} +.modal-document-manager .list-group{background-color:#f5f3f2}.modal-document-manager .list-group .nav{margin-bottom:30px;border:0;margin:0}.modal-document-manager .list-group .nav .file{padding-left:20px} .modal-document-manager .list-group-item{padding:3px;margin:0}.modal-document-manager .list-group-item i{margin-right:3px} .modal-document-manager .list-group-item .btn{float:right}.modal-document-manager .list-group-item .btn i{margin:0;font-size:105%}.modal-document-manager .list-group-item .btn i.icon-pencil{font-size:115%} .modal-document-manager .file-list .list-group-item{padding:0 3px} -.modal-document-manager .folder{font-weight:bold;color:#423830;font-size:15px;border-top-color:#f1eeec} +.modal-document-manager .folder{font-weight:bold;color:#21425f;font-size:15px;border-top-color:#eee} .modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} @@ -1467,13 +1467,13 @@ a.list-group-item:hover,a.list-group-item:focus{color:#332b26;border-top-color:r .ui-layout-resizer-south .extension-editor-buttons{right:0} .modal-settings .modal-header{padding-bottom:0} .modal-settings textarea{max-width:100%;min-height:100px} -.modal-settings .panel{border:0;border-radius:inherit;background:#fff;border-bottom:1px solid #f1eeec;-webkit-box-shadow:none;box-shadow:none} +.modal-settings .panel{border:0;border-radius:inherit;background:#fff;border-bottom:1px solid #eee;-webkit-box-shadow:none;box-shadow:none} .modal-settings .accordion-heading{padding:12px 15px}.modal-settings .accordion-heading .checkbox{margin-top:0;margin-bottom:0} .modal-settings .accordion-inner{border:0;padding:10px 40px 20px}.modal-settings .accordion-inner .form-horizontal .control-label{text-align:left} .modal-settings .accordion-inner .form-horizontal .form-inline .label-text{margin-left:15px} .modal-settings .tab-pane-button-container{width:220px;margin:10px auto 20px}.modal-settings .tab-pane-button-container .btn{text-align:initial;padding-left:15px} -.modal-settings .nav-tabs{margin:15px 0 0}.modal-settings .nav-tabs>li>a:hover,.modal-settings .nav-tabs>li>a:focus{color:#332b26;border-color:rgba(140,118,102,0.1);background-color:rgba(140,118,102,0.04);border-bottom-color:rgba(0,0,0,0)} -.modal-settings .nav-tabs>li.active>a,.modal-settings .nav-tabs>li.active>a:hover,.modal-settings .nav-tabs>li.active>a:focus{color:#423830;background-color:#e8e3e0;border-color:rgba(140,118,102,0.05);border-bottom-color:rgba(0,0,0,0)} +.modal-settings .nav-tabs{margin:15px 0 0}.modal-settings .nav-tabs>li>a:hover,.modal-settings .nav-tabs>li>a:focus{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:rgba(143,121,104,0.04);border-bottom-color:rgba(0,0,0,0)} +.modal-settings .nav-tabs>li.active>a,.modal-settings .nav-tabs>li.active>a:hover,.modal-settings .nav-tabs>li.active>a:focus{color:#21425f;background-color:#e4e4e4;border-color:rgba(121,121,121,0.05);border-bottom-color:rgba(0,0,0,0)} .modal-manage-sync .sync-list,.modal-manage-publish .publish-list,.modal-manage-sharing .share-list{margin-bottom:20px}.modal-manage-sync .sync-list .input-group,.modal-manage-publish .publish-list .input-group,.modal-manage-sharing .share-list .input-group{margin-bottom:10px} .share-list .form-control{width:280px} .publish-custom-template-collapse{margin-bottom:0}.publish-custom-template-collapse textarea{max-width:100%;min-height:100px} @@ -1486,44 +1486,44 @@ a.list-group-item:hover,a.list-group-item:focus{color:#332b26;border-top-color:r .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-north{left:0 !important;line-height:0}.ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-north i{font-size:16px;height:9.5px;overflow:hidden} .ui-layout-resizer.ui-layout-resizer-east .ui-layout-toggler-north{width:35px !important;height:60px !important} .ui-layout-resizer.ui-layout-resizer-south .ui-layout-toggler-north{height:35px !important} -.ui-layout-resizer-north{background-color:#385e50;border-bottom:1px solid rgba(140,118,102,0.1)} -.resizer-decorator{position:absolute;display:block !important}.ui-layout-resizer-east .resizer-decorator{width:35px;height:100%;border-left:1px solid rgba(140,118,102,0.06)} -.ui-layout-resizer-south .resizer-decorator{height:35px;width:100%;border-top:1px solid rgba(140,118,102,0.06)} +.ui-layout-resizer-north{background-color:#385e50;border-bottom:1px solid #6c6c6c} +.resizer-decorator{position:absolute;display:block !important}.ui-layout-resizer-east .resizer-decorator{width:35px;height:100%;border-left:1px solid rgba(121,121,121,0.06)} +.ui-layout-resizer-south .resizer-decorator{height:35px;width:100%;border-top:1px solid rgba(121,121,121,0.06)} .ace_editor{color:#5690c4} .ace-tm{background-color:#fff}.ace-tm .ace_text-input{box-sizing:initial} -.ace-tm .ace_marker-layer .ace_active-line{background-color:rgba(140,118,102,0.05)} -.ace-tm .ace_cursor{color:#332b26} -.ace-tm .ace_print-margin{background-color:rgba(140,118,102,0.05)} +.ace-tm .ace_marker-layer .ace_active-line{background-color:rgba(121,121,121,0.05)} +.ace-tm .ace_cursor{color:#2d2d2d} +.ace-tm .ace_print-margin{background-color:rgba(121,121,121,0.05)} .ace-tm .ace_markup.ace_heading{color:#1b354c;font-weight:bold} .ace-tm .ace_markup.ace_list{color:#1b354c} .ace-tm .ace_constant.ace_language{color:#699cca} -.ace-tm .ace_meta.ace_tag{color:#1b354c;font-style:italic;font-weight:bold;background-color:rgba(140,118,102,0.05)} +.ace-tm .ace_meta.ace_tag{color:#1b354c;font-style:italic;font-weight:bold;background-color:rgba(143,121,104,0.05)} .ace-tm .ace_keyword.ace_operator{color:#3c76ab;background-color:transparent} -.ace-tm .ace_keyword{color:#1b354c;background-color:rgba(140,118,102,0.05);font-weight:bold} -.ace-tm .ace_string{color:#1b354c;font-style:italic;background-color:rgba(140,118,102,0.05)} +.ace-tm .ace_keyword{color:#1b354c;background-color:rgba(143,121,104,0.05);font-weight:bold} +.ace-tm .ace_string{color:#1b354c;font-style:italic;background-color:rgba(143,121,104,0.05)} .ace-tm .ace_invalid{color:inherit;background:inherit} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#1b354c;font-style:italic} .ace-tm .ace_blockquote{color:#699cca} -.ace-tm .ace_code{color:#1b354c;background-color:rgba(140,118,102,0.05)} +.ace-tm .ace_code{color:#1b354c;background-color:rgba(143,121,104,0.05)} .ace-tm .ace_code_block{color:#1b354c} -.ace-tm .ace_link{color:#1b354c;background-color:rgba(140,118,102,0.05)} +.ace-tm .ace_link{color:#1b354c;background-color:rgba(143,121,104,0.05)} .ace-tm .ace_description{color:#699cca} .ace-tm .ace_constant{color:#3c76ab} .ace-tm .ace_comment{color:rgba(86,144,196,0.5);font-style:italic} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} -.ace_search{background-color:#f3f1ef;border:1px solid #ede9e6;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#e4deda;margin-bottom:10px} +.ace_search{background-color:#f5f3f2;border:1px solid #e9e9e9;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#dfdfdf;margin-bottom:10px} .ace_search .ace_search_field{width:185px} -.ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#67574b;vertical-align:middle;background-color:#fff;border-color:#e4deda;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} +.ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#32638e;vertical-align:middle;background-color:#fff;border-color:#dfdfdf;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} .ace_search .ace_searchbtn{background-image:none;font-family:"fontello";width:auto;font-size:16px}.ace_search .ace_searchbtn.next:before{content:'\e880'} .ace_search .ace_searchbtn.prev:before{content:'\e87f'} .ace_search .ace_replacebtn{padding:0 4px} .ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #fff;opacity:.3;filter:alpha(opacity=30)}.ace_search .ace_searchbtn_close:before{content:'\d7'} -.ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#1d1915;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50);background:transparent} +.ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#112130;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50);background:transparent} #wmd-input{border-radius:0;color:#3c76ab;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none}div#wmd-input{padding:0} -.preview-container{overflow:auto;background-color:#f3f1ef} +.preview-container{overflow:auto;background-color:#f5f3f2} .wmd-prompt-background{display:none} -div.dropdown-menu{padding:5px 20px;background-color:#efebe9}div.dropdown-menu p,div.dropdown-menu blockquote{margin:10px 0} +div.dropdown-menu{padding:5px 20px;background-color:#f1eeec}div.dropdown-menu p,div.dropdown-menu blockquote{margin:10px 0} div.dropdown-menu .stat{margin-bottom:10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none} @@ -1545,11 +1545,13 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important} .popover .icon-lock{font-size:38px;margin:5px} .popover .disabled{display:none} div.jGrowl{z-index:1040;font-size:inherit}div.jGrowl.bottom-right{right:30px} -div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:rgba(140,118,102,0.9);width:260px;margin:20px 0;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px} +div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:rgba(121,121,121,0.9);width:260px;margin:20px 0;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px} div.jGrowl div.jGrowl-notification{min-height:80px} .viewer .document-panel .search-bar{padding:20px 20px 10px}.viewer .document-panel .search-bar .input-group-btn{display:none} .viewer .ui-layout-toggler{display:none !important} .viewer .navbar .file-title-navbar{cursor:initial;-webkit-box-shadow:none;box-shadow:none} +.btn-success:hover,.btn-success:focus,.btn-success:active,.open .btn-success.dropdown-toggle{color:#eee;border-color:#56917c} +.navbar .dropdown-menu{background-color:#3f695a;border-color:#6c6c6c} @font-face{font-family:'cursive_standardregular';src:url('../font/cursive_standard-webfont.eot');src:url('../font/cursive_standard-webfont.eot?#iefix') format('embedded-opentype'),url('../font/cursive_standard-webfont.woff') format('woff'),url('../font/cursive_standard-webfont.ttf') format('truetype'),url('../font/cursive_standard-webfont.svg#cursive_standardregular') format('svg');font-weight:normal;font-style:normal}.ace-tm .ace_content{background-image:url("../img/school-line.png");background-repeat:repeat} .ace-tm .ace_marker-layer .ace_active-line{background-color:rgba(40,79,114,0.05)} .ace-tm .ace_print-margin{background-color:rgba(181,110,133,0.5)} diff --git a/public/res/constants.js b/public/res/constants.js index a043a52c..0480d32a 100644 --- a/public/res/constants.js +++ b/public/res/constants.js @@ -74,6 +74,7 @@ define([], function() { "default": "Default", "gray": "Gray", "night": "Night", + "school": "School", }; return constants; diff --git a/public/res/extensions/workingIndicator.js b/public/res/extensions/workingIndicator.js index 984666cb..f983fdc7 100644 --- a/public/res/extensions/workingIndicator.js +++ b/public/res/extensions/workingIndicator.js @@ -10,7 +10,7 @@ define([ var $workingIndicatorElt; workingIndicator.onAsyncRunning = function (isRunning) { $bodyElt.toggleClass("working", isRunning); - $workingIndicatorElt.toggleClass("hide", !true); + $workingIndicatorElt.toggleClass("hide", !isRunning); }; workingIndicator.onReady = function () { diff --git a/public/res/img/school-line.png b/public/res/img/school-line.png index cef43c77f98300eafc4b274331c9f6c5b06913fe..e60afbf18ba266bfcb64ac9d66a5a7100fda9694 100644 GIT binary patch delta 4649 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 diff --git a/public/res/themes/school.less b/public/res/themes/school.less index 116d7191..6ddf187e 100644 --- a/public/res/themes/school.less +++ b/public/res/themes/school.less @@ -7,24 +7,41 @@ @red-ink: #B56E85; @green-ink: #6c9c7f; @navbar-default-bg: @board-color; -@bg-navbar-hover: lighten(@board-color, 4%); -@primary: darken(@board-border-color, 20%); +@bg-navbar-hover: darken(@board-color, 4%); +@primary: desaturate(darken(@board-border-color, 20%), 20%); @primary-color: lighten(@blue-ink, 30%); +@secondary-color: lighten(@blue-ink, 20%); @tertiary-color: lighten(@blue-ink, 30%); @secondary: @primary; @tertiary: @primary; @primary-desaturated: @primary; -@secondary-desaturated: darken(@board-border-color, 20%); +@secondary-desaturated: darken(@board-border-color, 19%); @tertiary-desaturated: @tertiary; -//@primary-bg: lighten(@board-border-color, 16%); -//@primary-bg-light: lighten(@board-border-color, 20%); -//@primary-bg-lighter: lighten(@board-border-color, 24%); +@primary-border-color: darken(@primary, 5%); +@modal-backdrop-bg: @primary; @btn-success-color: #eee; -//@btn-success-bg: @transparent; -//@title-base-size: 18px; -//@panel-button-color: #666; +@btn-success-bg: @transparent; +@btn-success-border: @transparent; +@btn-success-hover-bg: lighten(@bg-navbar-hover, 15%); +@panel-button-bg-color: #ccc; +// Navbar buttons +.btn-success { + &:hover, + &:focus, + &:active, + .open &.dropdown-toggle { + color: @btn-success-color; + border-color: lighten(@bg-navbar-hover, 20%); + } +} + +.navbar .dropdown-menu { + background-color: lighten(@bg-navbar-hover, 7.5%); + border-color: @primary-border-color; +} + @font-face { font-family: 'cursive_standardregular'; src: url('../font/cursive_standard-webfont.eot');