From c5b133d3e86fb0a6a822588e31facdc6db6d37db Mon Sep 17 00:00:00 2001
From: Muhannes <haneda-3@student.ltu.se>
Date: Tue, 11 Oct 2016 20:02:39 +0200
Subject: [PATCH] added mobile buttons for streams

Fixed sizes for drawer buttons

Added buttons for stream and public stream in mobile drawer

closes #7144
---
 Changelog.md                              |  1 +
 app/assets/stylesheets/mobile/header.scss |  4 ++--
 app/views/layouts/_drawer.mobile.haml     |  2 ++
 features/mobile/drawer.feature            | 10 ++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 25734bf3d..6500c7c73 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -44,6 +44,7 @@ Note: Although this is a minor release, the configuration file changed because t
 * Add In-Reply-To and References headers to notification mails [#7122](https://github.com/diaspora/diaspora/pull/7122)
 * Directly link to a comment in commented notification mails [#7124](https://github.com/diaspora/diaspora/pull/7124)
 * Add optional `Content-Security-Policy` header [#7128](https://github.com/diaspora/diaspora/pull/7128)
+* Add links to main stream and public stream to the mobile drawer [#7144](https://github.com/diaspora/diaspora/pull/7144)
 
 # 0.6.0.1
 
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index cc07ce808..c1813042e 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -149,7 +149,7 @@ $mobile-navbar-height: 46px;
 
     li {
       font-size: 1.8rem;
-      line-height: 25px;
+      line-height: 2rem;
       color: $light-grey;
       border-bottom: solid $navbar-inverse-border 1px;
     }
@@ -179,7 +179,7 @@ $mobile-navbar-height: 46px;
     .avatar {
       height: 35px;
       width: 35px;
-      margin: -5px 5px;
+      margin: -7px 5px;
       float: right;
     }
   }
diff --git a/app/views/layouts/_drawer.mobile.haml b/app/views/layouts/_drawer.mobile.haml
index d676a2084..1ce2431df 100644
--- a/app/views/layouts/_drawer.mobile.haml
+++ b/app/views/layouts/_drawer.mobile.haml
@@ -8,6 +8,7 @@
                               autocomplete: "off", class: "ac_input form-control"
   %nav.navbar-inverse
     %ul
+      %li= link_to t("streams.multi.title"), stream_path
       %li= link_to t("streams.activity.title"), activity_stream_path
       %li= link_to t("streams.mentions.title"), mentioned_stream_path
       %li#all_aspects
@@ -25,6 +26,7 @@
           - if current_user.followed_tags.length > 0
             %li.manage-followed-tags
               = link_to t("tag_followings.manage.title"), manage_tag_followings_path
+      %li= link_to t("streams.public.title"), public_stream_path
       %li
         = link_to user_profile_path(current_user.username) do
           = t("layouts.header.profile")
diff --git a/features/mobile/drawer.feature b/features/mobile/drawer.feature
index d861eb683..4d7d7bc40 100644
--- a/features/mobile/drawer.feature
+++ b/features/mobile/drawer.feature
@@ -40,6 +40,11 @@ Feature: Navigate between pages using the header menu and the drawer
     Then I should see a "#q" within "#drawer"
     When I search for "#bob"
     Then I should be on the tag page for "bob"
+    
+  Scenario: navigate to the stream page
+    When I open the drawer
+    And I click on "Stream" in the drawer
+    Then I should be on the stream page
 
   Scenario: navigate to my activity page
     When I open the drawer
@@ -70,6 +75,11 @@ Feature: Navigate between pages using the header menu and the drawer
     And I click on "#Followed tags" in the drawer
     And I click on "Manage followed tags" in the drawer
     Then I should be on the manage tag followings page
+    
+  Scenario: navigate to the public stream page
+    When I open the drawer
+    And I click on "Public activity" in the drawer
+    Then I should be on the public stream page
 
   Scenario: navigate to my profile page
     When I open the drawer