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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2015-08-29 18:19:12 +02:00
commit 5020ac45c7
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -92,6 +92,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267) * Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
* Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286) * Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286)
* Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339) * Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339)
* Fix pagination design on notifications page [#6364](https://github.com/diaspora/diaspora/pull/6364)
## Features ## Features

2
app/assets/stylesheets/mobile/mobile.scss
View file

@ -647,7 +647,7 @@ form#new_user.new_user input.btn {
text-shadow: 1px 1px 20px rgb(126, 240, 77); text-shadow: 1px 1px 20px rgb(126, 240, 77);
} }
#conversation_inbox { #conversation_inbox, .notifications {
div.pagination { div.pagination {
width: 100%; width: 100%;
margin-left: auto; margin-left: auto;

7
app/views/notifications/index.mobile.haml
View file

@ -24,4 +24,9 @@
.time_notif .time_notif
= timeago(note.created_at) = timeago(note.created_at)
= will_paginate @notifications, renderer: WillPaginate::ActionView::BootstrapLinkRenderer = will_paginate @notifications,
previous_label: "«",
next_label: "»",
inner_window: 1,
outer_window: 0,
renderer: WillPaginate::ActionView::BootstrapLinkRenderer