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

Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix

Browse source 
Add lightbox html to unauthenticated header

Conflicts:
	Changelog.md
This commit is contained in:
Jonne Haß 2013-12-01 23:58:00 +01:00
commit 8baa06e477
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -37,6 +37,7 @@
* Fix getting started page for mobile [#4536](https://github.com/diaspora/diaspora/pull/4536)
* Refactor mobile header, fix [#4579](https://github.com/diaspora/diaspora/issues/4579)
* Fix avatar display on mobile profile [#4591](https://github.com/diaspora/diaspora/pull/4591)
* Add lightbox to unauthenticated header, fix [#4432](https://github.com/diaspora/diaspora/issues/4432)
## Features
* Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)

8
app/views/layouts/_header.html.haml
View file

@ -11,3 +11,11 @@
- unless current_page?(controller: :registrations, action: :new)
%li= link_to t('devise.shared.links.sign_up'), new_user_registration_path, class: 'login'
%li= link_to t('devise.shared.links.sign_in'), new_user_session_path, class: 'login'
#lightbox
#lightbox-content
%a#lightbox-close-link(href='#')
[x]
=t('javascripts.header.close')
%img#lightbox-image
#lightbox-imageset
#lightbox-backdrop