From cd62c33f17c4116a2a1ffd700b4b7feca8d603ad Mon Sep 17 00:00:00 2001 From: Diaspora Europe Date: Thu, 15 Mar 2012 18:10:29 +0100 Subject: [PATCH] mobile: added stream and activity links to header --- app/views/layouts/application.mobile.haml | 6 ++++++ public/stylesheets/sass/mobile.scss | 26 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 8a5e30389..92485b01b 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -51,6 +51,12 @@ .container{:style => "position: relative;"} = link_to(image_tag('header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), stream_path) - if user_signed_in? + #header-nav + .stream-nav + = link_to(t('.my_stream'), stream_path) + .activity-nav + = link_to(t('.my_activity'), activity_stream_path) + #nav_badges .badge{:id => "notification_badge"} = link_to(image_tag('icons/notifications_grey.png', :height => 16, :width => 16, :id => 'notification-flag'), notifications_path) diff --git a/public/stylesheets/sass/mobile.scss b/public/stylesheets/sass/mobile.scss index cc3ce2919..667bc12fc 100644 --- a/public/stylesheets/sass/mobile.scss +++ b/public/stylesheets/sass/mobile.scss @@ -283,7 +283,7 @@ body { text-decoration: none; } #nav_badges .badge { position: relative; - top: -15px; + top: -12px; display: inline; margin: 0 2px; padding: 8px 3px; @@ -615,3 +615,27 @@ select { margin-bottom: 5px; } +#header-nav { + font-weight: bold; + height: 100%; + margin-right: 5px; + margin-top: 3px; +display: inline-block; +} + +#header-nav a { + padding: 0 10px; + width: 100%; + color: #939393; +} + +#header-nav > div { + display: inline; + font-weight: bold; + margin: 0 2px; + padding: 8px 3px 9px; + position: relative; + top: -15px; + width: 28px; +} +