git.iko.soy/unity8
on xenial help sign in
improve some colors after having a chat with design, add disabled state for Done button
commitb41b8885ce3cd919c21fb39f13c37a3371941874 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 20 May 2014, 13:51 (12 years ago) parent91548de
2 files changed+6−2
compare with xenial
unifiedsplit
qml/Components/PinPadButton.qml+2−1 qml/Greeter/PinLockscreen.qml+4−1
qml/Components/PinPadButton.qml+2−1
@@ -19,6 +19,7 @@ import Ubuntu.Components 0.1
1919
2020Item {
2121 id: root
22+ opacity: enabled ? 1 : 0.6
2223
2324 property alias text: label.text
2425 property alias subText: subTextLabel.text
@@ -62,7 +63,7 @@ Item {
6263 Label {
6364 id: subTextLabel
6465 fontSize: "small"
65− color: "grey"
66+ color: "#f3f3e7"
6667 anchors.horizontalCenter: parent.horizontalCenter
6768 visible: text.length > 0
6869 }
qml/Greeter/PinLockscreen.qml+4−1
@@ -90,7 +90,8 @@ Column {
9090 id: pinentryFieldPlaceHolder
9191 objectName: "pinentryFieldPlaceHolder"
9292 anchors.centerIn: parent
93− color: "grey"
93+ color: "#f3f3e7"
94+ opacity: 0.6
9495 text: wrongPasswordAnimation.running ? parent.wrongPlaceholderText : parent.placeholderText
9596 visible: pinentryFieldLabel.text.length == 0
9697 }
@@ -109,6 +110,8 @@ Column {
109110 visible: !priv.autoConfirm
110111 width: height
111112 name: "erase"
113+ color: "#f3f3e7"
114+ opacity: 0.6
112115 MouseArea {
113116 anchors.fill: parent
114117 onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);