diff options
author | 2019-04-12 13:32:19 +0200 | |
---|---|---|
committer | 2019-04-12 13:32:19 +0200 | |
commit | f941074dd7520efb63e9507294df8c420715b9df (patch) | |
tree | 614d03296254f02fe93a67a5c3b2feef1446e3aa /src/styles | |
parent | Don't invalidate user request on componentWillMount (diff) | |
parent | feat(App): Update electron to 4.1.4 (diff) | |
download | ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.gz ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.zst ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.zip |
Merge branch 'develop' into chore/streamline-dashboard
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/layout.scss | 13 | ||||
-rw-r--r-- | src/styles/settings.scss | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/styles/layout.scss b/src/styles/layout.scss index 9a003a922..e858b7904 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss | |||
@@ -18,8 +18,14 @@ html { overflow: hidden; } | |||
18 | font-size: 22px; | 18 | font-size: 22px; |
19 | 19 | ||
20 | &:hover, | 20 | &:hover, |
21 | &:active { color: $dark-theme-gray-smoke; } | 21 | &:active { |
22 | &.is-muted { color: $theme-brand-primary; } | 22 | color: $dark-theme-gray-smoke; |
23 | } | ||
24 | |||
25 | &.is-muted, | ||
26 | &.is-active { | ||
27 | color: $theme-brand-primary; | ||
28 | } | ||
23 | } | 29 | } |
24 | } | 30 | } |
25 | 31 | ||
@@ -33,6 +39,7 @@ html { overflow: hidden; } | |||
33 | .app__content { display: flex; } | 39 | .app__content { display: flex; } |
34 | 40 | ||
35 | .app__service { | 41 | .app__service { |
42 | position: relative; | ||
36 | display: flex; | 43 | display: flex; |
37 | flex: 1; | 44 | flex: 1; |
38 | flex-direction: column; | 45 | flex-direction: column; |
@@ -84,7 +91,7 @@ html { overflow: hidden; } | |||
84 | 91 | ||
85 | &:hover, | 92 | &:hover, |
86 | &:active { color: lighten($theme-gray-light, 10%); } | 93 | &:active { color: lighten($theme-gray-light, 10%); } |
87 | &.is-muted { color: $theme-brand-primary; } | 94 | &.is-muted, &.is-active { color: $theme-brand-primary; } |
88 | &--new-service { padding-bottom: 6px; } | 95 | &--new-service { padding-bottom: 6px; } |
89 | } | 96 | } |
90 | 97 | ||
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index b286c6f1b..efa0ab942 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -419,6 +419,7 @@ | |||
419 | 419 | ||
420 | .settings-navigation__link { | 420 | .settings-navigation__link { |
421 | align-items: center; | 421 | align-items: center; |
422 | justify-content: space-between; | ||
422 | color: $theme-text-color; | 423 | color: $theme-text-color; |
423 | display: flex; | 424 | display: flex; |
424 | flex-shrink: 0; | 425 | flex-shrink: 0; |
@@ -430,7 +431,9 @@ | |||
430 | &:hover { | 431 | &:hover { |
431 | background: darken($theme-gray-lightest, 5%); | 432 | background: darken($theme-gray-lightest, 5%); |
432 | 433 | ||
433 | .badge { background: #FFF; } | 434 | .badge { |
435 | background: #FFF; | ||
436 | } | ||
434 | } | 437 | } |
435 | 438 | ||
436 | &.is-active { | 439 | &.is-active { |
@@ -447,8 +450,8 @@ | |||
447 | .settings-navigation__expander { flex: 1; } | 450 | .settings-navigation__expander { flex: 1; } |
448 | 451 | ||
449 | .badge { | 452 | .badge { |
453 | |||
450 | display: initial; | 454 | display: initial; |
451 | margin-left: 5px; | ||
452 | transition: background $theme-transition-time, color $theme-transition-time; | 455 | transition: background $theme-transition-time, color $theme-transition-time; |
453 | } | 456 | } |
454 | 457 | ||