aboutsummaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 13:26:50 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 13:26:50 +0100
commit3d2b58b387ce8b22cd7b674445d56d81019ef16c (patch)
tree7bf922ae2932ca9467246fca7288a49deb29ea9b /src/styles
parentAdd withTheme context to button (diff)
parentFix windows token login (diff)
downloadferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.tar.gz
ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.tar.zst
ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.zip
Merge branch 'develop' into chore/lerna
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/layout.scss2
-rw-r--r--src/styles/services.scss10
2 files changed, 3 insertions, 9 deletions
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index ebf468cf0..8b7cc512a 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -19,7 +19,7 @@ html { overflow: hidden; }
19 19
20 &:hover, 20 &:hover,
21 &:active { color: $dark-theme-gray-smoke; } 21 &:active { color: $dark-theme-gray-smoke; }
22 &.is-muted { color: $dark-theme-gray; } 22 &.is-muted { color: $theme-brand-primary; }
23 } 23 }
24 } 24 }
25 25
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 0e559501c..5acf92d2c 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -39,18 +39,12 @@
39 webview { 39 webview {
40 background: $theme-gray-lighter; 40 background: $theme-gray-lighter;
41 display: inline-flex; 41 display: inline-flex;
42 height: 0; 42 height: 100%;
43 width: 0; 43 width: 100%;
44 } 44 }
45 45
46 &.is-active { 46 &.is-active {
47 z-index: 100; 47 z-index: 100;
48
49 webview {
50 flex: 0 1;
51 height: 100%;
52 width: 100%;
53 }
54 } 48 }
55 49
56 &--force-repaint webview { z-index: 5; } 50 &--force-repaint webview { z-index: 5; }