diff options
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/auth.scss | 1 | ||||
-rw-r--r-- | src/styles/colors.scss | 2 | ||||
-rw-r--r-- | src/styles/layout.scss | 4 | ||||
-rw-r--r-- | src/styles/settings.scss | 11 | ||||
-rw-r--r-- | src/styles/type.scss | 14 | ||||
-rw-r--r-- | src/styles/vertical.scss | 62 |
6 files changed, 81 insertions, 13 deletions
diff --git a/src/styles/auth.scss b/src/styles/auth.scss index b40ed971d..3efecf324 100644 --- a/src/styles/auth.scss +++ b/src/styles/auth.scss | |||
@@ -50,7 +50,6 @@ | |||
50 | .auth__container { | 50 | .auth__container { |
51 | background: #FFF; | 51 | background: #FFF; |
52 | border-radius: $theme-border-radius; | 52 | border-radius: $theme-border-radius; |
53 | box-shadow: 0 0 50px rgba(black, .2); | ||
54 | height: auto; | 53 | height: auto; |
55 | margin: 40px auto 0; | 54 | margin: 40px auto 0; |
56 | position: relative; | 55 | position: relative; |
diff --git a/src/styles/colors.scss b/src/styles/colors.scss index d89d42b9e..6afe872bd 100644 --- a/src/styles/colors.scss +++ b/src/styles/colors.scss | |||
@@ -1,7 +1,7 @@ | |||
1 | @import "./type-helper"; | 1 | @import "./type-helper"; |
2 | 2 | ||
3 | $theme-brand-primary: convert-rgb-string-to-color($raw-theme-brand-primary); | 3 | $theme-brand-primary: convert-rgb-string-to-color($raw-theme-brand-primary); |
4 | $theme-brand-gradient: linear-gradient( 135deg, #CE9FFC 10%, #7367F0 100%); | 4 | $theme-brand-gradient: #7266F0; |
5 | $theme-brand-success: convert-rgb-string-to-color($raw-theme-brand-success); | 5 | $theme-brand-success: convert-rgb-string-to-color($raw-theme-brand-success); |
6 | $theme-brand-info: convert-rgb-string-to-color($raw-theme-brand-info); | 6 | $theme-brand-info: convert-rgb-string-to-color($raw-theme-brand-info); |
7 | $theme-brand-warning: convert-rgb-string-to-color($raw-theme-brand-warning); | 7 | $theme-brand-warning: convert-rgb-string-to-color($raw-theme-brand-warning); |
diff --git a/src/styles/layout.scss b/src/styles/layout.scss index de00c01b4..b1e163421 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss | |||
@@ -183,3 +183,7 @@ body.win32:not(.isFullScreen) .app .app__content { | |||
183 | z-index: 999999999; | 183 | z-index: 999999999; |
184 | pointer-events: none; | 184 | pointer-events: none; |
185 | } | 185 | } |
186 | |||
187 | a, button { | ||
188 | cursor: pointer; | ||
189 | } \ No newline at end of file | ||
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index b908305de..dafbab16e 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -151,9 +151,8 @@ | |||
151 | flex: 1; | 151 | flex: 1; |
152 | flex-direction: column; | 152 | flex-direction: column; |
153 | height: auto; | 153 | height: auto; |
154 | border-radius: $theme-border-radius; | 154 | border-radius: 0 $theme-border-radius $theme-border-radius 0; |
155 | overflow: hidden; | 155 | overflow: hidden; |
156 | box-shadow: 0 20px 50px rgba($dark-theme-black, .5); | ||
157 | background: #FFF; | 156 | background: #FFF; |
158 | } | 157 | } |
159 | 158 | ||
@@ -450,7 +449,7 @@ | |||
450 | flex-direction: column; | 449 | flex-direction: column; |
451 | height: auto; | 450 | height: auto; |
452 | width: 240px; | 451 | width: 240px; |
453 | height: calc(100% - 100px); | 452 | height: 100%; |
454 | align-self: center; | 453 | align-self: center; |
455 | border-top-left-radius: $theme-border-radius;; | 454 | border-top-left-radius: $theme-border-radius;; |
456 | border-bottom-left-radius: $theme-border-radius;; | 455 | border-bottom-left-radius: $theme-border-radius;; |
@@ -463,7 +462,7 @@ | |||
463 | color: $theme-text-color; | 462 | color: $theme-text-color; |
464 | display: flex; | 463 | display: flex; |
465 | flex-shrink: 0; | 464 | flex-shrink: 0; |
466 | height: 50px; | 465 | height: 51px; |
467 | padding: 0 20px; | 466 | padding: 0 20px; |
468 | text-decoration: none; | 467 | text-decoration: none; |
469 | transition: background $theme-transition-time, color $theme-transition-time; | 468 | transition: background $theme-transition-time, color $theme-transition-time; |
@@ -505,3 +504,7 @@ | |||
505 | width: 7px; | 504 | width: 7px; |
506 | } | 505 | } |
507 | } | 506 | } |
507 | |||
508 | .settings__support-badges { | ||
509 | a { margin-right: 10px } | ||
510 | } | ||
diff --git a/src/styles/type.scss b/src/styles/type.scss index 5b1160d0b..37ec0bcca 100644 --- a/src/styles/type.scss +++ b/src/styles/type.scss | |||
@@ -38,12 +38,9 @@ a, button { | |||
38 | text-decoration: none; | 38 | text-decoration: none; |
39 | 39 | ||
40 | &.button { | 40 | &.button { |
41 | background: none; | 41 | background: $theme-brand-primary; |
42 | border-width: 2px; | 42 | color: #FFF; |
43 | border-style: solid; | ||
44 | border-color: $theme-brand-primary; | ||
45 | border-radius: 3px; | 43 | border-radius: 3px; |
46 | color: $theme-brand-primary; | ||
47 | display: inline-block; | 44 | display: inline-block; |
48 | padding: 10px 20px; | 45 | padding: 10px 20px; |
49 | position: relative; | 46 | position: relative; |
@@ -52,12 +49,15 @@ a, button { | |||
52 | cursor: pointer; | 49 | cursor: pointer; |
53 | 50 | ||
54 | &:hover { | 51 | &:hover { |
55 | background: darken($theme-brand-primary, 5%); | 52 | background: darken($theme-brand-primary, 10%); |
56 | color: #FFF; | 53 | color: #FFF; |
57 | } | 54 | } |
58 | } | 55 | } |
59 | 56 | ||
60 | &.link { color: $theme-brand-primary; } | 57 | &.link { |
58 | color: $theme-brand-primary; | ||
59 | cursor: pointer; | ||
60 | } | ||
61 | } | 61 | } |
62 | 62 | ||
63 | .error-message, .error-message:last-of-type { | 63 | .error-message, .error-message:last-of-type { |
diff --git a/src/styles/vertical.scss b/src/styles/vertical.scss new file mode 100644 index 000000000..55660a088 --- /dev/null +++ b/src/styles/vertical.scss | |||
@@ -0,0 +1,62 @@ | |||
1 | $sidebar-width: 65px; | ||
2 | |||
3 | .sidebar { | ||
4 | width: 100vw; | ||
5 | height: $sidebar-width; | ||
6 | flex-direction: row; | ||
7 | position: absolute; | ||
8 | right: 0; | ||
9 | padding-bottom: 0px; | ||
10 | |||
11 | div:first-of-type { | ||
12 | overflow-x: scroll; | ||
13 | width: 100%; | ||
14 | } | ||
15 | |||
16 | .tabs { | ||
17 | flex-direction: row; | ||
18 | |||
19 | .tab-item { | ||
20 | |||
21 | &.is-active { | ||
22 | border-left-width: 0px; | ||
23 | border-top-width: 4px; | ||
24 | border-top-style: solid; | ||
25 | border-top-color: #7367f0; | ||
26 | padding-left: 4px; | ||
27 | } | ||
28 | |||
29 | &:not(.is-active) { | ||
30 | padding-top: 4px; | ||
31 | } | ||
32 | } | ||
33 | } | ||
34 | |||
35 | .sidebar__button--workspaces.is-active { | ||
36 | position: absolute; | ||
37 | right: 300px; | ||
38 | height: 100%; | ||
39 | background-color: #f7f7f9; | ||
40 | } | ||
41 | } | ||
42 | |||
43 | .app_service { | ||
44 | width: 100vw; | ||
45 | position: absolute; | ||
46 | top: $sidebar-width; | ||
47 | right: 0; | ||
48 | } | ||
49 | |||
50 | .theme__dark { | ||
51 | .sidebar .sidebar__button--workspaces.is-active { | ||
52 | background-color: #2d2f31; | ||
53 | } | ||
54 | } | ||
55 | |||
56 | .darwin .sidebar { | ||
57 | height: $sidebar-width + 22px; | ||
58 | |||
59 | .sidebar__button--workspaces.is-active { | ||
60 | height: $sidebar-width - 22px; | ||
61 | } | ||
62 | } \ No newline at end of file | ||