From f0983a08c9d3825dbf902dc694d97ff024bf0d9a Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Tue, 16 Mar 2021 11:54:53 +0100 Subject: QmlDesigner: Replace CSS color role * Replace color role in CSS * Add hover and focus state in CSS * Fix hex color value in creator themes Change-Id: I59626f369e2c02089f22bd51557d8226e2dc3631 Reviewed-by: Thomas Hartmann --- share/qtcreator/themes/default.creatortheme | 2 +- share/qtcreator/themes/design-light.creatortheme | 2 +- share/qtcreator/themes/flat-light.creatortheme | 2 +- src/plugins/qmldesigner/components/resources/stylesheet.css | 12 +++++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index dcca311d9e..6b856d7f34 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -96,7 +96,7 @@ DSdockWidgetSplitter=ff595959 DSdockWidgetTitleBar=ffeaeaea DStitleBarText=ffdadada -DStitleBarIcon=f4f5052 +DStitleBarIcon=ff4f5052 DStitleBarButtonHover=40ffffff DStitleBarButtonPress=60ffffff diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 44b4109dd2..17783db3c0 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -110,7 +110,7 @@ DSdockWidgetSplitter=ff595959 DSdockWidgetTitleBar=ffeaeaea DStitleBarText=ffdadada -DStitleBarIcon=f4f5052 +DStitleBarIcon=ff4f5052 DStitleBarButtonHover=40ffffff DStitleBarButtonPress=60ffffff diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 21be06f7ee..123c680fc6 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -105,7 +105,7 @@ DSdockWidgetSplitter=ff595959 DSdockWidgetTitleBar=ffeaeaea DStitleBarText=ffdadada -DStitleBarIcon=f4f5052 +DStitleBarIcon=ff4f5052 DStitleBarButtonHover=40ffffff DStitleBarButtonPress=60ffffff diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css index dfc80a5b59..501e9ab1d5 100644 --- a/src/plugins/qmldesigner/components/resources/stylesheet.css +++ b/src/plugins/qmldesigner/components/resources/stylesheet.css @@ -81,7 +81,17 @@ QTabBar::tab:selected { QLineEdit { color: creatorTheme.DStextColor; - background-color: creatorTheme.DSdockAreaBackground; + background-color: creatorTheme.DScontrolBackground; + border: 1px solid creatorTheme.DScontrolOutline; selection-color: creatorTheme.DStextSelectedTextColor; selection-background-color: creatorTheme.DStextSelectionColor; } + +QLineEdit:hover { + background-color: creatorTheme.DScontrolBackgroundHover; +} + +QLineEdit:focus { + background-color: creatorTheme.DScontrolBackgroundInteraction; + border-color: creatorTheme.DScontrolOutlineInteraction; +} -- cgit v1.2.3