git.iko.soy/unity8
on xenial help sign in
improve some colors after having a chat with design, add disabled state for Done button
b41b888Michael Zanetti
qml/Components/PinPadButton.qml+2−1
compare with xenial
unifiedsplit
@@ -19,6 +19,7 @@ import Ubuntu.Components 0.1
19
19
20Item {
20Item {
21 id: root
21 id: root
22+ opacity: enabled ? 1 : 0.6
22
23
23 property alias text: label.text
24 property alias text: label.text
24 property alias subText: subTextLabel.text
25 property alias subText: subTextLabel.text
@@ -62,7 +63,7 @@ Item {
62 Label {
63 Label {
63 id: subTextLabel
64 id: subTextLabel
64 fontSize: "small"
65 fontSize: "small"
65− color: "grey"
66+ color: "#f3f3e7"
66 anchors.horizontalCenter: parent.horizontalCenter
67 anchors.horizontalCenter: parent.horizontalCenter
67 visible: text.length > 0
68 visible: text.length > 0
68 }
69 }
qml/Greeter/PinLockscreen.qml+4−1
@@ -90,7 +90,8 @@ Column {
90 id: pinentryFieldPlaceHolder
90 id: pinentryFieldPlaceHolder
91 objectName: "pinentryFieldPlaceHolder"
91 objectName: "pinentryFieldPlaceHolder"
92 anchors.centerIn: parent
92 anchors.centerIn: parent
93− color: "grey"
93+ color: "#f3f3e7"
94+ opacity: 0.6
94 text: wrongPasswordAnimation.running ? parent.wrongPlaceholderText : parent.placeholderText
95 text: wrongPasswordAnimation.running ? parent.wrongPlaceholderText : parent.placeholderText
95 visible: pinentryFieldLabel.text.length == 0
96 visible: pinentryFieldLabel.text.length == 0
96 }
97 }
@@ -109,6 +110,8 @@ Column {
109 visible: !priv.autoConfirm
110 visible: !priv.autoConfirm
110 width: height
111 width: height
111 name: "erase"
112 name: "erase"
113+ color: "#f3f3e7"
114+ opacity: 0.6
112 MouseArea {
115 MouseArea {
113 anchors.fill: parent
116 anchors.fill: parent
114 onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
117 onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);