Merge branch 'stable' into develop

Changelog.md

@@ -74,6 +74,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Bring peeping Tom on the 404 page back [#6226](https://github.com/diaspora/diaspora/pull/6226)
 * Fix mobile photos index page [#6243](https://github.com/diaspora/diaspora/pull/6243)
 * Fix conversations view with no contacts [#6266](https://github.com/diaspora/diaspora/pull/6266)
+* Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
 
 ## Features
 

app/views/streams/main_stream.html.haml

@@ -29,16 +29,16 @@
           = link_to current_user.first_name, local_or_remote_person_path(current_user.person)
 
       %ul#stream_selection
-        %li.hoverable{data: {stream: 'stream'}}
-          = link_to t("streams.multi.title"), stream_path, rel: 'backbone'
-        %li.hoverable{data: {stream: 'activity'}}
-          = link_to t("streams.activity.title"), activity_stream_path, rel: 'backbone'
-        %li.hoverable{data: {stream: 'mentions'}}
-          = link_to t('streams.mentions.title'), mentioned_stream_path, rel: 'backbone'
+        %li{data: {stream: "stream"}}
+          = link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
+        %li{data: {stream: "activity"}}
+          = link_to t("streams.activity.title"), activity_stream_path, rel: "backbone", class: "hoverable"
+        %li{data: {stream: "mentions"}}
+          = link_to t("streams.mentions.title"), mentioned_stream_path, rel: "backbone", class: "hoverable"
         %li.all_aspects
-          = render 'aspects/aspect_listings', stream: @stream
+          = render "aspects/aspect_listings", stream: @stream
         %li
-          = render 'tags/followed_tags_listings'
+          = render "tags/followed_tags_listings"
 
     .col-md-6
       #aspect_stream_container.stream_container