diff options
author | Aleksei Kvitinskii <aleksei.kvitinskii@gmail.com> | 2019-07-04 15:09:28 +0300 |
---|---|---|
committer | Aleksei Kvitinskii <aleksei.kvitinskii@gmail.com> | 2019-07-04 15:09:28 +0300 |
commit | 05edfb7aa5426cb4a4cd5239bffa0218ff06bea1 (patch) | |
tree | 1cb8e0263fb00afdf8fe5fc1cc4f1b902eb9999b | |
parent | d23ba0e3fecd96698f2775a0d663f513d4892cf1 (diff) |
updated background
-rw-r--r-- | octoprint_zbolttheme/static/css/theme.css | 2 | ||||
-rw-r--r-- | octoprint_zbolttheme/static/css/theme.css.map | 2 | ||||
-rw-r--r-- | octoprint_zbolttheme/static/js/zbolttheme.js | 10 | ||||
-rw-r--r-- | octoprint_zbolttheme/static/less/theme.less | 77 |
4 files changed, 70 insertions, 21 deletions
diff --git a/octoprint_zbolttheme/static/css/theme.css b/octoprint_zbolttheme/static/css/theme.css index 04d819b..b077f36 100644 --- a/octoprint_zbolttheme/static/css/theme.css +++ b/octoprint_zbolttheme/static/css/theme.css @@ -1 +1 @@ -body{background-color:#F4F7FA;font-weight:400}a{color:#007bff}.shadow-s{-webkit-box-shadow:0 1px 20px 0 rgba(69,90,100,0.08);box-shadow:0 1px 20px 0 rgba(69,90,100,0.08)}.shadow-m,.accordion-group,.tabbable{-webkit-box-shadow:0 3px 10px 0 rgba(0,0,0,0.05);box-shadow:0 3px 10px 0 rgba(0,0,0,0.05)}.shadow-l,.btn,.btn-primary,.nav-tabs>.active>a,.nav-tabs>.active>a:hover{-webkit-box-shadow:0 10px 18px 0 rgba(62,57,107,0.2);box-shadow:0 10px 18px 0 rgba(62,57,107,0.2)}.shadow-xl,.progress .bar{-webkit-box-shadow:0 10px 20px 0 rgba(0,0,0,0.3);box-shadow:0 10px 20px 0 rgba(0,0,0,0.3)}.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{color:inherit}.text-error{color:#dc3545 !important}.text-success{color:#28a745 !important}.btn{text-shadow:none;background-image:none;font-weight:400;border:none;background-color:#748892;color:#fff}.btn:hover{color:#fff;background-color:#91a0a8}.btn:active{box-shadow:none}.btn[disabled]{color:#fff;background-color:#748892}.btn-primary{background-color:#04a9f5}.btn-primary:hover{background-color:#30bcfc}.btn-primary[disabled],.btn-primary.disabled{background-color:#30bcfc}.btn-group>.btn+.dropdown-toggle{box-shadow:none}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04a9f5}.container{width:100%}.container .span4{width:25%}.container .span8{width:70%}.container .row{margin-left:0}#navbar .navbar-inner{background-color:rgba(26,26,26,0.92);border:none;background-image:none}#navbar .navbar-inner .nav>li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner .nav>li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner .nav>li.dropdown.open.active>.dropdown-toggle{background:#fcfcfc;border-bottom:1px solid #333;color:#fff}#navbar .navbar-inner .nav>li>a:hover{color:#fff;background:#04a9f5}#navbar .navbar-inner .brand,#navbar .navbar-inner .nav>li>a{text-shadow:none;color:#fff}#navbar .navbar-inner .brand .caret,#navbar .navbar-inner .nav>li>a .caret{border-top-color:#fff;border-bottom-color:#fff}#navbar .navbar-inner .brand span{background-image:url(../img/z-bolt-logo.svg)}.navbar-inner .container{width:100%}.nav-tabs{border-bottom:none;margin:10px;padding-bottom:10px}.nav-tabs>li>a{-webkit-border-radius:0;border-radius:0;border:none}.nav-tabs>li{margin-bottom:-2px;border:none}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{background:#04a9f5;color:#fff;border-radius:4px;border:none}.nav-tabs>li>a:hover{background:none;border:none}.accordion-group{background-color:#fff;border:none;border-radius:0;margin-bottom:5px}.accordion-group hr{border-bottom:none;border-top:1px solid #e6e6e6}.accordion-inner{border-top:none;padding-bottom:10px;padding-top:0}.octoprint-container .accordion-heading{font-size:17px;position:relative;padding-top:10px;padding-bottom:10px}.octoprint-container .accordion-heading [class*=" icon-"]{color:#007bff}.octoprint-container .accordion-heading .accordion-heading-button a{font-size:17px;color:#007bff}.octoprint-container .accordion-heading .accordion-toggle:after{content:"";background-color:#04a9f5;position:absolute;left:0;top:7px;width:4px;height:20px}.octoprint-container .accordion-heading .accordion-toggle{display:inline-block;margin-right:10px;line-height:1.1;position:relative;padding-left:20px}.octoprint-container .accordion-heading *,.octoprint-container .accordion-heading ::after,.octoprint-container .accordion-heading ::before{box-sizing:border-box}.octoprint-container{margin-top:0}#state_wrapper{background:linear-gradient(-135deg, #1de9b6 0, #0247af 100%);color:#fff}#state_wrapper .accordion-toggle{color:#fff}#state_wrapper .accordion-heading [class*=" icon-"]{color:#fff}#state_wrapper .accordion-toggle:after{background:#fff}.sd-trigger{display:none}.tab-pane{padding-bottom:10px}.octoprint-container .tab-content{border:none}.tabbable{background:#fff;padding-top:10px}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#fff}.dropdown-menu{-webkit-box-shadow:0 1px 10px 0 rgba(69,90,100,0.2);box-shadow:0 1px 10px 0 rgba(69,90,100,0.2);border:none}#temperature-table input[type=number].input-nospin,#temperature-table .input-mini{border:none;background:#f2f2f2;box-shadow:none}#temperature-table .input-append .add-on{border:none;background:#f2f2f2}#control .box{padding-left:9px}#temperature-graph{background:none}#job_print{background-color:#1de9b6}#job_pause{background-color:#04a9f5}.caret{border-top:4px solid #fff}.progress{border-radius:0;box-shadow:none;background:#f4f7fa;overflow:visible}.progress .bar{background:linear-gradient(-135deg, #1de9b6 0, #1dc4e9 100%);border-radius:0;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;text-align:center;white-space:nowrap}.progress-text-back{color:#333}.slider .slider-selection{background-image:-webkit-linear-gradient(top, #8ac1ef 0, #82b3de 100%);background-image:-o-linear-gradient(top, #8ac1ef 0, #82b3de 100%);background-image:linear-gradient(to bottom, #8ac1ef 0, #82b3de 100%);background-repeat:repeat-x;border:0 solid transparent}.slider .slider-handle{width:20px !important;height:20px !important;margin-top:-5px !important}.slider .slider-handle.round{background-color:#337ab7;background-image:-webkit-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-o-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:linear-gradient(to bottom, #337ab7 0, #2e6da4 100%);background-repeat:repeat-x;border:0 solid transparent}.slider .slider-track{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #f9f9f9 100%);background-image:-o-linear-gradient(top, #f5f5f5 0, #f9f9f9 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #f9f9f9 100%);background-repeat:repeat-x;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);border-radius:4px;border:none}.hero-unit{width:700px;margin:auto}.modal-backdrop,.modal-backdrop.fade.in{opacity:.4;background:#000}.modal{border:none}.footer{display:none}/*# sourceMappingURL=./theme.css.map */
\ No newline at end of file +body{background-color:#F4F7FA;font-weight:400;line-height:21px}a{color:#007bff}.shadow-s{-webkit-box-shadow:0 1px 20px 0 rgba(69,90,100,0.08);box-shadow:0 1px 20px 0 rgba(69,90,100,0.08)}.shadow-m,.accordion-group,.tabbable{-webkit-box-shadow:0 3px 10px 0 rgba(0,0,0,0.05);box-shadow:0 3px 10px 0 rgba(0,0,0,0.05)}.shadow-l,.btn,.btn-primary,.nav-tabs>.active>a,.nav-tabs>.active>a:hover{-webkit-box-shadow:0 10px 18px 0 rgba(62,57,107,0.2);box-shadow:0 10px 18px 0 rgba(62,57,107,0.2)}.shadow-xl,.progress .bar{-webkit-box-shadow:0 10px 20px 0 rgba(0,0,0,0.3);box-shadow:0 10px 20px 0 rgba(0,0,0,0.3)}.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{color:inherit}.text-error{color:#dc3545 !important}.text-success{color:#28a745 !important}.btn{text-shadow:none;background-image:none;font-weight:400;border:none;background-color:#748892;color:#fff}.btn:hover{color:#fff;background-color:#91a0a8}.btn:active{box-shadow:none}.btn[disabled]{color:#fff;background-color:#748892}.btn-primary{background-color:#04a9f5}.btn-primary:hover{background-color:#30bcfc}.btn-primary[disabled],.btn-primary.disabled{background-color:#30bcfc}.btn-group>.btn+.dropdown-toggle{box-shadow:none}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04a9f5}.octoprint-container{margin-top:-260px;width:100%}.octoprint-container .span4{width:25%}.octoprint-container .span8{width:70%}.octoprint-container .row{margin-left:0}#navbar .navbar-inner{background-color:#424448;border:none;background-image:none;padding-bottom:260px;text-shadow:none}#navbar .navbar-inner.red{background:linear-gradient(to right, #A445B2 0, #D41872 52%, #FF0066 100%);text-shadow:none}#navbar .navbar-inner.yellow{background:linear-gradient(to right, #fe9365 0, #feb798 100%);text-shadow:none}#navbar .navbar-inner.orange{background:linear-gradient(to right, #f77062 0, #fe5196 100%);text-shadow:none}#navbar .navbar-inner.green{background:linear-gradient(to right, #01a9ac 0, #01dbdf 100%)}#navbar .navbar-inner.blue{background:#04a9f5}#navbar .navbar-inner.violet{background:linear-gradient(to right, #667eea 0, #764ba2 100%)}#navbar .navbar-inner.black{background:#424448}#navbar .navbar-inner.white{background:#fff}#navbar .navbar-inner .nav>li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner .nav>li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner .nav>li.dropdown.open.active>.dropdown-toggle{background:#fcfcfc;border-bottom:1px solid #333;color:#fff}#navbar .navbar-inner .nav>li>a:hover{color:#fff;background:rgba(255,255,255,0.2) !important}#navbar .navbar-inner .brand,#navbar .navbar-inner .nav>li>a{text-shadow:none !important;color:#fff}#navbar .navbar-inner .brand .caret,#navbar .navbar-inner .nav>li>a .caret{border-top-color:#fff;border-bottom-color:#fff}#navbar .navbar-inner .brand span{background-image:url(../img/z-bolt-logo.svg) !important}.navbar-inner .container{width:100%}.nav-tabs{border-bottom:none;margin:10px;padding-bottom:10px}.nav-tabs>li>a{-webkit-border-radius:0;border-radius:0;border:none}.nav-tabs>li{margin-bottom:-2px;border:none}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{background:#04a9f5;color:#fff;border-radius:4px;border:none}.nav-tabs>li>a:hover{background:none;border:none}.accordion{margin-left:0}.accordion-group{background-color:#fff;border:none;border-radius:0;margin-bottom:5px;border-radius:0 10px 10px 0}.accordion-group hr{border-bottom:none;border-top:1px solid #e6e6e6}.accordion-inner{border-top:none;padding-bottom:5px;padding-top:0}.octoprint-container .accordion-heading{font-size:17px;position:relative;padding-top:10px;padding-bottom:10px}.octoprint-container .accordion-heading [class*=" icon-"]{color:#007bff}.octoprint-container .accordion-heading .accordion-heading-button a{font-size:17px;color:#007bff}.octoprint-container .accordion-heading .accordion-toggle:after{content:"";background-color:#04a9f5;position:absolute;left:0;top:7px;width:4px;height:20px}.octoprint-container .accordion-heading .accordion-toggle{display:inline-block;margin-right:10px;line-height:1.1;position:relative;padding-left:20px}.octoprint-container .accordion-heading *,.octoprint-container .accordion-heading ::after,.octoprint-container .accordion-heading ::before{box-sizing:border-box}#state_wrapper{background:linear-gradient(-135deg, #1de9b6 0, #0247af 100%);color:#fff}#state_wrapper .accordion-toggle{color:#fff}#state_wrapper .accordion-heading [class*=" icon-"]{color:#fff}#state_wrapper .accordion-toggle:after{background:#fff}.sd-trigger{display:none}.tab-pane{padding-bottom:10px}.octoprint-container .tab-content{border:none}.tabbable{background:#fff;border-radius:5px}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#fff}.dropdown-menu{-webkit-box-shadow:0 1px 10px 0 rgba(69,90,100,0.2);box-shadow:0 1px 10px 0 rgba(69,90,100,0.2);border:none}#temperature-table input[type=number].input-nospin,#temperature-table .input-mini{border:none;background:#f2f2f2;box-shadow:none}#temperature-table .input-append .add-on{border:none;background:#f2f2f2}#control .box{padding-left:9px}#temperature-graph{background:none}#job_print{background-color:#1de9b6}#job_pause{background-color:#04a9f5}.caret{border-top:4px solid #fff}.progress{border-radius:0;box-shadow:none;background:#f4f7fa;overflow:visible}.progress .bar{background:linear-gradient(-135deg, #1de9b6 0, #1dc4e9 100%);border-radius:0;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;text-align:center;white-space:nowrap}.progress-text-back{color:#333}.slider .slider-selection{background-image:-webkit-linear-gradient(top, #8ac1ef 0, #82b3de 100%);background-image:-o-linear-gradient(top, #8ac1ef 0, #82b3de 100%);background-image:linear-gradient(to bottom, #8ac1ef 0, #82b3de 100%);background-repeat:repeat-x;border:0 solid transparent}.slider .slider-handle{width:20px !important;height:20px !important;margin-top:-5px !important}.slider .slider-handle.round{background-color:#337ab7;background-image:-webkit-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-o-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:linear-gradient(to bottom, #337ab7 0, #2e6da4 100%);background-repeat:repeat-x;border:0 solid transparent}.slider .slider-track{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #f9f9f9 100%);background-image:-o-linear-gradient(top, #f5f5f5 0, #f9f9f9 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #f9f9f9 100%);background-repeat:repeat-x;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);border-radius:4px;border:none}.hero-unit{width:700px;margin:auto}.modal-backdrop,.modal-backdrop.fade.in{opacity:.4;background:#000}.modal{border:none}.footer{display:none}/*# sourceMappingURL=./theme.css.map */
\ No newline at end of file diff --git a/octoprint_zbolttheme/static/css/theme.css.map b/octoprint_zbolttheme/static/css/theme.css.map index ea4bc7e..03a1767 100644 --- a/octoprint_zbolttheme/static/css/theme.css.map +++ b/octoprint_zbolttheme/static/css/theme.css.map @@ -1 +1 @@ -{"version":3,"sources":["../less/theme.less"],"names":[],"mappings":"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"}
\ No newline at end of file +{"version":3,"sources":["../less/theme.less"],"names":[],"mappings":"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"}
\ No newline at end of file diff --git a/octoprint_zbolttheme/static/js/zbolttheme.js b/octoprint_zbolttheme/static/js/zbolttheme.js index 90c20e0..1a71714 100644 --- a/octoprint_zbolttheme/static/js/zbolttheme.js +++ b/octoprint_zbolttheme/static/js/zbolttheme.js @@ -10,11 +10,11 @@ $(function() { console.log('test'); } - OCTOPRINT_VIEWMODELS.push({ - construct: ZBoltViewModel, - // dependencies: ["AppearanceViewModel"], - elements: ["head"] - }); + // OCTOPRINT_VIEWMODELS.push({ + // construct: ZBoltViewModel, + // // dependencies: ["AppearanceViewModel"], + // // elements: ["head"] + // }); diff --git a/octoprint_zbolttheme/static/less/theme.less b/octoprint_zbolttheme/static/less/theme.less index eec76d1..99d3edf 100644 --- a/octoprint_zbolttheme/static/less/theme.less +++ b/octoprint_zbolttheme/static/less/theme.less @@ -15,6 +15,7 @@ body { background-color: @mainBg; font-weight: 400; + line-height: 21px; } a { @@ -103,7 +104,8 @@ a { background-color: @mainButtonBg; } -.container { +.octoprint-container { + margin-top: -260px; width:100%; .span4 { width: 25%; @@ -117,25 +119,66 @@ a { } } + #navbar .navbar-inner { - background-color: rgba(26, 26, 26, 0.92); + background-color: #424448; border: none; background-image: none; + padding-bottom: 260px; + text-shadow: none; + + &.red { + background: linear-gradient(to right, #A445B2 0%, #D41872 52%, #FF0066 100%); + text-shadow: none; + } + &.yellow { + background: linear-gradient(to right, rgb(254, 147, 101) 0%, rgb(254, 183, 152) 100%); + text-shadow: none; + } + + &.orange { + background: linear-gradient(to right, #f77062 0%, #fe5196 100%); + text-shadow: none; + } + + &.green { + background: linear-gradient(to right, #01a9ac 0%, #01dbdf 100%); + } + + &.blue { + background: #04a9f5; + } + + &.violet { + background: linear-gradient(to right, #667eea 0%, #764ba2 100%); + } + + &.black { + background: #424448; + } + + &.white { + background: #fff; + } + .nav { >li.dropdown.open>.dropdown-toggle, >li.dropdown.active>.dropdown-toggle, >li.dropdown.open.active>.dropdown-toggle { background: darken(@widgetsBg, 1); border-bottom: 1px solid @mainFontColor; color: #fff; - } - > li > a:hover { - color: #fff; - background: @mainButtonBg; - } + } + + > li > a:hover { + color: #fff; + background: rgba(255, 255, 255, 0.2) !important; + } + + } & .brand, .nav > li > a { - text-shadow: none; + text-shadow: none !important; color: #fff; & .caret { border-top-color: #fff; @@ -143,7 +186,7 @@ a { } } .brand span { - background-image: url(../img/z-bolt-logo.svg); + background-image: url(../img/z-bolt-logo.svg) !important; } } @@ -181,12 +224,19 @@ a { border:none; } + + +.accordion { + margin-left: 0px; +} + .accordion-group { &:extend(.shadow-m); background-color: @widgetsBg; border: none; border-radius: 0px; margin-bottom: 5px; + border-radius: 0px 10px 10px 0px; hr { border-bottom: none; @@ -196,7 +246,7 @@ a { .accordion-inner { border-top: none; - padding-bottom: 10px; + padding-bottom: 5px; padding-top: 0px; } @@ -239,9 +289,7 @@ a { } -.octoprint-container { - margin-top: 0px; -} + #state_wrapper { // background-color: #04a9f5; @@ -277,7 +325,8 @@ a { .tabbable { background: @widgetsBg; &:extend(.shadow-m); - padding-top: 10px; + // padding-top: 10px; + border-radius: 5px; } .table-hover tbody tr:hover td, |