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

added mobile buttons for streams

Browse source 
Fixed sizes for drawer buttons

Added buttons for stream and public stream in mobile drawer

closes #7144
This commit is contained in:
Muhannes 2016-10-11 20:02:39 +02:00 committed by Steffen van Bergerem
parent cdcf2d747e
commit c5b133d3e8
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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) * 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) * 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 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 # 0.6.0.1

4
app/assets/stylesheets/mobile/header.scss
View file

@ -149,7 +149,7 @@ $mobile-navbar-height: 46px;
li { li {
font-size: 1.8rem; font-size: 1.8rem;
line-height: 25px; line-height: 2rem;
color: $light-grey; color: $light-grey;
border-bottom: solid $navbar-inverse-border 1px; border-bottom: solid $navbar-inverse-border 1px;
} }
@ -179,7 +179,7 @@ $mobile-navbar-height: 46px;
.avatar { .avatar {
height: 35px; height: 35px;
width: 35px; width: 35px;
margin: -5px 5px; margin: -7px 5px;
float: right; float: right;
} }
} }

2
app/views/layouts/_drawer.mobile.haml
View file

@ -8,6 +8,7 @@
autocomplete: "off", class: "ac_input form-control" autocomplete: "off", class: "ac_input form-control"
%nav.navbar-inverse %nav.navbar-inverse
%ul %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.activity.title"), activity_stream_path
%li= link_to t("streams.mentions.title"), mentioned_stream_path %li= link_to t("streams.mentions.title"), mentioned_stream_path
%li#all_aspects %li#all_aspects
@ -25,6 +26,7 @@
- if current_user.followed_tags.length > 0 - if current_user.followed_tags.length > 0
%li.manage-followed-tags %li.manage-followed-tags
= link_to t("tag_followings.manage.title"), manage_tag_followings_path = link_to t("tag_followings.manage.title"), manage_tag_followings_path
%li= link_to t("streams.public.title"), public_stream_path
%li %li
= link_to user_profile_path(current_user.username) do = link_to user_profile_path(current_user.username) do
= t("layouts.header.profile") = t("layouts.header.profile")

10
features/mobile/drawer.feature
View file

@ -41,6 +41,11 @@ Feature: Navigate between pages using the header menu and the drawer
When I search for "#bob" When I search for "#bob"
Then I should be on the tag page 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 Scenario: navigate to my activity page
When I open the drawer When I open the drawer
And I click on "My activity" in the drawer And I click on "My activity" in the drawer
@ -71,6 +76,11 @@ Feature: Navigate between pages using the header menu and the drawer
And I click on "Manage 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 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 Scenario: navigate to my profile page
When I open the drawer When I open the drawer
And I click on "Profile" in the drawer And I click on "Profile" in the drawer