1115e10536
Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/application.css.sass app/assets/templates/comment_tpl.jst.hbs app/assets/templates/stream-element_tpl.jst.hbs app/helpers/aspects_helper.rb app/helpers/contacts_helper.rb app/views/aspects/_aspect_listings.haml app/views/aspects/toggle_contact_visibility.js.erb app/views/contacts/_aspect_listings.haml app/views/layouts/_header.html.haml app/views/shared/_footer.html.haml app/views/tags/_followed_tags_listings.haml
14 lines
656 B
Text
14 lines
656 B
Text
-# Copyright (c) 2010-2011, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3 or later. See
|
|
-# the COPYRIGHT file.
|
|
|
|
%header
|
|
- unless current_user
|
|
.container{:style => "position:relative;"}
|
|
= link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path
|
|
|
|
%ul#landing_nav
|
|
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
|
|
%li= link_to 'github', "https://github.com/diaspora/diaspora"
|
|
%li= link_to t('.blog'), 'http://blog.joindiaspora.com/'
|
|
%li= link_to t('.login'), new_user_session_path, :class => 'login'
|