diff options
author | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-03-30 12:57:22 +0200 |
---|---|---|
committer | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-03-30 12:57:22 +0200 |
commit | 911fba21c3856a497073d7018bbc12f0ba7ac74d (patch) | |
tree | 181c9538f0bdaca51141451106392912399cac38 | |
parent | f866b5f7a96c2ebbf1b7e8b92e7b46903b2ebf92 (diff) | |
download | kube-911fba21c3856a497073d7018bbc12f0ba7ac74d.tar.gz kube-911fba21c3856a497073d7018bbc12f0ba7ac74d.zip |
port more stuff to kube theme
-rw-r--r-- | components/accounts/contents/ui/AccountWizardPage.qml | 5 | ||||
-rw-r--r-- | components/accounts/contents/ui/CreateGmail.qml | 5 | ||||
-rw-r--r-- | components/mailviewer/contents/ui/TextContent.qml | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml index 967bd4ab..f5f8c4ae 100644 --- a/components/accounts/contents/ui/AccountWizardPage.qml +++ b/components/accounts/contents/ui/AccountWizardPage.qml | |||
@@ -24,6 +24,7 @@ import QtQuick.Controls 2.0 as Controls2 | |||
24 | import org.kde.kirigami 1.0 as Kirigami | 24 | import org.kde.kirigami 1.0 as Kirigami |
25 | 25 | ||
26 | import org.kube.framework.accounts 1.0 as KubeAccounts | 26 | import org.kube.framework.accounts 1.0 as KubeAccounts |
27 | import org.kube.components.theme 1.0 as KubeTheme | ||
27 | 28 | ||
28 | Item { | 29 | Item { |
29 | id: root | 30 | id: root |
@@ -53,7 +54,7 @@ Item { | |||
53 | Kirigami.Heading { | 54 | Kirigami.Heading { |
54 | id: heading | 55 | id: heading |
55 | text: loader.item.heading | 56 | text: loader.item.heading |
56 | color: Kirigami.Theme.highlightColor | 57 | color: KubeTheme.Colors.highlightColor |
57 | } | 58 | } |
58 | 59 | ||
59 | Kirigami.Label { | 60 | Kirigami.Label { |
@@ -66,7 +67,7 @@ Item { | |||
66 | 67 | ||
67 | width: parent.width | 68 | width: parent.width |
68 | text: loader.item.subheadline | 69 | text: loader.item.subheadline |
69 | color: Kirigami.Theme.disabledTextColor | 70 | color: KubeTheme.Colors.disabledTextColor |
70 | wrapMode: Text.Wrap | 71 | wrapMode: Text.Wrap |
71 | } | 72 | } |
72 | 73 | ||
diff --git a/components/accounts/contents/ui/CreateGmail.qml b/components/accounts/contents/ui/CreateGmail.qml index 5d7f8194..d031a051 100644 --- a/components/accounts/contents/ui/CreateGmail.qml +++ b/components/accounts/contents/ui/CreateGmail.qml | |||
@@ -23,6 +23,7 @@ import QtQuick.Controls 2.0 as Controls2 | |||
23 | import org.kde.kirigami 1.0 as Kirigami | 23 | import org.kde.kirigami 1.0 as Kirigami |
24 | 24 | ||
25 | import org.kube.framework.accounts 1.0 as KubeAccounts | 25 | import org.kube.framework.accounts 1.0 as KubeAccounts |
26 | import org.kube.components.theme 1.0 as KubeTheme | ||
26 | 27 | ||
27 | Item { | 28 | Item { |
28 | 29 | ||
@@ -52,7 +53,7 @@ Item { | |||
52 | id: heading | 53 | id: heading |
53 | text: "Connect your Gmail account" | 54 | text: "Connect your Gmail account" |
54 | 55 | ||
55 | color: Kirigami.Theme.highlightColor | 56 | color: KubeTheme.Colors.highlightColor |
56 | } | 57 | } |
57 | 58 | ||
58 | Kirigami.Label { | 59 | Kirigami.Label { |
@@ -67,7 +68,7 @@ Item { | |||
67 | 68 | ||
68 | text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube." | 69 | text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube." |
69 | 70 | ||
70 | color: Kirigami.Theme.disabledTextColor | 71 | color: KubeTheme.Colors.disabledTextColor |
71 | 72 | ||
72 | wrapMode: Text.Wrap | 73 | wrapMode: Text.Wrap |
73 | } | 74 | } |
diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml index d3ae80f9..8494e4e3 100644 --- a/components/mailviewer/contents/ui/TextContent.qml +++ b/components/mailviewer/contents/ui/TextContent.qml | |||
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | import QtQuick 2.7 | 19 | import QtQuick 2.7 |
20 | import org.kde.kirigami 1.0 as Kirigami | 20 | import org.kube.components.theme 1.0 as KubeTheme |
21 | 21 | ||
22 | Item { | 22 | Item { |
23 | id: textItem | 23 | id: textItem |
@@ -47,7 +47,7 @@ Item { | |||
47 | text: model.content | 47 | text: model.content |
48 | wrapMode: Text.WordWrap | 48 | wrapMode: Text.WordWrap |
49 | 49 | ||
50 | color: model.embeded ? Kirigami.Theme.diabledTextColor : Kirigami.Theme.textColor | 50 | color: model.embeded ? KubeTheme.Colors.diabledTextColor : KubeTheme.Colors.textColor |
51 | } | 51 | } |
52 | 52 | ||
53 | //BEGIN debug | 53 | //BEGIN debug |