diff --git a/cmd/mist/assets/backButtonDisabled.png b/cmd/mist/assets/backButtonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..42874787022eef2eaff8fb67735513c7b7273742
Binary files /dev/null and b/cmd/mist/assets/backButtonDisabled.png differ
diff --git a/cmd/mist/assets/backButtonDisabled@2x.png b/cmd/mist/assets/backButtonDisabled@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eaa6daa5e2bbf73f7f34e9d34efeaaa719981e5
Binary files /dev/null and b/cmd/mist/assets/backButtonDisabled@2x.png differ
diff --git a/cmd/mist/assets/backButtonHover.png b/cmd/mist/assets/backButtonHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c5226f5a2b59ee83e8bc95ec5a062521892f792
Binary files /dev/null and b/cmd/mist/assets/backButtonHover.png differ
diff --git a/cmd/mist/assets/backButtonHover@2x.png b/cmd/mist/assets/backButtonHover@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..406601ebc562a63c6a1480b8589b1ebda9855a02
Binary files /dev/null and b/cmd/mist/assets/backButtonHover@2x.png differ
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index c9505806c36780c35f6d150dc7ac7acb94a4eff0..1272f8761982c129536d6214762bf6c86b6b4ba1 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -485,7 +485,7 @@ ApplicationWindow {
label.visible = !on
buttonLabel.visible = on
}
-
+
width: 192
height: 55
color: "#00000000"
diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml
index a6f4e3d925d8575c53b3e2694cb694dce1b4a7ba..3a35c2a65b5171cd1cd580406f1e2895de9b2d30 100644
--- a/cmd/mist/assets/qml/views/browser.qml
+++ b/cmd/mist/assets/qml/views/browser.qml
@@ -129,9 +129,9 @@ Rectangle {
Button {
id: back
-
- onClicked: {
- webview.goBack()
+ z: 30
+ onClicked: {
+ webview.goBack()
}
anchors {
@@ -140,21 +140,23 @@ Rectangle {
}
style: ButtonStyle {
- background: Image {
- source: "../../backButton.png"
- width: 20
- height: 30
- }
+ background: Image {
+ source: (webview.canGoBack) ?
+ (control.hovered ? "../../backButtonHover.png" : "../../backButton.png") :
+ "../../backButtonDisabled.png"
+ width: 20
+ height: 30
+ }
}
}
Rectangle {
- id: appInfoPane
- height: 28
- color: "#FFFFFF"
- radius: 6
-
- MouseArea {
+ id: appInfoPane
+ height: 28
+ color: "#FFFFFF"
+ radius: 6
+ z:2
+ MouseArea {
anchors.fill: parent
z: 10
hoverEnabled: true
@@ -247,7 +249,7 @@ Rectangle {
}
}
- z:2
+
}
Rectangle {
@@ -256,6 +258,7 @@ Rectangle {
height: 30
color: "#BDB6B6"
radius: 6
+ z:1
anchors {
left: back.right
@@ -264,19 +267,17 @@ Rectangle {
rightMargin:10
top: parent.top
topMargin: 23
- }
-
- z:1
+ }
}
Rectangle {
id: navBarBackground
anchors.fill: parent
+ z:-1
gradient: Gradient {
GradientStop { position: 0.0; color: "#F6F1F2" }
GradientStop { position: 1.0; color: "#DED5D5" }
}
- z:-1
}
states: [