git.iko.soy/unity8
on xenial help sign in
Match the 'emergency' bar to the new greeter design (#418)
567f833Rahammetoela Toekiman
qml/Greeter/NarrowView.qml+2−7
compare with xenial
unifiedsplit
@@ -214,11 +214,6 @@ FocusScope {
214 anchors.topMargin: - height * (1 - coverPage.showProgress)
214 anchors.topMargin: - height * (1 - coverPage.showProgress)
215 - ( inputMethodRect.height )
215 - ( inputMethodRect.height )
216
216
217− Rectangle {
218− color: UbuntuColors.porcelain // matches OSK background
219− anchors.fill: parent
220− }
221−
222 Label {
217 Label {
223 text: i18n.tr("Cancel")
218 text: i18n.tr("Cancel")
224 anchors.left: parent.left
219 anchors.left: parent.left
@@ -228,7 +223,7 @@ FocusScope {
228 verticalAlignment: Text.AlignVCenter
223 verticalAlignment: Text.AlignVCenter
229 font.weight: Font.Light
224 font.weight: Font.Light
230 fontSize: "small"
225 fontSize: "small"
231− color: UbuntuColors.slate
226+ color: theme.palette.normal.raisedSecondaryText
232
227
233 AbstractButton {
228 AbstractButton {
234 anchors.fill: parent
229 anchors.fill: parent
@@ -248,7 +243,7 @@ FocusScope {
248 verticalAlignment: Text.AlignVCenter
243 verticalAlignment: Text.AlignVCenter
249 font.weight: Font.Light
244 font.weight: Font.Light
250 fontSize: "small"
245 fontSize: "small"
251− color: UbuntuColors.slate
246+ color: theme.palette.normal.raisedSecondaryText
252 // TODO: uncomment once bug 1616538 is fixed
247 // TODO: uncomment once bug 1616538 is fixed
253 // visible: telepathyHelper.ready && telepathyHelper.emergencyCallsAvailable
248 // visible: telepathyHelper.ready && telepathyHelper.emergencyCallsAvailable
254 enabled: visible
249 enabled: visible