Browse Source

Remove text_reversed

This theme item is broken by nature since the theme itself allows you to change the colours such that these text elements don't get inversed colours at all. Instead I'm going to use text_emphasis for these which is currently the same. If ever they need to get different colours for these items than the normal colour, the theme item will have to be split up.

Contributes to issue CURA-4148.
Ghostkeeper 7 years ago
parent
commit
f5169f53f3

+ 1 - 1
resources/qml/SidebarSimple.qml

@@ -133,7 +133,7 @@ Item
                         color: {
                             if(infillListView.activeIndex == index)
                             {
-                                return UM.Theme.getColor("text_reversed")
+                                return UM.Theme.getColor("text_emphasis")
                             }
                             if(!base.settingsEnabled)
                             {

+ 2 - 2
resources/qml/Topbar.qml

@@ -88,7 +88,7 @@ Rectangle
                     case "offline":
                         return UM.Theme.getColor("status_offline");
                     default:
-                        return UM.Theme.getColor("text_reversed");
+                        return UM.Theme.getColor("text_emphasis");
                 }
             }
             property string overlayIconSource:
@@ -191,7 +191,7 @@ Rectangle
                     height: UM.Theme.getSize("standard_arrow").height
                     sourceSize.width: width
                     sourceSize.height: width
-                    color: UM.Theme.getColor("text_reversed")
+                    color: UM.Theme.getColor("text_emphasis")
                     source: UM.Theme.getIcon("arrow_bottom")
                 }
                 Label

+ 1 - 1
resources/themes/cura/styles.qml

@@ -140,7 +140,7 @@ QtObject {
                     UM.RecolorImage
                     {
                         id: icon
-                        color: UM.Theme.getColor("text_reversed")
+                        color: UM.Theme.getColor("text_emphasis")
                         opacity: !control.enabled ? 0.2 : 1.0
                         source: control.iconSource
                         width: Theme.getSize("button_icon").width

+ 0 - 1
resources/themes/cura/theme.json

@@ -64,7 +64,6 @@
         "text_inactive": [255, 255, 255, 88],
         "text_hover": [255, 255, 255, 204],
         "text_pressed": [255, 255, 255, 204],
-        "text_reversed": [255, 255, 255, 255],
         "text_subtext": [255, 255, 255, 172],
         "text_emphasis": [255, 255, 255, 255],