buttons improvements

3 files changed, 69 insertions, 50 deletions

diff --git a/Kogaion-bright/lxqt-panel.qss b/Kogaion-bright/lxqt-panel.qss
index 3814bb7..21c81c7 100644
--- a/Kogaion-bright/lxqt-panel.qss
+++ b/Kogaion-bright/lxqt-panel.qss
@@ -39,7 +39,7 @@ Plugin > QToolButton,
 Plugin > QWidget > QToolButton,
 Plugin > QWidget > QToolButton > QWidget > QToolButton,
 LXQtPanelPlugin > QToolButton {
-    margin: 2px;
+    margin: 1px;
     border: 0px solid transparent;
     outline: none;
     qproperty-iconSize: 24px;
@@ -55,7 +55,7 @@ LXQtPanelPlugin > QToolButton:hover {
 Plugin > QToolButton:pressed,
 Plugin > QWidget > QToolButton:pressed,
 LXQtPanelPlugin > QToolButton:pressed {
-    padding: 4px;
+    padding: 2px;
 }
 
 /*
@@ -204,7 +204,7 @@ QCalendarWidget QSpinBox {
 
 #QuickLaunch QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -221,7 +221,7 @@ QCalendarWidget QSpinBox {
  */
 #TaskBar QToolButton{
     border-bottom: 1px solid #6e6e6e;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -266,7 +266,7 @@ TrayIcon {
  */
 #LXQtMountPlugin QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -314,7 +314,7 @@ TrayIcon {
  */
 #VolumePlugin QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -333,9 +333,11 @@ VolumePopup {
     padding: 2px;
 }
 
-VolumePopup  > QPushButton:flat {
+VolumePopup  > QPushButton {
     color: #555555;
-    background: #dedede;
+    background: #f0f0f0;
+    border: 1px solid #b4b4b4;
+    border-radius: 0px;
     padding: 2px 10px;
     margin: 3px;
     qproperty-iconSize: 24px;
@@ -343,6 +345,12 @@ VolumePopup  > QPushButton:flat {
 
 VolumePopup  > QPushButton:hover {
     border: 1px solid #157dec;
+    background: #96c7fb;
+}
+
+VolumePopup  > QPushButton:pressed {
+    border: 1px solid #838b94;
+    background: #adc2d8;
 }
 
 VolumePopup  > QSlider::groove:vertical {
@@ -372,7 +380,7 @@ border-radius: 0px;
  * Clock
  */
 #Clock{
-    margin: 0px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -399,7 +407,7 @@ border-radius: 0px;
  */
 #ShowDesktop {
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -415,20 +423,21 @@ border-radius: 0px;
  * Desktopswitch
  */
 #DesktopSwitch QToolButton {
-    margin: 2px;
+    margin: 1px;
     color: #555555;
-    border-bottom: 3px solid #6e6e6e;
+    border-bottom: 1px solid #6e6e6e;
     background: #dedede;
+    padding: 2px;
 }
 
 #DesktopSwitch QToolButton:on {
     background: #cccccc;
-    border-bottom: 3px solid #157DEC;
+    border-bottom: 1px solid #157DEC;
 }
 
 #DesktopSwitch QToolButton:hover {
     border: 1px solid #157dec;
-    border-bottom: 3px solid #157DEC;
+    border-bottom: 1px solid #157DEC;
 }
 
 #DesktopSwitch QToolButton:pressed {
@@ -445,7 +454,7 @@ border-radius: 0px;
  */
 #PanelScreenSaver {
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
diff --git a/Kogaion-daytime/lxqt-panel.qss b/Kogaion-daytime/lxqt-panel.qss
index 9f2f3b6..7ed53b4 100644
--- a/Kogaion-daytime/lxqt-panel.qss
+++ b/Kogaion-daytime/lxqt-panel.qss
@@ -39,7 +39,7 @@ Plugin > QToolButton,
 Plugin > QWidget > QToolButton,
 Plugin > QWidget > QToolButton > QWidget > QToolButton,
 LXQtPanelPlugin > QToolButton {
-    margin: 2px;
+    margin: 1px;
     border: 0px solid transparent;
     outline: none;
     qproperty-iconSize: 24px;
@@ -55,7 +55,7 @@ LXQtPanelPlugin > QToolButton:hover {
 Plugin > QToolButton:pressed,
 Plugin > QWidget > QToolButton:pressed,
 LXQtPanelPlugin > QToolButton:pressed {
-    padding: 4px;
+    padding: 2px;
 }
 
 /*
@@ -64,7 +64,7 @@ LXQtPanelPlugin > QToolButton:pressed {
 
 QMenu {
     background-color: #dedede;
-    border: 1px solid #6e6e6e;
+    border: 1px solid #4c4c4c;
 }
 
 QMenu::separator {
@@ -110,7 +110,7 @@ QCalendarWidget QAbstractItemView:enabled {
     color: #2D2D2D;
     selection-background-color: #157DEC;
     selection-color: #f9f9f9;
-    border: 1px solid #6e6e6e;
+    border: 1px solid #4c4c4c;
     border-top: transparent;
 }
 
@@ -125,9 +125,9 @@ QCalendarWidget #qt_calendar_navigationbar {
     background-color: #dedede;
     color: #555555;
     padding: 2px;
-    border-top: 1px solid #6e6e6e;
-    border-left: 1px solid #6e6e6e;
-    border-right: 1px solid #6e6e6e;
+    border-top: 1px solid #4c4c4c;
+    border-left: 1px solid #4c4c4c;
+    border-right: 1px solid #4c4c4c;
 }
 
 QCalendarWidget QToolButton {
@@ -155,7 +155,7 @@ QCalendarWidget #qt_calendar_prevmonth {
 }
 
 QCalendarWidget QMenu {
-    border-color: #6e6e6e;
+    border-color: #4c4c4c;
     background-color: #dedede;
     color: #555555;
 }
@@ -204,7 +204,7 @@ QCalendarWidget QSpinBox {
 
 #QuickLaunch QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -221,7 +221,7 @@ QCalendarWidget QSpinBox {
  */
 #TaskBar QToolButton{
     border-bottom: 1px solid #4C4C4C;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -266,7 +266,7 @@ TrayIcon {
  */
 #LXQtMountPlugin QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -314,7 +314,7 @@ TrayIcon {
  */
 #VolumePlugin QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -328,13 +328,16 @@ TrayIcon {
 
 VolumePopup {
     background: #2D2D2D;
-    margin: 2px;
+    border: 1px solid #4C4C4C;
+    margin: 0px;
     padding: 2px;
 }
 
 VolumePopup  > QPushButton {
     color: #DEDEDE;
     background: #2D2D2D;
+    border: 1px solid #4C4C4C;
+    border-radius: 0px;
     padding: 2px 10px;
     margin: 3px;
     qproperty-iconSize: 24px;
@@ -342,6 +345,7 @@ VolumePopup  > QPushButton {
 
 VolumePopup  > QPushButton:hover {
     border: 1px solid #157dec;
+    background: #1f3d65;
 }
 
 VolumePopup  > QSlider::groove:vertical {
@@ -371,7 +375,7 @@ border-radius: 0px;
  * Clock
  */
 #Clock{
-    margin: 0px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -398,7 +402,7 @@ border-radius: 0px;
  */
 #ShowDesktop {
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -414,20 +418,21 @@ border-radius: 0px;
  * Desktopswitch
  */
 #DesktopSwitch QToolButton {
-    margin: 2px;
+    margin: 1px;
     color: #DEDEDE;
-    border-bottom: 3px solid #4C4C4C;
+    border-bottom: 1px solid #4C4C4C;
     background: #2D2D2D;
+    padding: 2px;
 }
 
 #DesktopSwitch QToolButton:on {
     background: #1A1A1A;
-    border-bottom: 3px solid #157DEC;
+    border-bottom: 1px solid #157DEC;
 }
 
 #DesktopSwitch QToolButton:hover {
     border: 1px solid #157dec;
-    border-bottom: 3px solid #157DEC;
+    border-bottom: 1px solid #157DEC;
 }
 
 #DesktopSwitch QToolButton:pressed {
@@ -444,7 +449,7 @@ border-radius: 0px;
  */
 #PanelScreenSaver {
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
diff --git a/Kogaion-nighttime/lxqt-panel.qss b/Kogaion-nighttime/lxqt-panel.qss
index 86bd9b6..67fe58e 100644
--- a/Kogaion-nighttime/lxqt-panel.qss
+++ b/Kogaion-nighttime/lxqt-panel.qss
@@ -39,7 +39,7 @@ Plugin > QToolButton,
 Plugin > QWidget > QToolButton,
 Plugin > QWidget > QToolButton > QWidget > QToolButton,
 LXQtPanelPlugin > QToolButton {
-    margin: 2px;
+    margin: 1px;
     border: 0px solid transparent;
     outline: none;
     qproperty-iconSize: 24px;
@@ -55,7 +55,7 @@ LXQtPanelPlugin > QToolButton:hover {
 Plugin > QToolButton:pressed,
 Plugin > QWidget > QToolButton:pressed,
 LXQtPanelPlugin > QToolButton:pressed {
-    padding: 4px;
+    padding: 2px;
 }
 
 /*
@@ -207,7 +207,7 @@ QCalendarWidget QSpinBox {
 
 #QuickLaunch QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -224,7 +224,7 @@ QCalendarWidget QSpinBox {
  */
 #TaskBar QToolButton{
     border-bottom: 1px solid #4C4C4C;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -269,7 +269,7 @@ TrayIcon {
  */
 #LXQtMountPlugin QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -317,7 +317,7 @@ TrayIcon {
  */
 #VolumePlugin QToolButton{
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -331,13 +331,16 @@ TrayIcon {
 
 VolumePopup {
     background: #2D2D2D;
-    margin: 2px;
+    border: 1px solid #4C4C4C;
+    margin: 0px;
     padding: 2px;
 }
 
-VolumePopup  > QPushButton:flat {
+VolumePopup  > QPushButton {
     color: #DEDEDE;
     background: #2D2D2D;
+    border: 1px solid #4C4C4C;
+    border-radius: 0px;
     padding: 2px 10px;
     margin: 3px;
     qproperty-iconSize: 24px;
@@ -345,6 +348,7 @@ VolumePopup  > QPushButton:flat {
 
 VolumePopup  > QPushButton:hover {
     border: 1px solid #1956a6;
+    background: #1f3d65;
 }
 
 VolumePopup  > QSlider::groove:vertical {
@@ -374,7 +378,7 @@ border-radius: 0px;
  * Clock
  */
 #Clock{
-    margin: 0px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -401,7 +405,7 @@ border-radius: 0px;
  */
 #ShowDesktop {
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }
 
@@ -417,20 +421,21 @@ border-radius: 0px;
  * Desktopswitch
  */
 #DesktopSwitch QToolButton {
-    margin: 2px;
+    margin: 1px;
     color: #DEDEDE;
-    border-bottom: 3px solid #4C4C4C;
+    border-bottom: 1px solid #4C4C4C;
     background: #2D2D2D;
+    padding: 2px;
 }
 
 #DesktopSwitch QToolButton:on {
     background: #1A1A1A;
-    border-bottom: 3px solid #1956a6;
+    border-bottom: 1px solid #1956a6;
 }
 
 #DesktopSwitch QToolButton:hover {
     border: 1px solid #1956a6;
-    border-bottom: 3px solid #1956a6;
+    border-bottom: 1px solid #1956a6;
 }
 
 #DesktopSwitch QToolButton:pressed {
@@ -447,7 +452,7 @@ border-radius: 0px;
  */
 #PanelScreenSaver {
     border: 0px;
-    margin: 2px;
+    margin: 1px;
     padding: 2px;
 }