aboutsummaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/badge.scss6
-rw-r--r--src/styles/main.scss4
-rw-r--r--src/styles/settings.scss24
-rw-r--r--src/styles/subscription-popup.scss18
-rw-r--r--src/styles/subscription.scss49
5 files changed, 4 insertions, 97 deletions
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index 69879de31..1f58b8089 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -5,8 +5,7 @@
5 border-radius: $theme-border-radius-small; 5 border-radius: $theme-border-radius-small;
6 color: $dark-theme-gray-lightest; 6 color: $dark-theme-gray-lightest;
7 7
8 &.badge--primary, 8 &.badge--primary {
9 &.badge--premium {
10 background: $theme-brand-primary; 9 background: $theme-brand-primary;
11 color: $dark-theme-gray-lightest; 10 color: $dark-theme-gray-lightest;
12 } 11 }
@@ -21,8 +20,7 @@
21 padding: 5px 10px; 20 padding: 5px 10px;
22 letter-spacing: 0; 21 letter-spacing: 0;
23 22
24 &.badge--primary, 23 &.badge--primary {
25 &.badge--premium {
26 background: $theme-brand-primary; 24 background: $theme-brand-primary;
27 color: #FFF; 25 color: #FFF;
28 } 26 }
diff --git a/src/styles/main.scss b/src/styles/main.scss
index c57dc6fcd..6909d2051 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -25,8 +25,6 @@ $mdi-font-path: '../node_modules/mdi/fonts';
25@import './animations.scss'; 25@import './animations.scss';
26@import './infobox.scss'; 26@import './infobox.scss';
27@import './badge.scss'; 27@import './badge.scss';
28@import './subscription.scss';
29@import './subscription-popup.scss';
30@import './content-tabs.scss'; 28@import './content-tabs.scss';
31@import './invite.scss'; 29@import './invite.scss';
32@import './title-bar.scss'; 30@import './title-bar.scss';
@@ -40,4 +38,4 @@ $mdi-font-path: '../node_modules/mdi/fonts';
40@import './searchInput.scss'; 38@import './searchInput.scss';
41@import './select.scss'; 39@import './select.scss';
42@import './image-upload.scss'; 40@import './image-upload.scss';
43@import './slider.scss'; \ No newline at end of file 41@import './slider.scss';
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index a25759f48..5d4e81a4f 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -57,12 +57,6 @@
57 .account__box { background: $dark-theme-gray-darker; } 57 .account__box { background: $dark-theme-gray-darker; }
58 } 58 }
59 59
60 .premium-info {
61 background: $dark-theme-gray-darker;
62 border-width: 2px;
63 border-style: solid;
64 border-color: $theme-brand-primary;
65 }
66 .legal { color: $theme-gray-light; } 60 .legal { color: $theme-gray-light; }
67 } 61 }
68 62
@@ -378,16 +372,6 @@
378 .badge { margin-left: 10px; } 372 .badge { margin-left: 10px; }
379 } 373 }
380 374
381 .badge--premium {
382 margin-left: 1px;
383 position: relative;
384 top: -3px;
385 padding-top: 4px;
386 color: #FFF;
387 border-radius: 3px;
388 }
389
390
391 .manage-user-links { 375 .manage-user-links {
392 margin-top: 20px; 376 margin-top: 20px;
393 display: flex; 377 display: flex;
@@ -428,13 +412,7 @@
428 img { width: 40px; } 412 img { width: 40px; }
429 } 413 }
430 414
431 .premium-info { 415 .content-tabs {
432 background: lighten($theme-brand-primary, 40%);
433 border-radius: $theme-border-radius;
434 padding: 20px;
435 }
436
437 .content-tabs .premium-info {
438 background: none; 416 background: none;
439 padding: 0; 417 padding: 0;
440 } 418 }
diff --git a/src/styles/subscription-popup.scss b/src/styles/subscription-popup.scss
deleted file mode 100644
index 14e05e65d..000000000
--- a/src/styles/subscription-popup.scss
+++ /dev/null
@@ -1,18 +0,0 @@
1.subscription-popup {
2 height: 100%;
3
4 &__content { height: calc(100% - 60px); }
5 &__webview {
6 height: 100%;
7 background: #FFF;
8 }
9
10 &__toolbar {
11 background: $theme-gray-lightest;
12 border-top: 1px solid $theme-gray-lighter;
13 display: flex;
14 height: 60px;
15 justify-content: space-between;
16 padding: 10px;
17 }
18}
diff --git a/src/styles/subscription.scss b/src/styles/subscription.scss
deleted file mode 100644
index 70fb41cde..000000000
--- a/src/styles/subscription.scss
+++ /dev/null
@@ -1,49 +0,0 @@
1.subscription {
2 .subscription__premium-features {
3 margin: 10px 0;
4
5 li {
6 align-items: center;
7 display: flex;
8 height: 30px;
9
10 &:before {
11 content: "👍";
12 margin-right: 10px;
13 }
14
15 .badge { margin-left: 10px; }
16 }
17 }
18
19 .subscription__premium-info { margin: 15px 0 25px; }
20}
21
22.paymentTiers .franz-form__radio-wrapper {
23 flex-flow: wrap;
24
25 .franz-form__radio {
26 flex: initial;
27 margin-right: 2%;
28 width: 32%;
29
30 &:nth-child(3) { margin-right: 0; }
31
32 &:nth-child(4) {
33 margin-right: 0;
34 margin-top: 2%;
35 width: 100%;
36 }
37 }
38}
39
40.settings .paymentTiers .franz-form__radio-wrapper .franz-form__radio {
41 width: 49%;
42
43 &:nth-child(2) { margin-right: 0; }
44
45 &:nth-child(3) {
46 margin-top: 2%;
47 width: 100%;
48 }
49}