Shade: fix font settings

11 files changed, 88 insertions, 49 deletions

diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
index dc0feae938..ee40bcb84a 100644
--- a/res/skins/Shade/deck.xml
+++ b/res/skins/Shade/deck.xml
@@ -59,15 +59,15 @@
                         <Children>
                           <WidgetGroup>
                             <ObjectName>ArtistAndTimeRow</ObjectName>
-                            <Size>0e,19f</Size>
+                            <Size>0e,23f</Size>
                             <Layout>horizontal</Layout>
                             <Children>
                               <TrackProperty>
                                 <TooltipId>track_title</TooltipId>
                                 <Style>QLabel {
-                                  font: bold 13px sans-serif;
-                                  font-family: "Open Sans";
-                                  background-color: transparent;
+                                  font-size: 13px;
+                                  line-height: 13px;
+                                  font-weight: bold;
                                   color: #191F24;
                                   text-align: left;
                                   padding-left: 1px;
@@ -111,13 +111,13 @@
                               <TrackProperty>
                                 <TooltipId>track_artist</TooltipId>
                                 <Style>QLabel {
-                                  font: bold 13px sans-serif;
-                                  font-family: "Open Sans";
+                                  font-size: 13px;
+                                  line-height: 13px;
+                                  font-weight: bold;
                                   background-color: transparent;
                                   color: #191F24;
                                   text-align: left;
                                   padding-left: 1px;
-                                  padding-top: 0px;
                                 }
                                 </Style>
                                 <Property>artist</Property>
@@ -128,13 +128,12 @@
                               <NumberPos>
                                 <TooltipId>track_time</TooltipId>
                                 <Style>QLabel {
-                                  font: bold 13px sans-serif;
-                                  font-family: Open Sans;
+                                  font-size: 13px;
+                                  font-weight: bold;
                                   background-color: transparent;
                                   color: #191F24;
                                   text-align: right;
                                   padding-left: 1px;
-                                  padding-top: 0px;
                                 }
                                 </Style>
                                 <Group><Variable name="group"/></Group>
@@ -426,8 +425,8 @@
                     <Pos>3,30</Pos>
                     <Size>47f,26f</Size>
                     <Style>QLabel {
-                        font: bold 12px sans-serif;
-                        font-family: "Open Sans";
+                        font-size: 12px;
+                        font-weight: bold;
                         background-color: transparent;
                         color: #191F24;
                         padding-bottom: -2px;
diff --git a/res/skins/Shade/deck_small.xml b/res/skins/Shade/deck_small.xml
index 377c716d16..0282e654c9 100644
--- a/res/skins/Shade/deck_small.xml
+++ b/res/skins/Shade/deck_small.xml
@@ -39,8 +39,8 @@
                     <Layout>horizontal</Layout>
                     <Style>
                       QLabel {
-                        font: bold 13px sans-serif;
-                        font-family: "Open Sans";
+                        font-size: 13px;
+                        font-weight: bold;
                         color: #191F24;
                       }
                     </Style>
@@ -98,8 +98,8 @@
                     <Layout>horizontal</Layout>
                     <Style>
                       QLabel {
-                        font: bold 13px sans-serif;
-                        font-family: "Open Sans";
+                        font-size: 13px;
+                        font-weight: bold;
                         color: #191F24;
                       }
                     </Style>
diff --git a/res/skins/Shade/effect_parameter_button.xml b/res/skins/Shade/effect_parameter_button.xml
index 7f3d183269..a3d5bc249b 100644
--- a/res/skins/Shade/effect_parameter_button.xml
+++ b/res/skins/Shade/effect_parameter_button.xml
@@ -19,8 +19,8 @@
 			<EffectButtonParameterName>
 			<Style>
 				WEffectButtonParameter {
-					font: 10px/8px sans-serif;
-					font-family: "Open Sans";
+          font-size: 10px;
+          line-height: 8px;
 					background-color: transparent;
 					color: #191F24;
 					padding-left: 1px;
diff --git a/res/skins/Shade/effect_parameter_knob.xml b/res/skins/Shade/effect_parameter_knob.xml
index e63846d171..7a64bfefd4 100644
--- a/res/skins/Shade/effect_parameter_knob.xml
+++ b/res/skins/Shade/effect_parameter_knob.xml
@@ -19,8 +19,8 @@
 			<EffectParameterName>
 				<Style>
 					WEffectParameter {
-						font: 10px/8px sans-serif;
-						font-family: "Open Sans";
+            font-size: 10px;
+            line-height: 8px;
 						background-color: transparent;
 						color: #191F24;
 						padding-left: 1px;
diff --git a/res/skins/Shade/effect_parameters.xml b/res/skins/Shade/effect_parameters.xml
index 977a7f48cd..db3a0c7d79 100644
--- a/res/skins/Shade/effect_parameters.xml
+++ b/res/skins/Shade/effect_parameters.xml
@@ -4,8 +4,9 @@
     <Size>-1min,53f</Size>
     <Layout>horizontal</Layout>
     <Style> WEffect, WPushButton {
-      font: bold 12px/10px sans-serif;
-      font-family: "Open Sans";
+      font-size: 12px;
+      line-height: 10px;
+      font-weight: bold;
       background-color: transparent;
       color: #191F24;
       padding-left: 1px;
diff --git a/res/skins/Shade/effect_selector_button.xml b/res/skins/Shade/effect_selector_button.xml
index 28a7246b13..2a4aa81f28 100644
--- a/res/skins/Shade/effect_selector_button.xml
+++ b/res/skins/Shade/effect_selector_button.xml
@@ -11,8 +11,9 @@
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <Style> WEffect, WPushButton {
-      font: bold 12px/10px sans-serif;
-      font-family: "Open Sans";
+      font-size: 12px;
+      line-height: 10px;
+      font-weight: bold;
       background-color: transparent;
       color: #191F24;
     }
diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
index deea370bad..71090f9f2b 100644
--- a/res/skins/Shade/mixer_panel.xml
+++ b/res/skins/Shade/mixer_panel.xml
@@ -438,8 +438,8 @@
                 <TooltipId>time</TooltipId>
                 <Style>
                   QLabel {
-                    font: bold 10px sans-serif;
-                    font-family: "Open Sans";
+                    font-size: 10px;
+                    font-weight: bold;
                     background-color: transparent;
                     color: #191F24;
                     text-align:center;
diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml
index 3356f10f77..b2114edc9b 100644
--- a/res/skins/Shade/preview_deck.xml
+++ b/res/skins/Shade/preview_deck.xml
@@ -42,8 +42,10 @@
                         <Children>
                           <Text>
                             <TooltipId>text</TooltipId>
-                            <Style>QLabel { font: bold 12px/14px sans-serif;
-                              font-family: "Open Sans";
+                            <Style> QLabel {
+                              font-size: 12px;
+                              line-height: 14px;
+                              font-weight: bold;
                               background-color: transparent;
                               color: #191F24;
                               text-align: left;
@@ -61,8 +63,9 @@
                         <Children>
                           <Number>
                             <TooltipId>visual_bpm</TooltipId>
-                            <Style>QLabel { font: bold 9px sans-serif;
-                              font-family: "Open Sans";
+                            <Style>QLabel {
+                              font-size: 9px;
+                              font-weight: bold;
                               background-color: transparent;
                               color: #191F24;
                               padding-right: 0;
@@ -271,4 +274,3 @@
     </Connection>
   </WidgetGroup>
 </Template>
-
diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
index 1cda079d4e..749dab03cf 100644
--- a/res/skins/Shade/sampler.xml
+++ b/res/skins/Shade/sampler.xml
@@ -22,8 +22,10 @@
             <Children>
               <Text>
                 <TooltipId>text</TooltipId>
-                <Style>QLabel { font: bold 12px/14px sans-serif;
-                    font-family: "Open Sans";
+                <Style>QLabel {
+                    font-size: 12px;
+                    line-height: 14px;
+                    font-weight: bold;
                     background-color: transparent;
                     color: #191F24;
                     text-align: left;
@@ -37,8 +39,10 @@
               <!-- Alternative "TITLE ONLY" display
               <TrackProperty>
                 <TooltipId>track_title</TooltipId>
-                <Style>QLabel { font: bold 14px/16px sans-serif;
-                    font-family: "Open Sans";
+                <Style>QLabel {
+                    font-size: 14px;
+                    line-height: 16px;
+                    font-weight: bold;
                     background-color: transparent;
                     color: #191F24;
                     text-align: left;
@@ -55,8 +59,9 @@
                 <Children>
                   <Number>
                     <TooltipId>visual_bpm</TooltipId>
-                    <Style>QLabel { font: bold 9px sans-serif;
-                        font-family: "Open Sans";
+                    <Style>QLabel {
+                        font-size: 9px;
+                        font-weight: bold;
                         background-color: transparent;
                         color: #191F24;
                         padding-right: 0;
diff --git a/res/skins/Shade/samplersmall.xml b/res/skins/Shade/samplersmall.xml
index b5358c84a0..e0cf56cd96 100644
--- a/res/skins/Shade/samplersmall.xml
+++ b/res/skins/Shade/samplersmall.xml
@@ -56,8 +56,8 @@
                   <Size>0e,40f</Size>
                   <TooltipId>text</TooltipId>
                   <Style>QLabel {
-                      font: bold 13px sans-serif;
-                      font-family: "Open Sans";
+                      font-size: 13px;
+                      font-weight: bold;
                       background-color: transparent;
                       color: #191F24;
                       text-align: left;
@@ -70,8 +70,10 @@
                 <!-- Alternative "TITLE ONLY" display
                 <TrackProperty>
                   <TooltipId>track_title</TooltipId>
-                  <Style>QLabel { font: bold 14px/16px sans-serif;
-                      font-family: "Open Sans";
+                  <Style>QLabel {
+                      font-size: 14px;
+                      line-height: 16px;
+                      font-weight: bold;
                       background-color: transparent;
                       color: #191F24;
                       text-align: left;
@@ -91,8 +93,9 @@
                 <Children>
                   <Number>
                     <TooltipId>visual_bpm</TooltipId>
-                    <Style>QLabel { font: bold 9px sans-serif;
-                        font-family: "Open Sans";
+                    <Style>QLabel {
+                        font-size: 9px;
+                        font-weight: bold;
                         background-color: transparent;
                         color: #191F24;
                         padding-right: 0;
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index e246467b75..437ead43c2 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -13,9 +13,36 @@
 #DeckSmall {
   padding: 5px 0px;
 }
-
-WOverview {
-  font-family: "Ubuntu";
+#Mixxx, WWidget,
+WEffect,
+WEffectSelector,
+WKey,
+WLabel, WLibrary QLabel,
+WNumber, WNumberPos,
+WPushButton, WLibrary QPushButton, WLibrary QRadioButton,
+WRecordingDuration,
+WTime,
+WTrackText,
+WTrackProperty,
+QSpinBox,
+WBeatSpinBox,
+WLibrary QHeaderView,
+WLibrary QHeaderView::item,
+QToolTip,
+WOverview #PassthroughLabel,
+#LibraryContainer QMenu,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu,
+WOverview /* Hotcue labels in the overview */,
+QComboBox,
+WEffectSelector,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractScrollArea {
+  font-family: "Open Sans";
 }
 
 /* Passthrough label on overview waveform */
@@ -30,7 +57,7 @@ WBeatSpinBox,
 wouldn't style the respective spinbox in Shade (anymore),
 that's why we do it in another way here */
 #spinBoxTransition {
-  font: 13px;
+  font-size: 13px;
   padding: 0px;
   selection-color: #eee;
   selection-background-color: #060613;
@@ -120,7 +147,7 @@ WEffectSelector::indicator:!checked,
 WLibrary QPushButton:enabled,
 WBeatSpinBox,
 #spinBoxTransition {
-  font: 13px;
+  font-size: 13px;
   }
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox QAbstractScrollArea {
@@ -620,7 +647,8 @@ WEffectSelector QAbstractScrollArea QScrollBar:vertical,
   font-size: 13px/13px;
   This doesn't scale when using QT_SCALE_FACTOR manually:
   font-size: 10pt;	*/
-  font-size: 13px/13px;
+  font-size: 13px;
+  line-height: 13px;
   font-weight: bold;
   color: #000;
   border-radius: 0px;