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

Merge pull request #5227 from jaideng123/5218-fix_deformed_getstarted_popover

Browse source 
Fixed deformation of getting started popovers
This commit is contained in:
Jonne Haß 2014-09-18 12:43:48 +02:00
commit 31613e7784
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -47,6 +47,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158) * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
* Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960) * Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960)
* Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208) * Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208)
* Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
## Features ## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105) * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

9
app/assets/javascripts/app/views/publisher/getting_started_view.js
View file

@ -21,21 +21,24 @@ app.views.PublisherGettingStarted = Backbone.View.extend({
offset: 30, offset: 30,
id: 'first_message_explain', id: 'first_message_explain',
placement: 'right', placement: 'right',
html: true html: true,
container: 'body'
}, 600); }, 600);
this._addPopover(this.el_visibility, { this._addPopover(this.el_visibility, {
trigger: 'manual', trigger: 'manual',
offset: 10, offset: 10,
id: 'message_visibility_explain', id: 'message_visibility_explain',
placement: 'bottom', placement: 'bottom',
html: true html: true,
container: 'body'
}, 1000); }, 1000);
this._addPopover(this.el_stream, { this._addPopover(this.el_stream, {
trigger: 'manual', trigger: 'manual',
offset: -5, offset: -5,
id: 'stream_explain', id: 'stream_explain',
placement: 'left', placement: 'left',
html: true html: true,
container: 'body'
}, 1400); }, 1400);
// hide some popovers when a post is created // hide some popovers when a post is created