diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-31 21:57:12 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-31 22:36:15 -0500 |
| commit | 2efa047999c5e82bb05215648bbe8248fd0b03e6 (patch) | |
| tree | f231e16e7d770805af58359f5476064a72ec034a /qt-mobile/qml/SubsurfaceButton.qml | |
| parent | 2069526e74505e873140f7be35871db7acbc084d (diff) | |
| parent | 2480f21e5b2463bd5ac82980f44386277f24c51f (diff) | |
| download | subsurface-2efa047999c5e82bb05215648bbe8248fd0b03e6.tar.gz | |
Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort
This merge was a bit more challenging given how far things had diverged,
but I hope I got it mostly right.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qml/SubsurfaceButton.qml')
| -rw-r--r-- | qt-mobile/qml/SubsurfaceButton.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qt-mobile/qml/SubsurfaceButton.qml b/qt-mobile/qml/SubsurfaceButton.qml index 669da4f98..174d44659 100644 --- a/qt-mobile/qml/SubsurfaceButton.qml +++ b/qt-mobile/qml/SubsurfaceButton.qml @@ -1,15 +1,15 @@ import QtQuick 2.5 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.2 -import org.kde.plasma.mobilecomponents 0.2 as MobileComponents +import org.kde.kirigami 1.0 as Kirigami Button { style: ButtonStyle { padding { - top: MobileComponents.Units.smallSpacing * 2 - left: MobileComponents.Units.smallSpacing * 4 - right: MobileComponents.Units.smallSpacing * 4 - bottom: MobileComponents.Units.smallSpacing * 2 + top: Kirigami.Units.smallSpacing * 2 + left: Kirigami.Units.smallSpacing * 4 + right: Kirigami.Units.smallSpacing * 4 + bottom: Kirigami.Units.smallSpacing * 2 } background: Rectangle { border.width: 1 |