diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2019-07-19 15:02:21 +0200 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2019-07-19 15:02:21 +0200 |
| commit | 86f4814dd5eac4d8852a1e5a360977ba64d05897 (patch) | |
| tree | fafab1227432f318c408d4454adcdcc7978da48c /src/styles | |
| parent | Add production and dev urls for todos frontend (diff) | |
| parent | Update changelog (diff) | |
| download | ferdium-app-86f4814dd5eac4d8852a1e5a360977ba64d05897.tar.gz ferdium-app-86f4814dd5eac4d8852a1e5a360977ba64d05897.tar.zst ferdium-app-86f4814dd5eac4d8852a1e5a360977ba64d05897.zip | |
Merge branch 'release/5.2.0' into feature/todos
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 c9cc94e15..739082445 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss | |||
| @@ -40,7 +40,7 @@ html { overflow: hidden; } | |||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | .app__service { | 42 | .app__service { |
| 43 | position: relative; | 43 | // position: relative; |
| 44 | display: flex; | 44 | display: flex; |
| 45 | flex: 1; | 45 | flex: 1; |
| 46 | flex-direction: column; | 46 | 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 | * { |