2 files changed, 33 insertions, 52 deletions
diff --git a/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors b/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors
index 7b74e036..d3876f21 100644
--- a/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors
+++ b/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors
@@ -1,13 +1,13 @@
 ACCENTCOLOR=rgba(255,252,234,100)
 ACCENTDISABLECOLOR=rgba(0,0,0,100)
-ALTBASECOLOR=rgb(252,252,255)
+ALTBASECOLOR=rgba(255,255,255,100)
 BASECOLOR=rgb(247,246,244)
 HIGHLIGHTCOLOR=rgba(212,212,212,170)
 HIGHLIGHTDISABLECOLOR=rgba(184,184,184,100)
 PRIMARYCOLOR=rgba(235,242,242,200)
 PRIMARYDISABLECOLOR=rgba(214,220,220,200)
-SECONDARYCOLOR=rgba(208,220,244,200)
-SECONDARYDISABLECOLOR=rgba(168,179,200,100)
+SECONDARYCOLOR=rgba(100,100,100,200)
+SECONDARYDISABLECOLOR=rgba(100,100,100,100)
 TEXTCOLOR=black
 TEXTDISABLECOLOR=grey
-TEXTHIGHLIGHTCOLOR=black
-\ No newline at end of file
+TEXTHIGHLIGHTCOLOR=black
diff --git a/src-qt5/core/libLumina/themes/Glass.qss.template b/src-qt5/core/libLumina/themes/Glass.qss.template
index 827d8de4..d594d25e 100644
--- a/src-qt5/core/libLumina/themes/Glass.qss.template
+++ b/src-qt5/core/libLumina/themes/Glass.qss.template
@@ -24,15 +24,6 @@ QStackedWidget .QWidget{
   color: %%TEXTCOLOR%%;
   border: none;
 }
-/* Transparency does not work on main pages within tabwidgets*/
-QTabWidget QStackedWidget .QWidget{
-  background: %%ALTBASECOLOR%%;
-}
-QTabWidget{
-  background: %%ALTBASECOLOR%%;
-  color: %%TEXTCOLOR%%;
-  border: none;
-}
 
 QToolBox::tab{
   color: %%TEXTCOLOR%%;
@@ -96,8 +87,21 @@ QMenu::item{
   Custom Font settings need to be here and NOT in the ::tab fields, 
       otherwise it will break auto-scaling of the tab sizes to fit the text
 }*/
+/* Transparency does not work on main pages within tabwidgets*/
+QTabWidget QStackedWidget .QWidget{
+  background: rgb(230,230,230);
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+QTabWidget{
+  color: black;
+  border: none;
+}
+QTabWidget QLabel{
+  color: black;
+}
 QTabBar::tab {
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%ALTBASECOLOR%%);
   border: 1px solid %%ACCENTCOLOR%%;
   padding: 2px;
   color: %%TEXTCOLOR%%;
@@ -128,7 +132,8 @@ QTabBar::tab:left{
   min-height: 0em;
 }
 QTabBar::tab:selected{
-     background: %%HIGHLIGHTDISABLECOLOR%%;
+     background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 rgb(230,230,230));
+    border-bottom: none;
 }
 QTabBar::tab:hover {
     background: %%HIGHLIGHTCOLOR%%;
@@ -255,59 +260,35 @@ QHeaderView::section:hover{
 
 /* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/
 QScrollBar{
-  background:%%BASECOLOR%%;
+  background:%%ALTBASECOLOR%%;
 }
 QScrollBar:horizontal{
-  margin: 0px 20px 0px 20px;
+  margin: 0px 0px 0px 0px;
 }
 QScrollBar:vertical{
-  margin: 20px 0px 20px 0px;
-}
-QScrollBar::sub-page, QScrollBar::add-page{
-  background: %%BASECOLOR%%;
-  border: 1px solid transparent;
-}
-QScrollBar::sub-page:vertical{
-  border-bottom: none;
-}
-QScrollBar::add-page:vertical{
-  border-top: none;
-}
-QScrollBar::sub-page:horizontal{
-  border-right: none;
-}
-QScrollBar::add-page:horizontal{
-  border-left: none;
+  margin: 0px 0px 0px 0px;
 }
 QScrollBar::handle{
-  background: QLinearGradient(x1: 0.5, y1: 0, x2: 0.5, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 0.5 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%);
+  background: %%SECONDARYCOLOR%%;
   border: 1px solid transparent;
-  border-radius: 3px;
+  border-radius: 7px;
 }
 QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{
-  background: %%HIGHLIGHTCOLOR%%;
+  background: %%SECONDARYDISABLECOLOR%%;
 }
 QScrollBar::add-line{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
-  border: 1px solid transparent;
-  border-radius: 3px;
-subcontrol-position: bottom right;
-subcontrol-origin: margin;
+subcontrol-origin: none;
 }
 QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{
-height: 20px;
+height: 0px;
 }
 QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{
-width: 20px;
+width: 0px;
 }
 QScrollBar::sub-line{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%);
-  border: 1px solid transparent;
-  border-radius: 3px;
-subcontrol-position: top left;
-subcontrol-origin: margin;
-height: 20px;
+subcontrol-origin: none;
 }
+
 /* SLIDERS */
 QSlider::groove:horizontal {
 border: 1px solid %%ACCENTCOLOR%%;
@@ -539,7 +520,7 @@ LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover,
  }
 QCalendarWidget QWidget{ 
    background-color: %%BASECOLOR%%; 
-   alternate-background-color: rgba(229, 229, 229, 50);
+   alternate-background-color: rgba(255, 255, 255, 50);
    color: %%TEXTCOLOR%%;
 }
 QCalendarWidget QAbstractButton{
@@ -553,6 +534,6 @@ QCalendarWidget QAbstractItemView{
   selection-color: %%TEXTHIGHLIGHTCOLOR%%;
 }
 QCalendarWidget QWidget#qt_calendar_calendarview{ 
-  background-color: %%ALTBASECOLOR%%;
+  background-color: rgb(220,220,220);
   border: none;
 }