pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up for less support

Browse source
This commit is contained in:
Richard Mitchell 2013-03-07 21:08:16 +00:00
parent 2ade4948fc
commit 69980a3401
2 changed files with 2 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
octoprint/static/css/ui.css
View file

@ -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 */

4
octoprint/templates/index.html
View file

@ -10,9 +10,9 @@
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/jquery.fileupload-ui.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/ui.css') }}" rel="stylesheet" media="screen">
<!--link href="{{ url_for('static', filename='css/octoprint.css') }}" rel="stylesheet" type="stylesheet/less" media="screen"-->
<link href="{{ url_for('static', filename='css/octoprint.less') }}" rel="stylesheet/less" type="text/less" media="screen">
<link href="{{ url_for('static', filename='gcodeviewer/css/cupertino/jquery-ui-1.9.0.custom.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='gcodeviewer/css/style.css') }}" rel="stylesheet" media="screen">
<!--link href="{{ url_for('static', filename='gcodeviewer/css/style.css') }}" rel="stylesheet" media="screen"-->
<script lang="javascript">
var AJAX_BASEURL = "/ajax/";