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

Put the stream first in the left menu

Browse source
This commit is contained in:
flaburgan 2013-11-01 21:32:09 -07:00
parent 76c75af373
commit 47645dd985
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -12,6 +12,7 @@
* Refactor the Twitter service model [#4387](https://github.com/diaspora/diaspora/pull/4387) * Refactor the Twitter service model [#4387](https://github.com/diaspora/diaspora/pull/4387)
* Refactor ConversationsController#create, move more stuff to User model [#4551](https://github.com/diaspora/diaspora/pull/4551) * Refactor ConversationsController#create, move more stuff to User model [#4551](https://github.com/diaspora/diaspora/pull/4551)
* Refactor MessagesController#create, move stuff to User model [#4556](https://github.com/diaspora/diaspora/pull/4556) * Refactor MessagesController#create, move stuff to User model [#4556](https://github.com/diaspora/diaspora/pull/4556)
* Reorder the left bar side menu to put the stream first [#4569](https://github.com/diaspora/diaspora/pull/4569)
## Bug fixes ## Bug fixes
* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441) * Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)

3
app/assets/stylesheets/sidebar.css.scss
View file

@ -3,6 +3,7 @@ $bluebg: #e7f2f7;
#home_user_badge { #home_user_badge {
min-height: 50px; min-height: 50px;
margin-bottom: 20px; margin-bottom: 20px;
margin-left: 4px;
img { img {
float: left; float: left;
@ -44,7 +45,7 @@ $bluebg: #e7f2f7;
.hoverable { .hoverable {
display: block; display: block;
margin-right: 6px; margin-right: 6px;
padding: 4px 4px 4px 0; padding: 4px;
&:hover { background-color: $bluebg; } &:hover { background-color: $bluebg; }
} }

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

@ -29,12 +29,12 @@
= link_to current_user.first_name, local_or_remote_person_path(current_user.person) = link_to current_user.first_name, local_or_remote_person_path(current_user.person)
%ul#stream_selection %ul#stream_selection
%li.hoverable{:data => {:stream => 'stream'}}
= link_to t("streams.multi.title"), stream_path, :rel => 'backbone'
%li.hoverable{:data => {:stream => 'activity'}} %li.hoverable{:data => {:stream => 'activity'}}
= link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone' = link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone'
%li.hoverable{:data => {:stream => 'mentions'}} %li.hoverable{:data => {:stream => 'mentions'}}
= link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone' = link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone'
%li.hoverable{:data => {:stream => 'stream'}}
= link_to t("streams.multi.title"), stream_path, :rel => 'backbone'
%li.all_aspects %li.all_aspects
= render 'aspects/aspect_listings', :stream => @stream = render 'aspects/aspect_listings', :stream => @stream
%li %li