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

Merge pull request #1 from thinkl33t/devel

Browse source 
Bobs transparent mods
This commit is contained in:
Chris 2015-02-28 00:43:52 +00:00
commit df49bf4cf3
3 changed files with 201 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

182
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

5
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -24,7 +24,8 @@ $(function() {
{key: "blue", name: gettext("blue")}, {key: "blue", name: gettext("blue")},
{key: "violet", name: gettext("violet")}, {key: "violet", name: gettext("violet")},
{key: "black", name: gettext("black")}, {key: "black", name: gettext("black")},
{key: "white", name: gettext("white")} {key: "white", name: gettext("white")},
{key: "transparent", name: gettext("transparent")}
]); ]);
self.appearance_colorName = function(color) { self.appearance_colorName = function(color) {
@ -45,6 +46,8 @@ $(function() {
return gettext("black"); return gettext("black");
case "white": case "white":
return gettext("white"); return gettext("white");
case "transparent":
return gettext("transparent");
case "default": case "default":
return gettext("default"); return gettext("default");
default: default:

20
src/octoprint/static/less/octoprint.less
View file

@ -15,7 +15,7 @@ body {
color: @text-color; color: @text-color;
@caret-color: average(@base, @text-color); @caret-color: average(@base, @text-color);
@caret-hover-color: average(@caret-color, @text-color); @caret-hover-color: average(@caret-color, @text-color);
.caret { .caret {
border-bottom-color: @caret-color; border-bottom-color: @caret-color;
border-top-color: @caret-color; border-top-color: @caret-color;
@ -68,7 +68,7 @@ body {
.navbar-inner-color (@base) { .navbar-inner-color (@base) {
@top: lighten(@base, 25%); @top: lighten(@base, 25%);
@bottom: darken(@base, 15%); @bottom: darken(@base, 15%);
@text-color-light: #f2f2f2; @text-color-light: #f2f2f2;
@text-color-dark: #333333; @text-color-dark: #333333;
@text-color: contrast(@base, @text-color-dark, @text-color-light); @text-color: contrast(@base, @text-color-dark, @text-color-light);
@ -78,7 +78,7 @@ body {
.brand, .nav>li>a { .brand, .nav>li>a {
.navbar-inner-text(@base); .navbar-inner-text(@base);
} }
.brand { .brand {
.brand(@text-color, @text-color-dark, @text-color-light); .brand(@text-color, @text-color-dark, @text-color-light);
} }
@ -123,7 +123,19 @@ body {
@base: #383838; @base: #383838;
.navbar-inner-color(@base); .navbar-inner-color(@base);
} }
&.white {
@base: #ffffff;
.navbar-inner-color(@base);
}
&.transparent {
@base: #ffffff;
.navbar-inner-color(@base);
background-image: url("../img/trans-background.png") ;
background-repeat: repeat-x;
}
.brand span { .brand span {
background-size: 20px 20px; background-size: 20px 20px;
background-position: left center; background-position: left center;