nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

polishing of the right sidebar

Browse source
This commit is contained in:
Pablo Cuadrado 2015-06-17 09:12:12 -03:00 committed by augier
parent 25be9ecfd2
commit c8ba4f061e
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/colors.scss
View file

@ -25,6 +25,8 @@ $red: #A80000;
$blue: #3F8FBA; $blue: #3F8FBA;
$dark-blue: darken(#0984C8,10%); $dark-blue: darken(#0984C8,10%);
$right-sidebar-background: #f0f0f0;
/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ /* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */
$cyan : rgb(8,204,249); $cyan : rgb(8,204,249);
$yellow : rgb(242,244,9); $yellow : rgb(242,244,9);

15
app/assets/stylesheets/sidebar.scss
View file

@ -1,21 +1,28 @@
#right-sidebar-fixed-background {
height: 100%;
background: $right-sidebar-background;
position: fixed;
right: 0;
}
.rightBar { .rightBar {
padding-top: 20px; padding-top: 20px;
background: $right-sidebar-background;
.section { .section {
margin-bottom: 20px; margin-bottom: 20px;
> .title { > .title {
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
padding-bottom: 2px; padding-bottom: 5px;
&.no_icon { padding-left: 8px; } &.no_icon { padding-left: 8px; }
h5 { h5 {
color: $text-dark-grey; color: $text-dark-grey;
font-weight: bold; font-weight: normal;
font-size: $font-size-base; font-size: $font-size-base;
margin: 0; margin: 0;
&.title-header { margin-left: 5px; } text-transform: uppercase;
} }
} }
@ -23,7 +30,7 @@
color: $text-grey; color: $text-grey;
font-size: $font-size-small; font-size: $font-size-small;
line-height: 18px; line-height: 18px;
padding: 5px; padding: 10px 0;
p, ul { margin: 0; } p, ul { margin: 0; }

7
app/views/shared/_right_sections.html.haml
View file

@ -7,7 +7,6 @@
.section .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-plus
= t('shared.invitations.invite_your_friends') = t('shared.invitations.invite_your_friends')
.content .content
= render "shared/invitations" = render "shared/invitations"
@ -15,7 +14,6 @@
.section .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-users
= t('aspects.index.new_here.title') = t('aspects.index.new_here.title')
.content .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')))) != 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 .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-circled-help
= t('aspects.index.help.need_help') = t('aspects.index.help.need_help')
.content .content
%p %p
@ -49,7 +46,6 @@
.section .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-cog
= t('aspects.index.services.heading') = t('aspects.index.services.heading')
.content .content
%div %div
@ -64,7 +60,6 @@
.section .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-bookmark
= t('bookmarklet.heading') = t('bookmarklet.heading')
.content .content
!= t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code)) != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code))
@ -73,7 +68,6 @@
.section .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-heart
= t('aspects.index.donate') = t('aspects.index.donate')
.content .content
%p %p
@ -84,7 +78,6 @@
.section .section
.title .title
%h5.title-header %h5.title-header
%i.entypo-mail
= t('aspects.index.help.any_problem') = t('aspects.index.help.any_problem')
.content .content
%p %p

5
app/views/streams/main_stream.html.haml
View file

@ -21,6 +21,7 @@
= link_to '×'.html_safe, getting_started_completed_path, id: "gs-skip-x", class: "close" = link_to '×'.html_safe, getting_started_completed_path, id: "gs-skip-x", class: "close"
%div.container-fluid %div.container-fluid
#right-sidebar-fixed-background.col-md-3.hidden-sm.hidden-xs
.row .row
.col-md-offset-1.col-md-2#leftNavBar .col-md-offset-1.col-md-2#leftNavBar
#home_user_badge #home_user_badge
@ -44,9 +45,9 @@
#aspect_stream_container.stream_container #aspect_stream_container.stream_container
= render 'aspects/aspect_stream', stream: @stream = render 'aspects/aspect_stream', stream: @stream
.col-md-2.rightBar .col-md-3.rightBar
#selected_aspect_contacts.section #selected_aspect_contacts.section
.title.no_icon .title
%h5.stream_title %h5.stream_title
= @stream.title = @stream.title
.content .content