From c8ba4f061e543fa2484d9e9529a85ea61154ef78 Mon Sep 17 00:00:00 2001
From: Pablo Cuadrado <pablocuadrado@gmail.com>
Date: Wed, 17 Jun 2015 09:12:12 -0300
Subject: [PATCH] polishing of the right sidebar

---
 app/assets/stylesheets/colors.scss         |  2 ++
 app/assets/stylesheets/sidebar.scss        | 15 +++++++++++----
 app/views/shared/_right_sections.html.haml |  7 -------
 app/views/streams/main_stream.html.haml    |  5 +++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss
index 272821cc7e..98120d44a7 100644
--- a/app/assets/stylesheets/colors.scss
+++ b/app/assets/stylesheets/colors.scss
@@ -25,6 +25,8 @@ $red: #A80000;
 $blue: #3F8FBA;
 $dark-blue: darken(#0984C8,10%);
 
+$right-sidebar-background: #f0f0f0;
+
 /* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */
 $cyan : rgb(8,204,249);
 $yellow : rgb(242,244,9);
diff --git a/app/assets/stylesheets/sidebar.scss b/app/assets/stylesheets/sidebar.scss
index ecf57eb35d..2837ac62dd 100644
--- a/app/assets/stylesheets/sidebar.scss
+++ b/app/assets/stylesheets/sidebar.scss
@@ -1,21 +1,28 @@
+#right-sidebar-fixed-background {
+  height: 100%;
+  background: $right-sidebar-background;
+  position: fixed;
+  right: 0;
+}
 .rightBar {
   padding-top: 20px;
+  background: $right-sidebar-background;
 
   .section {
     margin-bottom: 20px;
 
     > .title {
       border-bottom: 1px solid $border-grey;
-      padding-bottom: 2px;
+      padding-bottom: 5px;
 
       &.no_icon { padding-left: 8px; }
 
       h5 {
         color: $text-dark-grey;
-        font-weight: bold;
+        font-weight: normal;
         font-size: $font-size-base;
         margin: 0;
-        &.title-header { margin-left: 5px; }
+        text-transform: uppercase;
       }
     }
 
@@ -23,7 +30,7 @@
       color: $text-grey;
       font-size: $font-size-small;
       line-height: 18px;
-      padding: 5px;
+      padding: 10px 0;
 
       p, ul { margin: 0; }
 
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 82af44da11..967c5354a3 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -7,7 +7,6 @@
   .section
     .title
       %h5.title-header
-        %i.entypo-plus
         = t('shared.invitations.invite_your_friends')
     .content
       = render "shared/invitations"
@@ -15,7 +14,6 @@
 .section
   .title
     %h5.title-header
-      %i.entypo-users
       = t('aspects.index.new_here.title')
   .content
     != t('aspects.index.new_here.follow', link: link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(name: t('shared.publisher.new_user_prefill.newhere'))))
@@ -25,7 +23,6 @@
 .section
   .title
     %h5.title-header
-      %i.entypo-circled-help
       = t('aspects.index.help.need_help')
   .content
     %p
@@ -49,7 +46,6 @@
   .section
     .title
       %h5.title-header
-        %i.entypo-cog
         = t('aspects.index.services.heading')
     .content
       %div
@@ -64,7 +60,6 @@
 .section
   .title
     %h5.title-header
-      %i.entypo-bookmark
       = t('bookmarklet.heading')
   .content
     != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code))
@@ -73,7 +68,6 @@
   .section
     .title
       %h5.title-header
-        %i.entypo-heart
         = t('aspects.index.donate')
     .content
       %p
@@ -84,7 +78,6 @@
   .section
     .title
       %h5.title-header
-        %i.entypo-mail
         = t('aspects.index.help.any_problem')
     .content
       %p
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 1effeb5b18..466876b9b1 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -21,6 +21,7 @@
             = link_to '&times;'.html_safe, getting_started_completed_path, id: "gs-skip-x", class: "close"
 
 %div.container-fluid
+  #right-sidebar-fixed-background.col-md-3.hidden-sm.hidden-xs
   .row
     .col-md-offset-1.col-md-2#leftNavBar
       #home_user_badge
@@ -44,9 +45,9 @@
       #aspect_stream_container.stream_container
         = render 'aspects/aspect_stream', stream: @stream
 
-    .col-md-2.rightBar
+    .col-md-3.rightBar
       #selected_aspect_contacts.section
-        .title.no_icon
+        .title
           %h5.stream_title
             = @stream.title
         .content
-- 
GitLab