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

Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop

Browse source 
Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml
This commit is contained in:
Jonne Haß 2013-05-18 20:03:59 +02:00
commit f5a4bc51c2
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -139,6 +139,7 @@ everything is set up.
* Missing translation "Back to top". [#4138](https://github.com/diaspora/diaspora/pull/4138) * Missing translation "Back to top". [#4138](https://github.com/diaspora/diaspora/pull/4138)
* Fix preview with locator feature. [#4147](https://github.com/diaspora/diaspora/pull/4147) * Fix preview with locator feature. [#4147](https://github.com/diaspora/diaspora/pull/4147)
* Fix mentions at end of post. [#3746](https://github.com/diaspora/diaspora/issues/3746) * Fix mentions at end of post. [#3746](https://github.com/diaspora/diaspora/issues/3746)
* Fix missing indent to correct logged-out-header container relative positioning [#4134](https://github.com/diaspora/diaspora/pull/4134)
## Features ## Features

12
app/views/layouts/_header.html.haml
View file

@ -5,10 +5,10 @@
%header %header
- unless current_user - unless current_user
.container{:style => "position:relative;"} .container{:style => "position:relative;"}
= link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path = link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path
%ul#landing_nav %ul#landing_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
%li= link_to 'github', "https://github.com/diaspora/diaspora" %li= link_to 'github', "https://github.com/diaspora/diaspora"
%li= link_to t('.blog'), 'http://blog.diasporafoundation.org/' %li= link_to t('.blog'), 'http://blog.diasporafoundation.org/'
%li= link_to t('.login'), new_user_session_path, :class => 'login' %li= link_to t('.login'), new_user_session_path, :class => 'login'