git.iko.soy/unity8
on xenial help sign in
Change the default foreground color
12d39f9Michał Sawicz
plugins/Dash/ScopeStyle.qml+1−1
compare with xenial
unifiedsplit
@@ -89,7 +89,7 @@ QtObject {
89 property var d: QtObject {
89 property var d: QtObject {
90 // FIXME: should be taken from the theme
90 // FIXME: should be taken from the theme
91 readonly property color defaultLight: "white"
91 readonly property color defaultLight: "white"
92− readonly property color defaultDark: Theme.palette.normal.baseText
92+ readonly property color defaultDark: UbuntuColors.darkGrey
93 readonly property real defaultLightLuminance: Style.luminance(defaultLight)
93 readonly property real defaultLightLuminance: Style.luminance(defaultLight)
94 readonly property real defaultDarkLuminance: Style.luminance(defaultDark)
94 readonly property real defaultDarkLuminance: Style.luminance(defaultDark)
95
95
tests/plugins/Dash/tst_ScopeStyle.qml+4−4
@@ -52,7 +52,7 @@ Rectangle {
52
52
53 function test_foreground_data() {
53 function test_foreground_data() {
54 return [
54 return [
55− { tag: "default", index: 0, foreground: Theme.palette.normal.foreground, luminance: 0.5725 },
55+ { tag: "default", index: 0, foreground: UbuntuColors.darkGrey, luminance: 0.3647 },
56 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },
56 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },
57 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },
57 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },
58 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },
58 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },
@@ -84,7 +84,7 @@ Rectangle {
84
84
85 function test_threshold_data() {
85 function test_threshold_data() {
86 return [
86 return [
87− { tag: "default", index: 0, threshold: 0.7863 },
87+ { tag: "default", index: 0, threshold: 0.6824 },
88 { tag: "red on black", index: 1, threshold: 0.1063 },
88 { tag: "red on black", index: 1, threshold: 0.1063 },
89 { tag: "green on white", index: 2, threshold: 0.6795 },
89 { tag: "green on white", index: 2, threshold: 0.6795 },
90 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },
90 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },
@@ -113,7 +113,7 @@ Rectangle {
113
113
114 function test_dark_data() {
114 function test_dark_data() {
115 return [
115 return [
116− { tag: "default", index: 0, dark: Theme.palette.normal.baseText },
116+ { tag: "default", index: 0, dark: UbuntuColors.darkGrey },
117 { tag: "red on black", index: 1, dark: "black" },
117 { tag: "red on black", index: 1, dark: "black" },
118 { tag: "green on white", index: 2, dark: "green" },
118 { tag: "green on white", index: 2, dark: "green" },
119 { tag: "blue on darkgrey", index: 3, dark: "blue" },
119 { tag: "blue on darkgrey", index: 3, dark: "blue" },
@@ -140,7 +140,7 @@ Rectangle {
140
140
141 function test_headerForeground_data() {
141 function test_headerForeground_data() {
142 return [
142 return [
143− { tag: "default", index: 0, headerForeground: Theme.palette.normal.baseText },
143+ { tag: "default", index: 0, headerForeground: UbuntuColors.darkGrey },
144 { tag: "black", index: 2, headerForeground: "black" },
144 { tag: "black", index: 2, headerForeground: "black" },
145 ];
145 ];
146 }
146 }