From 69980a3401af1947318770cbaf21e4052ed0b9d6 Mon Sep 17 00:00:00 2001 From: Richard Mitchell Date: Thu, 7 Mar 2013 21:08:16 +0000 Subject: [PATCH 1/2] Fix up for less support --- octoprint/static/css/ui.css | 66 ---------------------------------- octoprint/templates/index.html | 4 +-- 2 files changed, 2 insertions(+), 68 deletions(-) diff --git a/octoprint/static/css/ui.css b/octoprint/static/css/ui.css index 9ac805b..f0bcdbf 100644 --- a/octoprint/static/css/ui.css +++ b/octoprint/static/css/ui.css @@ -4,72 +4,6 @@ body { padding-top: 60px; } -/* This would be far simpler using .less */ -#navbar .navbar-inner.white { - background-color: #FAFAFA; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #F2F2F2); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #F2F2F2); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #F2F2F2); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #F2F2F2); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #F2F2F2); /* Standard syntax; must be last */ -} - -#navbar .navbar-inner.red { - background-color: #F22828; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #F22828); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #F22828); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #F22828); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #F22828); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #F22828); /* Standard syntax; must be last */ -} - -#navbar .navbar-inner.orange { - background-color: #F27728; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #F27728); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #F27728); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #F27728); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #F27728); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #F27728); /* Standard syntax; must be last */ -} - -#navbar .navbar-inner.yellow { - background-color: #F2DE28; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #F2DE28); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #F2DE28); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #F2DE28); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #F2DE28); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #F2DE28); /* Standard syntax; must be last */ -} - -#navbar .navbar-inner.green { - background-color: #77FF28; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #77FF28); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #77FF28); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #77FF28); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #77FF28); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #77FF28); /* Standard syntax; must be last */ -} - -#navbar .navbar-inner.blue { - background-color: #2877FF; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #2877FF); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #2877FF); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #2877FF); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #2877FF); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #2877FF); /* Standard syntax; must be last */ -} - -/* Colors too close together in RGB to tell apart clearly - so no indigo I'm afraid */ - -#navbar .navbar-inner.violet { - background-color: #7728FF; /* fallback color if gradients are not supported */ - background-image: -webkit-linear-gradient(top, #FFFFFF, #7728FF); /* For Chrome and Safari */ - background-image: -moz-linear-gradient(top, #FFFFFF, #7728FF); /* For old Fx (3.6 to 15) */ - background-image: -ms-linear-gradient(top, #FFFFFF, #7728FF); /* For pre-releases of IE 10*/ - background-image: -o-linear-gradient(top, #FFFFFF, #7728FF); /* For old Opera (11.1 to 12.0) */ - background-image: linear-gradient(to bottom, #FFFFFF, #7728FF); /* Standard syntax; must be last */ -} - #navbar .navbar-inner .brand, #navbar .navbar-inner .nav>li>a { /* color: black; /* need a color that suits all backgrounds, removed for now */ text-shadow: none; /* shadow stands out too much on colored backgrounds */ diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html index b011193..41980e6 100644 --- a/octoprint/templates/index.html +++ b/octoprint/templates/index.html @@ -10,9 +10,9 @@ - + - +