diff options
author | 2019-04-16 11:48:36 +0200 | |
---|---|---|
committer | 2019-04-16 11:48:36 +0200 | |
commit | 82195efa887767443bb514edad6d04a6f1a6b62e (patch) | |
tree | 8a49a5e84333fab64dee113da0608e45fdb7ddc1 /src/styles | |
parent | increase app opens to show share franz overlay (diff) | |
parent | Merge branch 'develop' into chore/streamline-dashboard (diff) | |
download | ferdium-app-82195efa887767443bb514edad6d04a6f1a6b62e.tar.gz ferdium-app-82195efa887767443bb514edad6d04a6f1a6b62e.tar.zst ferdium-app-82195efa887767443bb514edad6d04a6f1a6b62e.zip |
Merge pull request #1393 from meetfranz/chore/streamline-dashboard
Feature/User Websocket
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/badge.scss | 1 | ||||
-rw-r--r-- | src/styles/settings.scss | 31 |
2 files changed, 18 insertions, 14 deletions
diff --git a/src/styles/badge.scss b/src/styles/badge.scss index f9fac039a..be3a1055d 100644 --- a/src/styles/badge.scss +++ b/src/styles/badge.scss | |||
@@ -19,6 +19,7 @@ | |||
19 | display: inline-block; | 19 | display: inline-block; |
20 | font-size: 14px; | 20 | font-size: 14px; |
21 | padding: 5px 10px; | 21 | padding: 5px 10px; |
22 | letter-spacing: 0; | ||
22 | 23 | ||
23 | &.badge--primary, | 24 | &.badge--primary, |
24 | &.badge--premium { | 25 | &.badge--premium { |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index dd6f56d2b..1baff8b54 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -61,11 +61,6 @@ | |||
61 | 61 | ||
62 | .account { | 62 | .account { |
63 | .account__box { background: $dark-theme-gray-darker; } | 63 | .account__box { background: $dark-theme-gray-darker; } |
64 | |||
65 | .invoices { | ||
66 | td { border-bottom: 1px solid $dark-theme-gray-darker; } | ||
67 | .invoices__action button { color: $theme-brand-primary; } | ||
68 | } | ||
69 | } | 64 | } |
70 | 65 | ||
71 | .premium-info { | 66 | .premium-info { |
@@ -329,15 +324,6 @@ | |||
329 | .account__avatar { | 324 | .account__avatar { |
330 | margin-right: 20px; | 325 | margin-right: 20px; |
331 | position: relative; | 326 | position: relative; |
332 | |||
333 | .emoji img { width: 30px; } | ||
334 | } | ||
335 | |||
336 | .account__avatar-premium { | ||
337 | font-size: 26px; | ||
338 | position: absolute; | ||
339 | right: 2px; | ||
340 | top: 2px; | ||
341 | } | 327 | } |
342 | 328 | ||
343 | .account__info { | 329 | .account__info { |
@@ -345,6 +331,7 @@ | |||
345 | 331 | ||
346 | h2 { margin-bottom: 5px; } | 332 | h2 { margin-bottom: 5px; } |
347 | .badge { margin-top: 5px; } | 333 | .badge { margin-top: 5px; } |
334 | .username { margin-right: 10 } | ||
348 | } | 335 | } |
349 | 336 | ||
350 | .account__subscription { | 337 | .account__subscription { |
@@ -354,6 +341,22 @@ | |||
354 | .badge { margin-left: 10px; } | 341 | .badge { margin-left: 10px; } |
355 | } | 342 | } |
356 | 343 | ||
344 | .badge--premium { | ||
345 | margin-left: 1px; | ||
346 | position: relative; | ||
347 | top: -3px; | ||
348 | padding-top: 4px; | ||
349 | color: #FFF; | ||
350 | border-radius: 3px; | ||
351 | } | ||
352 | |||
353 | |||
354 | .manage-user-links { | ||
355 | margin-top: 20px; | ||
356 | display: flex; | ||
357 | justify-content: space-between; | ||
358 | } | ||
359 | |||
357 | .account__subscription-button { margin-left: auto; } | 360 | .account__subscription-button { margin-left: auto; } |
358 | .franz-form__button { white-space: nowrap; } | 361 | .franz-form__button { white-space: nowrap; } |
359 | div { height: auto; } | 362 | div { height: auto; } |