Clean up the default theme template a bit more, and remove some leftover stylesheet declarations in the lumina-config ui file.

1 files changed, 26 insertions, 9 deletions

diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index 6d55633b..edd7b73b 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -38,11 +38,14 @@ QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTi
 }
 
 /* PAGES OF CONTAINER WIDGETS */
-QStackedWidget .QWidget, QTabWidget .QWidget, QToolBox  > QScrollArea{
+QStackedWidget .QWidget, QTabWidget .QWidget{
   background: %%ALTBASECOLOR%%;
   color: %%TEXTCOLOR%%;
   border: none;
 }
+QToolBox::tab{
+  color: %%TEXTCOLOR%%;
+}
 
 /* MENU WIDGETS */
 QMenuBar, QMenuBar::item, QToolBar, QStatusBar{ 
@@ -372,23 +375,37 @@ QPushButton:flat, QToolButton:flat{
    border: 1px solid transparent; /* no border for a flat button */
 }
  
- QPushButton::hover, QToolButton::hover{
+QPushButton::hover, QToolButton::hover{
    border: 1px solid %%ACCENTDISABLECOLOR%%;
    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
    color: %%TEXTHIGHLIGHTCOLOR%%;
- }
- QRadioButton, QCheckBox{
+}
+QRadioButton, QCheckBox{
    padding: 2px;
    border: 1px solid transparent;
    border-radius: 3px;
    color: %%TEXTCOLOR%%;
- }
- QRadioButton::hover, QCheckBox:hover{
+}
+QRadioButton::hover, QCheckBox:hover{
    background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
    border: 1px solid %%ACCENTCOLOR%%;
    color: %%TEXTHIGHLIGHTCOLOR%%;
- }
-
+}
+QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{
+  border: 1px solid %%ACCENTCOLOR%%;
+}
+QRadioButton::indicator{
+  border-radius: 7px;
+}
+QRadioButton::indicator:checked{
+  background: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:1, fx:0.5, fy:0.5, stop:0 %%TEXTCOLOR%%, stop:0.25 %%TEXTCOLOR%%, stop:0.25001 transparent);
+}
+QCheckBox::indicator:checked, QGroupBox::indicator:checked{
+  padding: 3px;
+  background-origin: content;
+  background-clip: content;
+  background: %%TEXTCOLOR%%;
+}
 
 /* PROGRESSBAR */
 QProgressBar{
@@ -451,7 +468,7 @@ QAbstractSpinBox::up-arrow{
  /* CALENDER WIDGET */
  /* (This is a special hack since there is no official support for stylesheets for this widget) */
  QCalendarWidget QWidget#qt_calendar_navigationbar{
-   background-color: %%ALTBASECOLOR%%;
+   background-color: %%ALTBASECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/
  }
 QCalendarWidget QWidget{ 
    background-color: %%BASECOLOR%%;