CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

Graphical Fixes (#181)

Browse Source 
* Fix fan panel going out of screen

* Fix Numpad and clean css

* Fan panel margin tweak needed for bigger fonts
This commit is contained in:
Alfredo Monclus 2021-06-11 08:16:14 -03:00 committed by GitHub
parent 816d254582
commit e86dd8b935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panels/fan.py
View File

@ -40,7 +40,7 @@ class FanPanel(ScreenPanel):
self.labels["apply"] = self._gtk.ButtonImage("complete", _("Set Speed"))
self.labels["apply"].get_style_context().add_class("color4")
self.labels["apply"].connect("clicked", self.set_fan_speed)
self.labels["cancel"] = self._gtk.ButtonImage("cancel", _("Cancel Change"))
self.labels["cancel"] = self._gtk.ButtonImage("cancel", _("Cancel"))
self.labels["cancel"].get_style_context().add_class("color2")
self.labels["cancel"].connect("clicked", self.cancel_select_fan_speed)
self.labels["cancel"].hide()

57
styles/colorized/style.css
View File

@ -14,7 +14,7 @@ button {
background-color: #002b36; /*base03*/
margin: .25em;
border-radius: 0;
border: 0 solid #000;
border: 0;
-gtk-icon-shadow: none;
}
@ -87,7 +87,7 @@ progress, trough {
min-height: 2em;
background-color: #586e75; /*base01*/
color: #fdf6e3; /*base3*/
border: #000 1px solid;
border: 1px solid #002b36; /*base03*/
}
progress {
@ -123,7 +123,7 @@ trough {
}
.dialog {
border: .1em solid black;
border: .1em solid #002b36; /*base03*/
padding: 2.5em;
background-color: #002b36; /*base03*/
margin: 1em;
@ -163,7 +163,7 @@ trough {
}
.fan_slider {
margin: 1em;
margin: 0 1em 0 1em;
color: #fdf6e3; /*base3*/
}
@ -182,66 +182,62 @@ trough {
}
.numpad_tleft {
border-left: .15em solid #fdf6e3; /*base3*/
border-top: .15em solid #fdf6e3; /*base3*/
border: .15em solid #fdf6e3; /*base3*/
border-bottom: 0;
border-right: 0;
border-top-left-radius: .7em;
margin: .15em 0 0 .15em;
}
.numpad_top {
border-left: .15em solid #93a1a1; /*base1*/
border-top: .15em solid #fdf6e3; /*base3*/
border: .15em solid #fdf6e3; /*base3*/
border-bottom: 0;
border-right: 0;
margin: .15em 0 0 0;
}
.numpad_tright {
border-left: .15em solid #fdf6e3; /*base3*/
border-right: .15em solid #fdf6e3; /*base3*/
border-top: .15em solid #fdf6e3; /*base3*/
border: .15em solid #fdf6e3; /*base3*/
border-bottom: 0;
border-top-right-radius: .7em;
margin: .15em .15em 0 0;
}
.numpad_left {
border-left: .15em solid #fdf6e3; /*base3*/
border-top: .15em solid #93a1a1; /*base1*/
border: .15em solid #fdf6e3; /*base3*/
border-right: 0;
border-bottom: 0;
margin: 0 0 0 .15em;
}
.numpad_button {
border-left: .15em solid #93a1a1; /*base1*/
border-top: .15em solid #93a1a1; /*base1*/
border: .15em solid #fdf6e3; /*base3*/
border-right: 0;
border-bottom: 0;
margin: 0;
padding: 1em;
}
.numpad_right {
border-right: .15em solid #fdf6e3; /*base3*/
border-left: .15em solid #93a1a1; /*base1*/
border-top: .15em solid #93a1a1; /*base1*/
border: .15em solid #fdf6e3; /*base3*/
border-bottom: 0;
margin: 0 .15em 0 0;
}
.numpad_bleft {
border-left: .15em solid #fdf6e3; /*base3*/
border-bottom: .15em solid #fdf6e3; /*base3*/
border-top: .15em solid #93a1a1; /*base1*/
border: .15em solid #fdf6e3; /*base3*/
border-right: 0;
border-bottom-left-radius: .7em;
margin: 0 0 .15em .15em;
}
.numpad_bottom {
border-left: .15em solid #93a1a1; /*base1*/
border-bottom: .15em solid #fdf6e3; /*base3*/
border-top: .15em solid #93a1a1; /*base1*/
border: .15em solid #fdf6e3; /*base3*/
border-right: 0;
margin: 0 0 .15em 0;
}
.numpad_bright {
border-left: .15em solid #93a1a1; /*base1*/
border-bottom: .15em solid #fdf6e3; /*base3*/
border-top: .15em solid #93a1a1; /*base1*/
border-right: .15em solid #93a1a1; /*base1*/
border: .15em solid #fdf6e3; /*base3*/
border-bottom-right-radius: .7em;
margin: 0 .15em .15em 0;
}
@ -338,4 +334,5 @@ trough {
}
.error {
background-color: #dc322f; /*solarized-red*/}
background-color: #dc322f; /*solarized-red*/
}

88
styles/z-bolt/style.css
View File

@ -1,5 +1,5 @@
* {
color: #fff;
color: white;
font-size: KS_FONT_SIZEpx;
-GtkComboBox-appears-as-list: 0;
}
@ -15,7 +15,7 @@ button {
margin: .25em;
margin-bottom: .5em;
border-radius: 0;
border: 0 solid #000;
border: 0;
-gtk-icon-shadow: none;
}
@ -64,7 +64,7 @@ entry {
}
frame {
color: #fff;
color: white;
border-bottom: 1px solid #444;
}
@ -87,8 +87,8 @@ menuitem {
progress, trough {
min-height: 2em;
background-color: #404E57;
color: #fff;
border: #000 1px solid;
color: white;
border: 1px solid black;
}
progress {
@ -97,7 +97,7 @@ progress {
scale mark {
margin-top: 1em;
color: #fff;
color: white;
}
scrollbar, scrollbar button, scrollbar trough {
@ -116,7 +116,7 @@ trough {
}
.popup {
background-color: #0000ff;
background-color: black;
}
.action_bar {
@ -126,7 +126,7 @@ trough {
.dialog {
border: .1em solid black;
padding: 2.5em;
background-color: #000;
background-color: black;
margin: 1em;
}
@ -140,7 +140,7 @@ trough {
}
.distbutton_top {
border: .15em solid #fff;
border: .15em solid white;
border-right: 0;
border-top-left-radius: .75em;
border-bottom-left-radius: .75em;
@ -148,7 +148,7 @@ trough {
}
.distbutton {
border: .15em solid #fff;
border: .15em solid white;
border-left: .15em solid #ccc;
border-right: 0;
margin-left: 0;
@ -156,7 +156,7 @@ trough {
}
.distbutton_bottom {
border: .15em solid #fff;
border: .15em solid white;
border-left: .15em solid #ccc;
border-top-right-radius: .7em;
border-bottom-right-radius: .7em;
@ -164,8 +164,8 @@ trough {
}
.fan_slider {
margin: 1em;
color: #fff;
margin: 0 1em 0 1em;
color: white;
}
.frame-item {
@ -175,7 +175,7 @@ trough {
.message_popup {
background-color: #367554;
border-bottom: .1em solid #fff;
border-bottom: .1em solid white;
}
.message_popup button {
@ -183,66 +183,62 @@ trough {
}
.numpad_tleft {
border-left: .15em solid #fff;
border-top: .15em solid #fff;
border: .15em solid white;
border-bottom: 0;
border-right: 0;
border-top-left-radius: .7em;
margin: .15em 0 0 .15em;
}
.numpad_top {
border-left: .15em solid #ccc;
border-top: .15em solid #fff;
border: .15em solid white;
border-bottom: 0;
border-right: 0;
margin: .15em 0 0 0;
}
.numpad_tright {
border-left: .15em solid #fff;
border-right: .15em solid #fff;
border-top: .15em solid #fff;
border: .15em solid white;
border-bottom: 0;
border-top-right-radius: .7em;
margin: .15em .15em 0 0;
}
.numpad_left {
border-left: .15em solid #fff;
border-top: .15em solid #ccc;
border: .15em solid white;
border-right: 0;
border-bottom: 0;
margin: 0 0 0 .15em;
}
.numpad_button {
border-left: .15em solid #ccc;
border-top: .15em solid #ccc;
border: .15em solid white;
border-right: 0;
border-bottom: 0;
margin: 0;
padding: 1em;
}
.numpad_right {
border-right: .15em solid #fff;
border-left: .15em solid #ccc;
border-top: .15em solid #ccc;
border: .15em solid white;
border-bottom: 0;
margin: 0 .15em 0 0;
}
.numpad_bleft {
border-left: .15em solid #fff;
border-bottom: .15em solid #fff;
border-top: .15em solid #ccc;
border: .15em solid white;
border-right: 0;
border-bottom-left-radius: .7em;
margin: 0 0 .15em .15em;
}
.numpad_bottom {
border-left: .15em solid #ccc;
border-bottom: .15em solid #fff;
border-top: .15em solid #ccc;
border: .15em solid white;
border-right: 0;
margin: 0 0 .15em 0;
}
.numpad_bright {
border-left: .15em solid #ccc;
border-bottom: .15em solid #fff;
border-top: .15em solid #ccc;
border-right: .15em solid #ccc;
border: .15em solid white;
border-bottom-right-radius: .7em;
margin: 0 .15em .15em 0;
}
@ -279,7 +275,7 @@ trough {
.printing-progress-text {
font-size: 1.5em;
font-weight: bold;
color: #fff;
color: white;
}
.printing-status-label {
@ -290,7 +286,7 @@ trough {
}
.tempbutton_top {
border: .15em solid #fff;
border: .15em solid white;
border-bottom: 0;
border-top-left-radius: .75em;
border-top-right-radius: .75em;
@ -298,7 +294,7 @@ trough {
}
.tempbutton {
border: .15em solid #fff;
border: .15em solid white;
border-top: .15em solid #ccc;
border-bottom: 0;
margin-top: 0;
@ -306,7 +302,7 @@ trough {
}
.tempbutton_bottom {
border: .15em solid #fff;
border: .15em solid white;
border-top: .15em solid #ccc;
border-bottom-left-radius: .7em;
border-bottom-right-radius: .7em;
@ -317,13 +313,13 @@ trough {
border: .1em solid #981E1F;
font-size: 1em;
padding: 2.5em;
color: #FFF;
color: white;
background-color: #981E1F;
}
.message button {
background-color: #FFF;
color: #000;
background-color: white;
color: black;
padding: 2em 2.5em 2em 2.5em;
}