summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-03 14:18:04 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-03 14:18:04 +0200
commitd4cc44f39bb60b5d2f6d446de0309eb0a374723e (patch)
tree86f7ef4f46a59a446adba7f88464ea9d095e4240
parent51e47637930a6a18b0e5ece368bad45c9afbb3c6 (diff)
downloadkube-d4cc44f39bb60b5d2f6d446de0309eb0a374723e.tar.gz
kube-d4cc44f39bb60b5d2f6d446de0309eb0a374723e.zip
Added units
-rw-r--r--components/package/contents/ui/Button.qml3
-rw-r--r--components/theme/contents/ui/Units.qml32
-rw-r--r--components/theme/qmldir1
3 files changed, 34 insertions, 2 deletions
diff --git a/components/package/contents/ui/Button.qml b/components/package/contents/ui/Button.qml
index 978f41a6..948312b0 100644
--- a/components/package/contents/ui/Button.qml
+++ b/components/package/contents/ui/Button.qml
@@ -18,7 +18,6 @@
18 18
19import QtQuick 2.7 19import QtQuick 2.7
20import org.kube.components.theme 1.0 as KubeTheme 20import org.kube.components.theme 1.0 as KubeTheme
21import org.kde.kirigami 1.0 as Kirigami
22 21
23Rectangle { 22Rectangle {
24 id: root 23 id: root
@@ -37,7 +36,7 @@ Rectangle {
37 Row { 36 Row {
38 id: content 37 id: content
39 anchors.centerIn: parent 38 anchors.centerIn: parent
40 spacing: Kirigami.Units.smallSpacing 39 spacing: KubeTheme.Units.smallSpacing
41 Text { 40 Text {
42 id: text 41 id: text
43 anchors.verticalCenter: parent.verticalCenter 42 anchors.verticalCenter: parent.verticalCenter
diff --git a/components/theme/contents/ui/Units.qml b/components/theme/contents/ui/Units.qml
new file mode 100644
index 00000000..96216f82
--- /dev/null
+++ b/components/theme/contents/ui/Units.qml
@@ -0,0 +1,32 @@
1/*
2 Copyright (C) 2017 Michael Bohlender, <bohlender@kolabsys.com>
3 Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License along
16 with this program; if not, write to the Free Software Foundation, Inc.,
17 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18*/
19
20pragma Singleton
21
22import QtQuick 2.7
23
24Item {
25 property int gridUnit: fontMetrics.height
26 property int smallSpacing: gridUnit/4
27 property int largeSpacing: gridUnit
28 property variant fontMetrics: TextMetrics {
29 text: "M"
30 }
31}
32
diff --git a/components/theme/qmldir b/components/theme/qmldir
index 6d11dd64..16b385ab 100644
--- a/components/theme/qmldir
+++ b/components/theme/qmldir
@@ -2,3 +2,4 @@ module org.kube.components.theme
2 2
3singleton Colors 1.0 Colors.qml 3singleton Colors 1.0 Colors.qml
4singleton Icons 1.0 Icons.qml 4singleton Icons 1.0 Icons.qml
5singleton Units 1.0 Units.qml