From 3564d2fddfa74a7f907a53300150002f46417a5e Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 11 Oct 2020 20:07:34 +0200 Subject: Improve Ferdi's design (#977) Co-authored-by: Amine Mouafik --- src/styles/auth.scss | 1 - src/styles/colors.scss | 2 +- src/styles/layout.scss | 4 ++++ src/styles/settings.scss | 7 +++---- src/styles/type.scss | 9 +++------ 5 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src/styles') 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 @@ .auth__container { background: #FFF; border-radius: $theme-border-radius; - box-shadow: 0 0 50px rgba(black, .2); height: auto; margin: 40px auto 0; 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 @@ @import "./type-helper"; $theme-brand-primary: convert-rgb-string-to-color($raw-theme-brand-primary); -$theme-brand-gradient: linear-gradient( 135deg, #CE9FFC 10%, #7367F0 100%); +$theme-brand-gradient: #7266F0; $theme-brand-success: convert-rgb-string-to-color($raw-theme-brand-success); $theme-brand-info: convert-rgb-string-to-color($raw-theme-brand-info); $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 { z-index: 999999999; pointer-events: none; } + +a, button { + cursor: pointer; +} \ 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 @@ flex: 1; flex-direction: column; height: auto; - border-radius: $theme-border-radius; + border-radius: 0 $theme-border-radius $theme-border-radius 0; overflow: hidden; - box-shadow: 0 20px 50px rgba($dark-theme-black, .5); background: #FFF; } @@ -450,7 +449,7 @@ flex-direction: column; height: auto; width: 240px; - height: calc(100% - 100px); + height: 100%; align-self: center; border-top-left-radius: $theme-border-radius;; border-bottom-left-radius: $theme-border-radius;; @@ -463,7 +462,7 @@ color: $theme-text-color; display: flex; flex-shrink: 0; - height: 50px; + height: 51px; padding: 0 20px; text-decoration: none; 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 { text-decoration: none; &.button { - background: none; - border-width: 2px; - border-style: solid; - border-color: $theme-brand-primary; + background: $theme-brand-primary; + color: #FFF; border-radius: 3px; - color: $theme-brand-primary; display: inline-block; padding: 10px 20px; position: relative; @@ -52,7 +49,7 @@ a, button { cursor: pointer; &:hover { - background: darken($theme-brand-primary, 5%); + background: darken($theme-brand-primary, 10%); color: #FFF; } } -- cgit v1.2.3-70-g09d2