diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2019-06-28 16:00:16 +0200 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2019-06-28 16:00:16 +0200 |
| commit | 6fbb243c415e7b2ac17a9e16fe9861e080a76559 (patch) | |
| tree | 0c48e6fe861f32434334d2170687a529307fb44d /src/styles | |
| parent | Rename feature flags (diff) | |
| parent | fix(Notifications): Don't show notification badges when app is muted (diff) | |
| download | ferdium-app-6fbb243c415e7b2ac17a9e16fe9861e080a76559.tar.gz ferdium-app-6fbb243c415e7b2ac17a9e16fe9861e080a76559.tar.zst ferdium-app-6fbb243c415e7b2ac17a9e16fe9861e080a76559.zip | |
Merge branch 'release/5.2.0-beta.4' into feature/new-pricing
Diffstat (limited to 'src/styles')
| -rw-r--r-- | src/styles/layout.scss | 2 | ||||
| -rw-r--r-- | src/styles/reset.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/styles/layout.scss b/src/styles/layout.scss index e858b7904..9f226b61c 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss | |||
| @@ -39,7 +39,7 @@ html { overflow: hidden; } | |||
| 39 | .app__content { display: flex; } | 39 | .app__content { display: flex; } |
| 40 | 40 | ||
| 41 | .app__service { | 41 | .app__service { |
| 42 | position: relative; | 42 | // position: relative; |
| 43 | display: flex; | 43 | display: flex; |
| 44 | flex: 1; | 44 | flex: 1; |
| 45 | flex-direction: column; | 45 | flex-direction: column; |
diff --git a/src/styles/reset.scss b/src/styles/reset.scss index 80328dcef..f46ede4a2 100644 --- a/src/styles/reset.scss +++ b/src/styles/reset.scss | |||
| @@ -64,7 +64,7 @@ body { | |||
| 64 | font-size: 1.4rem; | 64 | font-size: 1.4rem; |
| 65 | line-height: 1; | 65 | line-height: 1; |
| 66 | 66 | ||
| 67 | .theme__dark { color: $dark-theme-gray-smoke; } | 67 | &.theme__dark { color: $dark-theme-gray-smoke; } |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | * { | 70 | * { |