dorian/fanny-app
dorian/fanny-app
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fixed merge issue

Browse source
This commit is contained in:
Dorian Zedler 2019-03-23 09:36:05 +01:00
parent f85e9a9f45
commit b92017a0c9
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qml/Components/FancyButton.qml
View file

@ -45,7 +45,7 @@ Button {
control.width = control.size control.width = control.size
control.height = control.size control.height = control.size
console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width) //console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width)
} }
background: Item { background: Item {

4
qml/Forms/FilterForm.qml
View file

@ -159,11 +159,7 @@ Page {
background: Rectangle { background: Rectangle {
radius: 2 radius: 2
<<<<<<< HEAD
color: classLetterCb.Material.dialogColor//app.style.style.backgroundColor color: classLetterCb.Material.dialogColor//app.style.style.backgroundColor
=======
color: classLetterCb.Material.dialogColor
>>>>>>> origin/master
layer.enabled: classLetterCb.enabled layer.enabled: classLetterCb.enabled
// layer.effect: ElevationEffect { // layer.effect: ElevationEffect {