summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-25 05:12:23 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-25 05:12:23 +0200
commit87eddb9d0d96629b57a1b06ba5da7d56e3f87cb5 (patch)
treeda0a5ca93ca3a56bb909e790388981b102bdb94f
parenta7163fd03a98d164ee572d187771be9d78ad44a9 (diff)
downloadkube-87eddb9d0d96629b57a1b06ba5da7d56e3f87cb5.tar.gz
kube-87eddb9d0d96629b57a1b06ba5da7d56e3f87cb5.zip
Fontsize units
-rw-r--r--components/kube/contents/ui/ComposerView.qml2
-rw-r--r--components/kube/contents/ui/LogView.qml2
-rw-r--r--framework/qml/MailListView.qml2
-rw-r--r--framework/qml/MailViewer.qml3
-rw-r--r--framework/qml/Outbox.qml2
-rw-r--r--framework/qml/Units.qml2
6 files changed, 7 insertions, 6 deletions
diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 89d78399..5b77f37e 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -175,7 +175,7 @@ Kube.View {
175 text: Qt.formatDateTime(model.date, "dd MMM yyyy") 175 text: Qt.formatDateTime(model.date, "dd MMM yyyy")
176 font.italic: true 176 font.italic: true
177 color: Kube.Colors.disabledTextColor 177 color: Kube.Colors.disabledTextColor
178 font.pointSize: 9 178 font.pointSize: Kube.Units.smallFontSize
179 visible: !delegateRoot.hovered 179 visible: !delegateRoot.hovered
180 } 180 }
181 } 181 }
diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/contents/ui/LogView.qml
index 98d92ccd..d5f9f710 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/contents/ui/LogView.qml
@@ -97,7 +97,7 @@ Controls.SplitView {
97 text: Qt.formatDateTime(model.timestamp, " hh:mm:ss dd MMM yyyy") 97 text: Qt.formatDateTime(model.timestamp, " hh:mm:ss dd MMM yyyy")
98 font.italic: true 98 font.italic: true
99 color: Kube.Colors.disabledTextColor 99 color: Kube.Colors.disabledTextColor
100 font.pointSize: 9 100 font.pointSize: Kube.Units.smallFontSize
101 } 101 }
102 } 102 }
103 } 103 }
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 456091ba..73caef72 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -238,7 +238,7 @@ FocusScope {
238 text: Qt.formatDateTime(model.date, "dd MMM yyyy") 238 text: Qt.formatDateTime(model.date, "dd MMM yyyy")
239 font.italic: true 239 font.italic: true
240 color: Kube.Colors.disabledTextColor 240 color: Kube.Colors.disabledTextColor
241 font.pointSize: Kube.Units.defaultFontSize * 0.8 241 font.pointSize: Kube.Units.tinyFontSize
242 } 242 }
243 243
244 Kube.Label { 244 Kube.Label {
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index 7104cc4a..d139b3d7 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -105,8 +105,7 @@ Rectangle {
105 105
106 text: Qt.formatDateTime(root.date, "dd MMM yyyy hh:mm") 106 text: Qt.formatDateTime(root.date, "dd MMM yyyy hh:mm")
107 107
108 //FIXME font pointsize 108 font.pointSize: Kube.Units.tinyFontSize
109 font.pointSize: Kube.Units.defaultFontSize * 0.8
110 opacity: 0.75 109 opacity: 0.75
111 } 110 }
112 111
diff --git a/framework/qml/Outbox.qml b/framework/qml/Outbox.qml
index bdd68a7d..a9a1a1d6 100644
--- a/framework/qml/Outbox.qml
+++ b/framework/qml/Outbox.qml
@@ -55,7 +55,7 @@ Kube.IconButton {
55 width: Kube.Units.smallSpacing 55 width: Kube.Units.smallSpacing
56 text: outboxModel.count 56 text: outboxModel.count
57 color: Kube.Colors.disabledTextColor 57 color: Kube.Colors.disabledTextColor
58 font.pointSize: 9 58 font.pointSize: Kube.Units.smallFontSize
59 } 59 }
60 60
61 onClicked: dialog.open() 61 onClicked: dialog.open()
diff --git a/framework/qml/Units.qml b/framework/qml/Units.qml
index d583c87b..a693c001 100644
--- a/framework/qml/Units.qml
+++ b/framework/qml/Units.qml
@@ -29,6 +29,8 @@ Item {
29 property int largeSpacing: gridUnit 29 property int largeSpacing: gridUnit
30 30
31 property int defaultFontSize: fontMetrics.font.pointSize 31 property int defaultFontSize: fontMetrics.font.pointSize
32 property int smallFontSize: fontMetrics.font.pointSize * 0.9
33 property int tinyFontSize: fontMetrics.font.pointSize * 0.8
32 34
33 property variant fontMetrics: TextMetrics { 35 property variant fontMetrics: TextMetrics {
34 text: "M" 36 text: "M"