From 37e3a2749f24f4207715cbc691c3f6dc4ea03b84 Mon Sep 17 00:00:00 2001 From: Pablo Cuadrado Date: Mon, 22 Jun 2015 19:55:46 -0300 Subject: [PATCH] - left background to the far left of the screen - large screen breakpoints from BS3 - hover color is the same of link color (variable $blue) --- app/assets/stylesheets/leftnavbar.scss | 6 +++--- app/assets/templates/aspect_tpl.jst.hbs | 16 ++++++++++------ app/views/streams/main_stream.html.haml | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/leftnavbar.scss b/app/assets/stylesheets/leftnavbar.scss index 0b0c01330..e96a93ae6 100644 --- a/app/assets/stylesheets/leftnavbar.scss +++ b/app/assets/stylesheets/leftnavbar.scss @@ -45,9 +45,9 @@ font-weight: normal; color: $link-grey; border-bottom: 1px solid #ddd; - &:hover { - background-color: $background-blue; - color: $black; + &:hover, &:hover .entypo.check, &:hover + .action .entypo { + background-color: $blue; + color: $white; } } diff --git a/app/assets/templates/aspect_tpl.jst.hbs b/app/assets/templates/aspect_tpl.jst.hbs index 07e4209ad..fae49f3b7 100644 --- a/app/assets/templates/aspect_tpl.jst.hbs +++ b/app/assets/templates/aspect_tpl.jst.hbs @@ -1,9 +1,13 @@ + + {{#if selected}} + + {{else}} +
+ {{/if}} + + {{name}} + +
-{{#if selected}} - -{{else}} -
-{{/if}} - {{name}} diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml index eeeac4f1c..4712a3a61 100644 --- a/app/views/streams/main_stream.html.haml +++ b/app/views/streams/main_stream.html.haml @@ -24,7 +24,7 @@ #right-sidebar-fixed-sub-background.col-md-3.visible-lg #right-sidebar-fixed-background.col-md-3.col-lg-2.hidden-sm.hidden-xs .row - #left-navbar-fixed-background.col-lg-offset-1.col-lg-2.col-md-3.hidden-sm.hidden-xs + #left-navbar-fixed-background.col-md-3.hidden-sm.hidden-xs .col-lg-offset-1.col-lg-2.col-md-3#leftNavBar #home_user_badge = owner_image_link