From cff2b379d4d00ba68bead6f6127d554624172dc1 Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Mon, 3 Jun 2019 19:25:10 +0300 Subject: [PATCH] Themes have been changed --- .../dark_style_sheet/qdarkstyle/style.qss | 24 +++++++++++-- .../qlightstyle/lightstyle.qss | 34 +++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/3rdparty/dark_style_sheet/qdarkstyle/style.qss b/3rdparty/dark_style_sheet/qdarkstyle/style.qss index 1c2fa3a..44d1983 100644 --- a/3rdparty/dark_style_sheet/qdarkstyle/style.qss +++ b/3rdparty/dark_style_sheet/qdarkstyle/style.qss @@ -349,6 +349,11 @@ QLineEdit color: #eff0f1; } +QLineEdit[text=""] +{ + color: #fff; +} + QLineEdit:disabled{ color: #858585; } @@ -976,7 +981,6 @@ QTabBar QToolButton::right-arrow:disabled { image: url(:/qss_qdark_icons/rc/left_arrow_disabled.png); } - QDockWidget { background: #383838; border: 1px solid #403F3F; @@ -989,15 +993,31 @@ QDockWidget::title{ padding-left: 5px; padding-top: 4px; margin-top: 4px; + icon-size: 16px; } - QDockWidget::close-button, QDockWidget::float-button { border: 1px solid transparent; border-radius: 2px; background: transparent; } +QDockWidget::close-button { + subcontrol-position: top right; + subcontrol-origin: margin; + position: absolute; + top: 4px; left: 0px; bottom: 0px; right: 2px; + width: 16px; +} + +QDockWidget::float-button { + subcontrol-position: top right; + subcontrol-origin: margin; + position: absolute; + top: 4px; left: 0px; bottom: 0px; right: 18px; + width: 16px; +} + QDockWidget::close-button:hover, QDockWidget::float-button:hover { \\ background: rgba(255, 255, 255, 10); } diff --git a/3rdparty/light_style_sheet/qlightstyle/lightstyle.qss b/3rdparty/light_style_sheet/qlightstyle/lightstyle.qss index 61af1cb..223d324 100644 --- a/3rdparty/light_style_sheet/qlightstyle/lightstyle.qss +++ b/3rdparty/light_style_sheet/qlightstyle/lightstyle.qss @@ -349,6 +349,11 @@ QLineEdit color: #000; } +QLineEdit[text=""] +{ + color:#000; +} + QLineEdit:disabled{ color: #858585; } @@ -1007,21 +1012,44 @@ QDockWidget { titlebar-normal-icon: url(:/qss_qlight_icons/rc/transparent.png); } -QDockWidget::title{ +\\QDockWidget::title{ \\ background: #f0f0f0; - background-color: #d2d2d2; +\\ background-color: #d2d2d2; +\\ padding-left: 5px; +\\ padding-top: 4px; +\\ margin-top: 4px; +\\} + +QDockWidget::title{ + background: #f0f0f0; padding-left: 5px; padding-top: 4px; margin-top: 4px; + icon-size: 16px; } - QDockWidget::close-button, QDockWidget::float-button { border: 1px solid transparent; border-radius: 2px; background: transparent; } +QDockWidget::close-button { + subcontrol-position: top right; + subcontrol-origin: margin; + position: absolute; + top: 4px; left: 0px; bottom: 0px; right: 2px; + width: 16px; +} + +QDockWidget::float-button { + subcontrol-position: top right; + subcontrol-origin: margin; + position: absolute; + top: 4px; left: 0px; bottom: 0px; right: 18px; + width: 16px; +} + QDockWidget::close-button:hover, QDockWidget::float-button:hover { \\ background: rgba(255, 255, 255, 10); \\ background-color: #fff;