Merge pull request #521

3d9ffca LeftPanel.qml (xmr-eric)
c7435c5 MenuButton.qml (xmr-eric)
This commit is contained in:
Riccardo Spagni 2017-03-03 16:28:05 +02:00
commit cebf4a01a8
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 3 deletions

View file

@ -76,7 +76,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 40 anchors.topMargin: 36
height: logo.implicitHeight height: logo.implicitHeight
Image { Image {
@ -108,7 +108,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: logoItem.bottom anchors.top: logoItem.bottom
anchors.topMargin: 30 anchors.topMargin: 26
spacing: 5 spacing: 5
Label { Label {

View file

@ -50,7 +50,7 @@ Rectangle {
color: checked ? "#FFFFFF" : "#1C1C1C" color: checked ? "#FFFFFF" : "#1C1C1C"
property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 property bool present: !under || under.checked || checked || under.numSelectedChildren > 0
height: present ? ((appWindow.height >= 800) ? 64 : 56) : 0 height: present ? ((appWindow.height >= 800) ? 64 : 52) : 0
transform: Scale { transform: Scale {
yScale: button.present ? 1 : 0 yScale: button.present ? 1 : 0