Tango, Deere, LateNight: ensure all font settings are applied

3 files changed, 79 insertions, 29 deletions

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 1b87870f6e..c636bb3545 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -809,17 +809,51 @@ WEffectSelector QAbstractScrollArea::corner,
 
 #Mixxx {
   background-color: black;
-  font-family: "Open Sans";
 }
 
 #WaveformSplitter {
   background-color: #222;
 }
 
+#Mixxx, WWidget,
+QToolTip,
+WLabel, QLabel,
+WNumber, WNumberPos,
+WPushButton,
+WKey,
+WTime,
+WTrackText,
+WTrackProperty,
+WRecordingDuration,
+QSpinBox,
+WBeatSpinBox,
+WOverview #PassthroughLabel,
+WBeatSpinBox QMenu,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCueMenuPopup QLabel,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu,
+WOverview /* Hotcue labels in the overview */,
+QComboBox,
+WEffect,
+WEffectSelector,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractScrollArea
+#LibraryContainer QPushButton,
+#LibraryContainer QLabel,
+#LibraryContainer QRadioButton,
+#LibraryContainer QHeaderView,
+#LibraryContainer QHeaderView::item,
+#LibraryContainer QMenu {
+  font-family: "Open Sans";
+}
+
 WWidget,
 WLibrary QLabel,
 WLibrary QPushButton {
-  font-family: "Open Sans";
   font-size: 12px;
   font-weight: bold;
   text-transform: uppercase;
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 2bd107b196..2c27543f6a 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1,35 +1,40 @@
 /* LateNight 2.3 // common layout settings */
 
 /************** font settings *************************************************/
+
 #Mixxx, WWidget,
-WEffect,
-WEffectSelector,
-WKey,
-WLabel, WLibrary QLabel,
+QToolTip,
+WLabel, QLabel,
 WNumber, WNumberPos,
-WPushButton, WLibrary QPushButton, WLibrary QRadioButton,
-WRecordingDuration,
+WPushButton,
+WKey,
 WTime,
 WTrackText,
 WTrackProperty,
+WRecordingDuration,
 QSpinBox,
 WBeatSpinBox,
-WLibrary QHeaderView,
-WLibrary QHeaderView::item,
-QToolTip,
 WOverview #PassthroughLabel,
-#LibraryContainer QMenu,
+WBeatSpinBox QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
+WCueMenuPopup QLabel,
 WCoverArtMenu,
 WTrackMenu,
 WTrackMenu QMenu,
 WOverview /* Hotcue labels in the overview */,
 QComboBox,
+WEffect,
 WEffectSelector,
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox,
-#fadeModeCombobox QAbstractScrollArea {
+#fadeModeCombobox QAbstractScrollArea
+#LibraryContainer QPushButton,
+#LibraryContainer QLabel,
+#LibraryContainer QRadioButton,
+#LibraryContainer QHeaderView,
+#LibraryContainer QHeaderView::item,
+#LibraryContainer QMenu {
   font-family: "Open Sans";
   font-weight: 500; /* semi-bold */
   font-style: normal;
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index d4cd922b4f..1e96f0c75b 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -5,8 +5,6 @@
   Not working. See https://bugs.launchpad.net/mixxx/+bug/1623997 */
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
   background-color: #1e1e1e;
-  font-family: Ubuntu;
-  font-weight: normal;
   font-size: 12px/12px;
 }
 
@@ -17,24 +15,39 @@
   background-color: #1e1e1e;
 }
 
-WWidget,
-WLabel,
-WNumber,
-WBeatSpinBox,
-WEffectSelector, WEffectSelector QAbstractScrollArea,
+#Mixxx, WWidget,
+QToolTip,
+WLabel, QLabel,
+WNumber, WNumberPos,
 WPushButton,
-#LibraryContainer QPushButton,
-#LibraryContainer QLabel,
-#LibraryContainer QRadioButton,
-#LibraryContainer QMenu,
+WKey,
+WTime,
+WTrackText,
+WTrackProperty,
+WRecordingDuration,
+QSpinBox,
+WBeatSpinBox,
+WOverview #PassthroughLabel,
 WBeatSpinBox QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
 WCueMenuPopup QLabel,
 WCoverArtMenu,
-#LibraryContainer QMenu QCheckBox,
-QToolTip,
-#LibraryContainer QHeaderView {
+WTrackMenu,
+WTrackMenu QMenu,
+WOverview /* Hotcue labels in the overview */,
+QComboBox,
+WEffect,
+WEffectSelector,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractScrollArea
+#LibraryContainer QPushButton,
+#LibraryContainer QLabel,
+#LibraryContainer QRadioButton,
+#LibraryContainer QHeaderView,
+#LibraryContainer QHeaderView::item,
+#LibraryContainer QMenu {
   font-family: Ubuntu;
   font-weight: normal;
 }
@@ -2545,7 +2558,6 @@ WTrackMenu QMenu::right-arrow {
   }
 
 #LibraryContainer QHeaderView {
-  font-family: Ubuntu;
   font-weight: bold;
   /* Note(ronso0)
   Interferes with skin scaling
@@ -2708,7 +2720,6 @@ Library features and their buttons:
   	*/
 WLibrary QPushButton {
   text-align: center;
-  font-family: Ubuntu;
   font-weight: normal;
   /* Note(ronso0)
   Interferes with skin scaling, system font size respectively