summaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
authorLibravatar Bennett <hello@vantezzen.io>2020-10-11 20:07:34 +0200
committerLibravatar GitHub <noreply@github.com>2020-10-11 19:07:34 +0100
commit3564d2fddfa74a7f907a53300150002f46417a5e (patch)
tree87d77c0cce6d3251f290708e3d0480661d4feb13 /src/styles
parentMerge #722 (diff)
downloadferdium-app-3564d2fddfa74a7f907a53300150002f46417a5e.tar.gz
ferdium-app-3564d2fddfa74a7f907a53300150002f46417a5e.tar.zst
ferdium-app-3564d2fddfa74a7f907a53300150002f46417a5e.zip
Improve Ferdi's design (#977)
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/auth.scss1
-rw-r--r--src/styles/colors.scss2
-rw-r--r--src/styles/layout.scss4
-rw-r--r--src/styles/settings.scss7
-rw-r--r--src/styles/type.scss9
5 files changed, 11 insertions, 12 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
187a, button {
188 cursor: pointer;
189} \ No newline at end of file
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 147083a5f..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;
diff --git a/src/styles/type.scss b/src/styles/type.scss
index 7531b2044..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,7 +49,7 @@ 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 }