Do not set font style in code

Style should be set only via CSS stylesheet to allow customization. Signed-off-by: Stefano Babic <[email protected]>
sbabic · Sep 19, 2018 · dc39f95 · dc39f95
1 parent 82b9a30
commit dc39f95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/SWUpdateGUI.lua b/SWUpdateGUI.lua
@@ -159,7 +159,7 @@ function updnetinterfaces()
         Text = t["name"] .. ": " .. t["addr"] .. " " .. t["netmask"],
         HAlign = "left",
         Height = "auto",
-        Style = "font: ui-xx-large/bi; text-align:left"
+        Style = "text-align:left"
       }
       elem = app:getById("net-" .. t["name"])
       if elem then 
@@ -523,16 +523,14 @@ app = ui.Application:new
 
     if status == STATUS_RUN then
       g:setValue("Text", L.UPDATE_IN_PROGRESS)
-      g:setValue("Style", "font: ui-xx-large/bi;")
     elseif status == STATUS_FAILURE then
       g:setValue("Text", L.FAILURE)
-      g:setValue("Style", "font: ui-xx-large/bi; color: #ff0000;")
+      g:setValue("Style", "color: #ff0000;")
     elseif status == STATUS_SUCCESS then
       g:setValue("Text", L.SUCCESS)
-      g:setValue("Style", "font: ui-xx-large/bi; color: #00ff00;")
+      g:setValue("Style", "color: #00ff00;")
     elseif status == STATUS_START then
       g:setValue("Text", L.STARTING_UPDATE)
-      g:setValue("Style", "font: ui-xx-large/bi;")
     else
 
     end
@@ -566,7 +564,6 @@ app = ui.Application:new
               VAlign = "center",
               Height = "auto",
               InitialFocus = true,
-              Style = "font: ui-xx-large/bi;",
 
               onClick = function(self)
                 local app = self.Application
@@ -598,7 +595,6 @@ app = ui.Application:new
               VAlign = "center",
               Width = "fill",
               Height = "auto",
-              Style = "font: ui-xx-large/bi;",
               onClick = function(self)
                 app:switchwindow("MainWindow", "network-window")
               end,
@@ -610,7 +606,6 @@ app = ui.Application:new
               HAlign = "center",
               Width = "fill",
               Height = "auto",
-              Style = "font: ui-xx-large/bi;",
               onClick = function(self)
                 if not NOREBOOT then
                   os.execute ("/sbin/reboot")
@@ -678,4 +673,4 @@ app:run()
 progtask:terminate()
 
 app:hide()
-app:cleanup()
+app:cleanup()
diff --git a/common.lua b/common.lua
@@ -20,13 +20,12 @@ function RescueGUIHeader.new(class, self)
   self.title = ui.Text:new
   {
     Text = self.Description or "",
-    Style = "font: ui-xx-large/bi;"
   }
 
   self.logo =  ui.ImageWidget:new 
   {
     Width = "fill",
-    Height = "100",
+    Height = "fill",
     Mode = "inert",
     Image = self.Image,
     HAlign = "center",
@@ -35,4 +34,4 @@ function RescueGUIHeader.new(class, self)
   grp:addMember(self.logo)
 
   return grp
-end
+end