x/bansho
Code Issues Proposed changes

Merge pull request #37 from titilambert/frontend_fev13

Browse Source 
Frontend fev13
This commit is contained in:
Frédéric Vachon 2015-03-23 10:10:23 -04:00
commit 511dee63a7
6 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/sass/global/_color-schemes.scss
View File

@ -26,9 +26,11 @@
%colorLink { %colorLink {
color:$_color_dark_delta; color:$_color_dark_delta;
transition-duration: 0.5s;
transition-property: color;
&:hover { &:hover {
color:white; color:$_color_omega;
} }
} }

4
app/assets/sass/modules-interface/_main.scss
View File

@ -5,7 +5,7 @@
.main[role="main"] {} .main[role="main"] {}
.main__overview { .main__overview {
padding:$_space $_space_narrow $_space_narrow; padding:$_space 0 $_space_narrow;
position:relative; position:relative;
@include large-xlarge-screen { @include large-xlarge-screen {
@ -81,9 +81,11 @@
.main__overview__title { .main__overview__title {
margin-bottom:$_space_narrow; margin-bottom:$_space_narrow;
padding:0 $_space_narrow;
@include large-xlarge-screen { @include large-xlarge-screen {
margin-bottom:$_space; margin-bottom:$_space;
padding:0;
} }
.color-scheme--dark & { .color-scheme--dark & {

5
app/components/sidebar/_sidebar.scss
View File

@ -118,6 +118,8 @@
position:absolute; position:absolute;
right:0; right:0;
top:0 ; top:0 ;
transition-duration:0.5s;
transition-property:color;
@include large-xlarge-screen { @include large-xlarge-screen {
padding:$_space $_space 0; padding:$_space $_space 0;
@ -131,6 +133,9 @@
color:$_color_light_gamma; color:$_color_light_gamma;
} }
&:focus,
&:hover {color:$_color_omega;}
&:before {margin:0;} &:before {margin:0;}
.sidebar__item:first-child & {padding-top:0;} .sidebar__item:first-child & {padding-top:0;}

53
app/components/topbar/_topbar.scss
View File

@ -83,22 +83,26 @@
&:before {margin:0;} &: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__toggle-sidebar {
/* .topbar__button { */
/* &:hover { */
/* .color-scheme--dark & { */
/* background:$_color_dark_alpha; */
/* } */
/* .color-scheme--light & { */
/* background:$_color_light_alpha; */
/* } */
/* } */
/* } */
.ico-menu { .ico-menu {
&:after { &:after {
@ -124,20 +128,9 @@
} }
.topbar__notifications { .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 { .ico-bell-alt {
&:after { &:after {
background:$_color_error; background:$_color_error;
border-radius:100%; border-radius:100%;
@ -177,18 +170,6 @@
} }
.topbar__settings { .topbar__settings {
.topbar__button {
&[aria-expanded="true"],
&:hover {
.color-scheme--dark & {
background:$_color_dark_alpha;
}
.color-scheme--light & {
background:$_color_light_alpha;
}
}
}
.ico-sliders:before { .ico-sliders:before {
@include vendor(transform, rotate(90deg)); @include vendor(transform, rotate(90deg));

4
app/components/topbar/topbar.html
View File

@ -12,7 +12,7 @@
</button> </button>
</li> </li>
<li class="topbar__item topbar__notifications"> <li class="topbar__item topbar__notifications">
<button class="topbar__button" <button class="topbar__button topbar__button--hover"
id="notifications" id="notifications"
type="button" type="button"
data-toggle="collapse" data-toggle="collapse"
@ -111,7 +111,7 @@
<ul class="topbar__list topbar__list--right"> <ul class="topbar__list topbar__list--right">
<li class="topbar__item topbar__settings"> <li class="topbar__item topbar__settings">
<button class="topbar__button" <button class="topbar__button topbar__button--hover"
id="settings" id="settings"
data-toggle="collapse" data-toggle="collapse"
data-target="#settingsPanel" data-target="#settingsPanel"