diff options
author | 2017-11-10 15:40:01 +0100 | |
---|---|---|
committer | 2017-11-10 15:40:01 +0100 | |
commit | f39e31af92f3ae6689697685d008f0487a5be351 (patch) | |
tree | c00654dbb28817cbfdca8223c1f86d38c706e163 /src/styles | |
parent | feat(App): Respect System DoNotDisturb mode for service audio (diff) | |
parent | Merge pull request #248 from meetfranz/feature/192-display-disabled-services (diff) | |
download | ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.gz ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.zst ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.zip |
Merge branch 'develop' into feature/mute-service
# Conflicts:
# src/components/services/content/ServiceWebview.js
# src/components/services/content/Services.js
# src/components/services/tabs/TabItem.js
# src/containers/layout/AppLayoutContainer.js
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/services.scss | 4 | ||||
-rw-r--r-- | src/styles/tabs.scss | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/styles/services.scss b/src/styles/services.scss index 95738f123..2a6540e0b 100644 --- a/src/styles/services.scss +++ b/src/styles/services.scss | |||
@@ -8,6 +8,10 @@ | |||
8 | background: #FFF; | 8 | background: #FFF; |
9 | order: 5; | 9 | order: 5; |
10 | 10 | ||
11 | .services__webview-wrapper { | ||
12 | background: $theme-gray-lighter; | ||
13 | } | ||
14 | |||
11 | .services__webview, | 15 | .services__webview, |
12 | .services__crash-handler { | 16 | .services__crash-handler { |
13 | position: absolute; | 17 | position: absolute; |
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index abafdb53c..9b13df1f0 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss | |||
@@ -33,6 +33,12 @@ | |||
33 | } | 33 | } |
34 | } | 34 | } |
35 | 35 | ||
36 | &.is-disabled { | ||
37 | .tab-item__icon { | ||
38 | filter: grayscale(100%) opacity(0.2); | ||
39 | } | ||
40 | } | ||
41 | |||
36 | &.has-custom-icon { | 42 | &.has-custom-icon { |
37 | .tab-item__icon { | 43 | .tab-item__icon { |
38 | border-radius: $theme-border-radius; | 44 | border-radius: $theme-border-radius; |