aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2021-03-16 11:54:53 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2021-03-16 17:18:31 +0000
commitf0983a08c9d3825dbf902dc694d97ff024bf0d9a (patch)
treed6e9430fee4262520e66cf96e15c82f170ec719e
parentd41d59774a7ca003fce131b23ff3b0cce487eff4 (diff)
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 <thomas.hartmann@qt.io>
-rw-r--r--share/qtcreator/themes/default.creatortheme2
-rw-r--r--share/qtcreator/themes/design-light.creatortheme2
-rw-r--r--share/qtcreator/themes/flat-light.creatortheme2
-rw-r--r--src/plugins/qmldesigner/components/resources/stylesheet.css12
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;
+}