From 06850dd775ed187e97c64c674ca3a43e9cbb50a7 Mon Sep 17 00:00:00 2001 From: Bob Clough Date: Fri, 27 Feb 2015 17:39:40 +0000 Subject: [PATCH] Added gradient to transparent header background, compiled + minified CSS --- src/octoprint/static/css/octoprint.css | 2 +- src/octoprint/static/js/app/viewmodels/settings.js | 2 ++ src/octoprint/static/less/octoprint.less | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/octoprint/static/css/octoprint.css b/src/octoprint/static/css/octoprint.css index fbc9e800..fb9f9257 100644 --- a/src/octoprint/static/css/octoprint.css +++ b/src/octoprint/static/css/octoprint.css @@ -77,7 +77,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- #navbar .navbar-inner.white .brand:hover .caret,#navbar .navbar-inner.white .nav>li>a:hover .caret,#navbar .navbar-inner.white .brand:focus .caret,#navbar .navbar-inner.white .nav>li>a:focus .caret{border-bottom-color:#666;border-top-color:#666} #navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20.png)}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20@2x.png)}} #navbar .navbar-inner.white .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e8e8e8;background-image:-moz-linear-gradient(top, #d9d9d9, #fff);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#d9d9d9), to(#fff));background-image:-webkit-linear-gradient(top, #d9d9d9, #fff);background-image:-o-linear-gradient(top, #d9d9d9, #fff);background-image:linear-gradient(to bottom, #d9d9d9, #fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9d9d9', endColorstr='#ffffffff', GradientType=0)} -#navbar .navbar-inner.transparent{background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fff, #d9d9d9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#d9d9d9));background-image:-webkit-linear-gradient(top, #fff, #d9d9d9);background-image:-o-linear-gradient(top, #fff, #d9d9d9);background-image:linear-gradient(to bottom, #fff, #d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffd9d9d9', GradientType=0);background-image:url("../img/trans-background.png");background-repeat:repeat}#navbar .navbar-inner.transparent .brand,#navbar .navbar-inner.transparent .nav>li>a{text-shadow:0 1px 0 #d9d9d9;color:#333}#navbar .navbar-inner.transparent .brand .caret,#navbar .navbar-inner.transparent .nav>li>a .caret{border-bottom-color:#999;border-top-color:#999} +#navbar .navbar-inner.transparent{background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fff, #d9d9d9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#d9d9d9));background-image:-webkit-linear-gradient(top, #fff, #d9d9d9);background-image:-o-linear-gradient(top, #fff, #d9d9d9);background-image:linear-gradient(to bottom, #fff, #d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffd9d9d9', GradientType=0);background-image:url("../img/trans-background.png");background-repeat:repeat-x}#navbar .navbar-inner.transparent .brand,#navbar .navbar-inner.transparent .nav>li>a{text-shadow:0 1px 0 #d9d9d9;color:#333}#navbar .navbar-inner.transparent .brand .caret,#navbar .navbar-inner.transparent .nav>li>a .caret{border-bottom-color:#999;border-top-color:#999} #navbar .navbar-inner.transparent .brand:hover .caret,#navbar .navbar-inner.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.transparent .brand:focus .caret,#navbar .navbar-inner.transparent .nav>li>a:focus .caret{border-bottom-color:#666;border-top-color:#666} #navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}} #navbar .navbar-inner.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e8e8e8;background-image:-moz-linear-gradient(top, #d9d9d9, #fff);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#d9d9d9), to(#fff));background-image:-webkit-linear-gradient(top, #d9d9d9, #fff);background-image:-o-linear-gradient(top, #d9d9d9, #fff);background-image:linear-gradient(to bottom, #d9d9d9, #fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9d9d9', endColorstr='#ffffffff', GradientType=0)} diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js index cb9e1485..aa1d1780 100644 --- a/src/octoprint/static/js/app/viewmodels/settings.js +++ b/src/octoprint/static/js/app/viewmodels/settings.js @@ -46,6 +46,8 @@ $(function() { return gettext("black"); case "white": return gettext("white"); + case "transparent": + return gettext("transparent"); case "default": return gettext("default"); default: diff --git a/src/octoprint/static/less/octoprint.less b/src/octoprint/static/less/octoprint.less index 6bb33c81..f3a383c4 100644 --- a/src/octoprint/static/less/octoprint.less +++ b/src/octoprint/static/less/octoprint.less @@ -129,9 +129,11 @@ body { } &.transparent { @base: #ffffff; + .navbar-inner-color(@base); - background-image: url("../img/trans-background.png"); - background-repeat: repeat; + + background-image: url("../img/trans-background.png") ; + background-repeat: repeat-x; } .brand span {