diff options
author | 2019-03-08 15:28:35 +0100 | |
---|---|---|
committer | 2019-03-08 15:28:35 +0100 | |
commit | b6469566c2c88e8a61334d5d15a0f7c1afe08288 (patch) | |
tree | f42dd4962c74057c6432866205b16c9d78a1c07e /src/styles | |
parent | remove dev logs (diff) | |
parent | correctly update services submenu on language change (diff) | |
download | ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.gz ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.zst ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.zip |
fix merge conflicts with latest develop
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/layout.scss | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/styles/layout.scss b/src/styles/layout.scss index 8b7cc512a..9a003a922 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss | |||
@@ -124,15 +124,14 @@ html { overflow: hidden; } | |||
124 | background: $theme-brand-warning; | 124 | background: $theme-brand-warning; |
125 | color: #FFF; | 125 | color: #FFF; |
126 | display: block; | 126 | display: block; |
127 | font-size: 10px; | 127 | font-size: 8px; |
128 | height: auto; | 128 | height: auto; |
129 | padding: 4px; | 129 | padding: 4px; |
130 | position: fixed; | 130 | position: fixed; |
131 | right: 5px; | 131 | left: 9px; |
132 | top: 5px; | 132 | bottom: 0px; |
133 | transition: opacity .5s ease; | 133 | transition: opacity .5s ease; |
134 | width: auto; | 134 | width: auto; |
135 | z-index: 999999999; | 135 | z-index: 999999999; |
136 | 136 | pointer-events: none; | |
137 | &:hover { opacity: 0; } | ||
138 | } | 137 | } |