From 415535eeb8e9ea4b6da81ae043b334f3ab9e1006 Mon Sep 17 00:00:00 2001 From: alfrix Date: Wed, 30 Nov 2022 23:57:34 -0300 Subject: [PATCH] tweak sizes #828 --- panels/main_menu.py | 4 ++-- panels/temperature.py | 4 ++-- styles/base.css | 12 +++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/panels/main_menu.py b/panels/main_menu.py index 9ee35c09..a214c3b9 100644 --- a/panels/main_menu.py +++ b/panels/main_menu.py @@ -146,7 +146,7 @@ class MainPanel(MenuPanel): name.get_style_context().add_class("graph_label_hidden") self.labels['da'].set_showing(device, visible) - temp = self._gtk.Button(label="") + temp = self._gtk.Button(label="", lines=1) if can_target: temp.connect("clicked", self.show_numpad, device) @@ -209,7 +209,7 @@ class MainPanel(MenuPanel): name = Gtk.Label("") temp = Gtk.Label(_("Temp (°C)")) - temp.set_size_request(round(self._gtk.get_font_size() * 7.7), -1) + temp.set_size_request(self._gtk.font_size * 6, -1) self.labels['devices'].attach(name, 0, 0, 1, 1) self.labels['devices'].attach(temp, 1, 0, 1, 1) diff --git a/panels/temperature.py b/panels/temperature.py index b8e3c8dc..c9adebe3 100644 --- a/panels/temperature.py +++ b/panels/temperature.py @@ -345,7 +345,7 @@ class TemperaturePanel(ScreenPanel): name.connect("clicked", self.toggle_visibility, device) self.labels['da'].set_showing(device, visible) - temp = self._gtk.Button(label="") + temp = self._gtk.Button(label="", lines=1) if can_target: temp.connect("clicked", self.show_numpad, device) @@ -426,7 +426,7 @@ class TemperaturePanel(ScreenPanel): name = Gtk.Label("") temp = Gtk.Label(_("Temp (°C)")) - temp.set_size_request(round(self._gtk.get_font_size() * 7.7), -1) + temp.set_size_request(self._gtk.font_size * 6, -1) self.labels['devices'].attach(name, 0, 0, 1, 1) self.labels['devices'].attach(temp, 1, 0, 1, 1) diff --git a/styles/base.css b/styles/base.css index 4f4721fd..1b17a683 100644 --- a/styles/base.css +++ b/styles/base.css @@ -266,9 +266,15 @@ trough { } .heater-grid label { - margin-top: .2em; - margin-bottom: .2em; - min-height: 2em; + min-height: 0em; + padding: 0; + margin: 0; +} + +.heater-grid button{ + margin: .2em; + min-height: 2.9em; + padding: 0 .5em; } .keyboard_box {