diff options
author | 2017-11-11 19:30:03 +0100 | |
---|---|---|
committer | 2017-11-11 19:30:03 +0100 | |
commit | 0643ceed47d4ffa3aae1ec559af584b575024947 (patch) | |
tree | 6c114cdb1d5f7aec869e8b254ed1dfb2ba03b13f /src/styles | |
parent | Merge pull request #255 from meetfranz/feature/117-disable-gpu (diff) | |
parent | slightly reduce tab height (diff) | |
download | ferdium-app-0643ceed47d4ffa3aae1ec559af584b575024947.tar.gz ferdium-app-0643ceed47d4ffa3aae1ec559af584b575024947.tar.zst ferdium-app-0643ceed47d4ffa3aae1ec559af584b575024947.zip |
Merge pull request #252 from meetfranz/feature/mute-service
[WIP] Mute services
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/layout.scss | 33 | ||||
-rw-r--r-- | src/styles/settings.scss | 2 | ||||
-rw-r--r-- | src/styles/tabs.scss | 8 |
3 files changed, 26 insertions, 17 deletions
diff --git a/src/styles/layout.scss b/src/styles/layout.scss index d87df2684..afdd7dec7 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss | |||
@@ -42,6 +42,7 @@ html { | |||
42 | z-index: 200; | 42 | z-index: 200; |
43 | text-align: center; | 43 | text-align: center; |
44 | color: $theme-text-color; | 44 | color: $theme-text-color; |
45 | padding-bottom: 10px; | ||
45 | 46 | ||
46 | .sidebar__add-service { | 47 | .sidebar__add-service { |
47 | width: 32px; | 48 | width: 32px; |
@@ -52,26 +53,28 @@ html { | |||
52 | color: $theme-gray-light; | 53 | color: $theme-gray-light; |
53 | } | 54 | } |
54 | 55 | ||
55 | .sidebar__settings-button { | 56 | .sidebar__button { |
56 | height: auto; | 57 | width: $theme-sidebar-width; |
57 | padding: 20px 0; | 58 | padding: 7px 0; |
58 | font-size: 12px; | 59 | font-size: 24px; |
59 | position: relative; | 60 | position: relative; |
61 | color: $theme-gray-light; | ||
60 | 62 | ||
61 | .emoji { | 63 | &:hover { |
62 | position: absolute; | 64 | color: darken($theme-gray-light, 10%); |
63 | top: 18px; | 65 | } |
64 | right: 12px; | ||
65 | 66 | ||
66 | img { | 67 | &:active { |
67 | width: 18px; | 68 | color: lighten($theme-gray-light, 10%); |
68 | } | ||
69 | } | 69 | } |
70 | } | ||
71 | 70 | ||
72 | .sidebar__logo { | 71 | &.is-muted { |
73 | width: 40px; | 72 | color: $theme-brand-primary; |
74 | height: auto; | 73 | } |
74 | |||
75 | &--new-service { | ||
76 | padding-bottom: 6px; | ||
77 | } | ||
75 | } | 78 | } |
76 | 79 | ||
77 | & > div { | 80 | & > div { |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 9b19deb4e..48d12a807 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -169,7 +169,7 @@ | |||
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | .settings__indirect-message-help { | 172 | .settings__help { |
173 | margin: -10px 0 20px 55px;; | 173 | margin: -10px 0 20px 55px;; |
174 | font-size: 12px; | 174 | font-size: 12px; |
175 | color: $theme-gray-light; | 175 | color: $theme-gray-light; |
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index 3e5904d2c..8347de3b4 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss | |||
@@ -20,7 +20,7 @@ | |||
20 | align-items: center; | 20 | align-items: center; |
21 | position: relative; | 21 | position: relative; |
22 | width: $theme-sidebar-width; | 22 | width: $theme-sidebar-width; |
23 | height: $theme-sidebar-width; | 23 | height: 65px; |
24 | min-height: 50px; | 24 | min-height: 50px; |
25 | transition: background $theme-transition-time; | 25 | transition: background $theme-transition-time; |
26 | 26 | ||
@@ -47,6 +47,12 @@ | |||
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | &:active { | ||
51 | .tab-item__icon { | ||
52 | opacity: 0.7; | ||
53 | } | ||
54 | } | ||
55 | |||
50 | .tab-item__icon { | 56 | .tab-item__icon { |
51 | width: 30px; | 57 | width: 30px; |
52 | height: auto; | 58 | height: auto; |