Skip to content
This repository has been archived by the owner on Nov 4, 2023. It is now read-only.

Commit

Permalink
Match the 'emergency' bar to the new greeter design (#418)
Browse files Browse the repository at this point in the history
* Match the passphrase box colors

* Remove bar background for better consistency
  • Loading branch information
Fuseteam authored Jan 7, 2022
1 parent 4eca819 commit 567f833
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions qml/Greeter/NarrowView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,6 @@ FocusScope {
anchors.topMargin: - height * (1 - coverPage.showProgress)
- ( inputMethodRect.height )

Rectangle {
color: UbuntuColors.porcelain // matches OSK background
anchors.fill: parent
}

Label {
text: i18n.tr("Cancel")
anchors.left: parent.left
Expand All @@ -228,7 +223,7 @@ FocusScope {
verticalAlignment: Text.AlignVCenter
font.weight: Font.Light
fontSize: "small"
color: UbuntuColors.slate
color: theme.palette.normal.raisedSecondaryText

AbstractButton {
anchors.fill: parent
Expand All @@ -248,7 +243,7 @@ FocusScope {
verticalAlignment: Text.AlignVCenter
font.weight: Font.Light
fontSize: "small"
color: UbuntuColors.slate
color: theme.palette.normal.raisedSecondaryText
// TODO: uncomment once bug 1616538 is fixed
// visible: telepathyHelper.ready && telepathyHelper.emergencyCallsAvailable
enabled: visible
Expand Down

0 comments on commit 567f833

Please sign in to comment.