GTK+-3.20 all themes: use "%" units instead of of hardcoded values for font-size

and fix wrong node names for color and font button in BlackMATE

14 files changed, 47 insertions, 40 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 3d86d8ba..00d29a28 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -1437,7 +1437,7 @@ button {
 }
 
 button.text-button,
-fontbutton button,
+button.font,
 filechooser  button {
     padding: 3px;
 }
@@ -1548,8 +1548,8 @@ button:active:disabled {
 	color: @insensitive_fg_color;
 }
 
-fontbutton button,
-colorbutton button {
+button.font,
+button.color {
     padding: 4px 3px;
 }
 
@@ -2953,7 +2953,8 @@ dialog.background.solid-csd > headerbar.titlebar  {
  
 .titlebar .title,
 headerbar .title {
-    font: Bold 12;
+    font-weight: bold;
+    font-size: 120%;
     background: none;
     color: #D9D9D9;
 }
@@ -3168,16 +3169,16 @@ switch,
 switch:backdrop {
     font-weight: bold;
     font-size: smaller;
-	font: bold condensed;
-	color: @internal_element_color;
-	border-radius: 3px;
-	border-width: 1px;
-	border-image: none;
-	border-style: solid;
-	border-color: @frame_color;
-	background-image: linear-gradient(to bottom,
-	                                  @trough_bg_color_a,
-	                                  @trough_bg_color_b);
+    font: condensed;
+    color: @internal_element_color;
+    border-radius: 3px;
+    border-width: 1px;
+    border-image: none;
+    border-style: solid;
+    border-color: @frame_color;
+    background-image: linear-gradient(to bottom,
+                                      @trough_bg_color_a,
+                                      @trough_bg_color_b);
 }
 
 switch:checked,
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index c2048026..a2308bf1 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -500,7 +500,7 @@ dictionary */
 #clock-applet-button,
 .mate-panel-menu-bar.menubar,
 MatePanelApplet > GtkMenuBar.menubar {
-    font: normal;
+    font-weight: normal;
 }
 
 /*WnckPager is unnamed in GTK inspector so try this*/
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index 0f775d6a..59b43f4d 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -3735,7 +3735,7 @@ radiobutton.text-button {
 

 assistant .sidebar highlight {

     color: @theme_text_color;

-    font: bold;

+    font-weight: bold;

 }

 

 assistant .sidebar {

@@ -5824,12 +5824,13 @@ headerbar.titlebar > stackswitcher.linked.stack-switcher > button.text-button.ra
 }

 

 headerbar title {

-    font: Bold 11;

+    font-size: 110%;

+    font-weight: bold;

     color: @theme_text_dark_color;

 }

 

 headerbar .subtitle {

-    font: 9;

+    font-size: 90%;

     color: @theme_text_dark_color;

 }

 

@@ -5864,7 +5865,8 @@ headerbar paned > separator {
 }

 

 .titlebar .title {

-    font: Bold 10;

+    font-size: 100%;

+    font-weight: bold;

     background: none;

     color: @theme_text_dark_color;

 }

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 6bdfaa85..23268cb3 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -527,7 +527,7 @@ MatePanelAppletFrameDBus {
 
 /* clock-applet */
 #clock-applet-button.flat.toggle > box.horizontal > label {
-    font: normal;
+    font-weight: normal;
 }
 
 #MatePanelPopupWindow {
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 8933b64f..998c6a38 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -3229,12 +3229,12 @@ actionbar button.image-button {
 
 actionbar .title {
     font-weight: bold;
-    font-size: 10pt;
+    font-size: 100%;
     padding: 0px 12px 0px 12px;
 }
 
 actionbar .subtitle {
-    font-size: 9pt;
+    font-size: 90%;
     padding: 0px 12px 0px 12px;
 }
 
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 763f6ec1..acc5475a 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -420,7 +420,7 @@ PanelApplet.wnck-applet .wnck-pager:hover {
 }
 
 #clock-applet-button.flat.toggle > box.horizontal > label {
-    font: normal;
+    font-weight: normal;
 }
 
 #MatePanelPopupWindow {
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index bee4cfd9..26a3163b 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -3738,7 +3738,7 @@ radiobutton.text-button {
 

 assistant .sidebar highlight {

     color: @theme_text_color;

-    font: bold;

+    font-weight: bold;

 }

 

 assistant .sidebar {

@@ -5821,12 +5821,14 @@ headerbar.titlebar > stackswitcher.linked.stack-switcher > button.text-button.ra
 }

 

 headerbar title {

-    font: Bold 11;

+    font-size: 110%;

+    font-weight: bold;

+

     color: @theme_text_dark_color;

 }

 

 headerbar .subtitle {

-    font: 9;

+    font-size: 90%;

     color: @theme_text_dark_color;

 }

 

@@ -5861,7 +5863,8 @@ headerbar paned > separator {
 }

 

 .titlebar .title {

-    font: Bold 10;

+    font-size: 100%;

+    font-weight: bold;

     background: none;

     color: @theme_text_dark_color;

 }

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
index 48f17265..2a36f277 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -525,7 +525,7 @@ MatePanelAppletFrameDBus {
 
 /* clock-applet */
 #clock-applet-button.flat.toggle > box.horizontal > label {
-    font: normal;
+    font-weight: normal;
 }
 
 #MatePanelPopupWindow {
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index f2457974..c7fffa80 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -3394,7 +3394,8 @@ dialog.background.solid-csd > headerbar.titlebar  {
 }
  
 .titlebar .title {
-    font: Bold 10;
+    font-weight: bold;
+    font-size: 100%;
     background: none;
     color: @theme_fg_color;
 }
@@ -3529,7 +3530,7 @@ switch,
 switch:backdrop {
     font-weight: bold;
     font-size: smaller;
-    font: bold condensed;
+    font: condensed;
     color: @internal_element_color;
     border-radius: 3px;
     border-width: 1px;
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
index 1c0f3c2d..e1dc434e 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -386,7 +386,7 @@ PanelSeparator {
 
 
 #clock-applet-button.flat.toggle > box.horizontal > label {
-    font: normal;
+    font-weight: normal;
 }
 
 /* calendar window */
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index aee87920..42daa2cc 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -3245,12 +3245,12 @@ actionbar button.image-button {
 
 actionbar .title {
     font-weight: bold;
-    font-size: 10pt;
+    font-size: 100%;
     padding: 0px 12px 0px 12px;
 }
 
 actionbar .subtitle {
-    font-size: 9pt;
+    font-size: 90%;
     padding: 0px 12px 0px 12px;
 }
 
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 56bd6793..6a2948b1 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -412,7 +412,7 @@ PanelApplet.wnck-applet .wnck-pager:hover {
 }
 
 #clock-applet-button.flat.toggle > box.horizontal > label {
-    font: normal;
+    font-weight: normal;
 }
 
 #MatePanelPopupWindow {
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index e95098c9..e405551e 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -2215,7 +2215,7 @@ treemenu menuitem {
 
 menu,
 .menu {
-    font: normal;
+    font-weight: normal;
     background-color: @menu_bg_color;
     color: @menu_fg_color;
     padding: 1px;
@@ -3170,7 +3170,7 @@ progressbar .osd {
 
 assistant .sidebar highlight {
     color: @theme_fg_color;
-    font: bold;
+    font-weight: bold;
 }
 
 assistant .sidebar {
@@ -3670,7 +3670,7 @@ headerbar,
 
 headerbar .title,
 .titlebar .title {
-    font: Bold;
+    font-weight: bold;
 }
 
 headerbar button.titlebutton,
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 75204164..d5795059 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -2215,7 +2215,7 @@ treemenu menuitem {
 
 menu,
 .menu {
-    font: normal;
+    font-weight: normal;
     background-color: @menu_bg_color;
     color: @menu_fg_color;
     padding: 1px;
@@ -3170,7 +3170,7 @@ progressbar .osd {
 
 assistant .sidebar highlight {
     color: @theme_fg_color;
-    font: bold;
+    font-weight: bold;
 }
 
 assistant .sidebar {
@@ -3671,7 +3671,7 @@ headerbar,
 
 headerbar .title,
 .titlebar .title {
-    font: Bold;
+    font-weight: bold;
 }
 
 headerbar button.titlebutton,