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

Merge pull request #3920 from asphxia/3906-left-side-panel-ui-changes

Browse source 
Side panel ui changes
This commit is contained in:
Jonne Haß 2013-01-27 08:24:47 -08:00
commit 6653684f64
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -28,7 +28,7 @@
* Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802) * Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
* Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821) * Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
* Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822) * Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828), [#3874](https://github.com/diaspora/diaspora/issues/3874), [#3806](https://github.com/diaspora/diaspora/issues/3806). * User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828), [#3874](https://github.com/diaspora/diaspora/issues/3874), [#3806](https://github.com/diaspora/diaspora/issues/3806), [#3906](https://github.com/diaspora/diaspora/issues/3906).
* Show links in sidebar [#3827](https://github.com/diaspora/diaspora/pull/3827) * Show links in sidebar [#3827](https://github.com/diaspora/diaspora/pull/3827)
## Bug Fixes ## Bug Fixes

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

@ -33,12 +33,10 @@
%li %li
= link_to t("streams.activity.title"), activity_stream_path, :class => 'home_selector', :rel => 'backbone' = link_to t("streams.activity.title"), activity_stream_path, :class => 'home_selector', :rel => 'backbone'
%ul.left_nav.sub %ul.left_nav
%li %li
= link_to t('streams.mentions.title'), mentioned_stream_path, :class => 'home_selector', :rel => 'backbone' = link_to t('streams.mentions.title'), mentioned_stream_path, :class => 'home_selector', :rel => 'backbone'
%br
%ul.left_nav %ul.left_nav
%li %li
= link_to t("streams.multi.title"), stream_path, :class => 'home_selector', :rel => 'backbone' = link_to t("streams.multi.title"), stream_path, :class => 'home_selector', :rel => 'backbone'