diff --git a/app/assets/sass/global/_color-schemes.scss b/app/assets/sass/global/_color-schemes.scss index 1571916..21a2f86 100644 --- a/app/assets/sass/global/_color-schemes.scss +++ b/app/assets/sass/global/_color-schemes.scss @@ -26,9 +26,11 @@ %colorLink { color:$_color_dark_delta; + transition-duration: 0.5s; + transition-property: color; &:hover { - color:white; + color:$_color_omega; } } diff --git a/app/assets/sass/modules-interface/_main.scss b/app/assets/sass/modules-interface/_main.scss index 7a035ca..f293c58 100644 --- a/app/assets/sass/modules-interface/_main.scss +++ b/app/assets/sass/modules-interface/_main.scss @@ -5,7 +5,7 @@ .main[role="main"] {} .main__overview { - padding:$_space $_space_narrow $_space_narrow; + padding:$_space 0 $_space_narrow; position:relative; @include large-xlarge-screen { @@ -81,9 +81,11 @@ .main__overview__title { margin-bottom:$_space_narrow; + padding:0 $_space_narrow; @include large-xlarge-screen { margin-bottom:$_space; + padding:0; } .color-scheme--dark & { diff --git a/app/assets/sass/modules-objects/_filters.scss b/app/assets/sass/modules-objects/_filters.scss index 88f4e88..dec783d 100644 --- a/app/assets/sass/modules-objects/_filters.scss +++ b/app/assets/sass/modules-objects/_filters.scss @@ -26,7 +26,7 @@ } .filters__sublist { - padding:$_space_narrow; + padding:$_space_narrow; .filters__item, .filters__subitem {display:block;} @@ -42,7 +42,7 @@ min-height:56px; padding:0 $_space_narrow; position:relative; - width:auto; + width:auto; .color-scheme--dark & { border-color:$_color_dark_beta; @@ -65,8 +65,8 @@ .filters__item--more & { min-width:87px; text-align:left; - text-transform:lowercase; - + text-transform:lowercase; + .ico-down-dir { float:right; } diff --git a/app/components/sidebar/_sidebar.scss b/app/components/sidebar/_sidebar.scss index 33cc7fe..de47d54 100644 --- a/app/components/sidebar/_sidebar.scss +++ b/app/components/sidebar/_sidebar.scss @@ -118,6 +118,8 @@ position:absolute; right:0; top:0 ; + transition-duration:0.5s; + transition-property:color; @include large-xlarge-screen { padding:$_space $_space 0; @@ -131,6 +133,9 @@ color:$_color_light_gamma; } + &:focus, + &:hover {color:$_color_omega;} + &:before {margin:0;} .sidebar__item:first-child & {padding-top:0;} diff --git a/app/components/topbar/_topbar.scss b/app/components/topbar/_topbar.scss index 65a5f79..3dcfa3e 100644 --- a/app/components/topbar/_topbar.scss +++ b/app/components/topbar/_topbar.scss @@ -83,22 +83,26 @@ &:before {margin:0;} } + + &.topbar__button--hover { + transition-duration: 0.5s; + transition-property: color, background-color; + + &[aria-expanded="true"], + &:hover { + .color-scheme--dark & { + background:$_color_dark_alpha; + } + + .color-scheme--light & { + background:$_color_light_alpha; + } + } + } } .topbar__toggle-sidebar { - /* .topbar__button { */ - /* &:hover { */ - /* .color-scheme--dark & { */ - /* background:$_color_dark_alpha; */ - /* } */ - - /* .color-scheme--light & { */ - /* background:$_color_light_alpha; */ - /* } */ - /* } */ - /* } */ - .ico-menu { &:after { @@ -124,20 +128,9 @@ } .topbar__notifications { - .topbar__button { - &[aria-expanded="true"], - &:hover { - .color-scheme--dark & { - background:$_color_dark_alpha; - } - - .color-scheme--light & { - background:$_color_light_alpha; - } - } - } - + .ico-bell-alt { + &:after { background:$_color_error; border-radius:100%; @@ -176,19 +169,7 @@ } } -.topbar__settings { - .topbar__button { - &[aria-expanded="true"], - &:hover { - .color-scheme--dark & { - background:$_color_dark_alpha; - } - - .color-scheme--light & { - background:$_color_light_alpha; - } - } - } +.topbar__settings { .ico-sliders:before { @include vendor(transform, rotate(90deg)); diff --git a/app/components/topbar/topbar.html b/app/components/topbar/topbar.html index ad1d5a1..99d02b5 100644 --- a/app/components/topbar/topbar.html +++ b/app/components/topbar/topbar.html @@ -12,7 +12,7 @@
  • -