mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-30 01:46:24 +01:00
Code Issues Releases Wiki Activity

Reset the position of the Hallo bar after the input fields expand

Browse Source
This commit is contained in:
Alex Gleason 2015-09-25 12:51:53 -05:00 committed by Matt Westcott
parent 015e9da9b8
commit bad069ffb8
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js
View File

@ -34,6 +34,9 @@ function makeRichTextEditable(id) {
var closestObj = input.closest('.object');
/* Events for when CSS transitions end, for various browsers */
var transitionEvents = 'webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend';
richText.hallo({
toolbar: 'halloToolbarFixed',
toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field')) ? 'stream-field' : '',
@ -46,6 +49,17 @@ function makeRichTextEditable(id) {
}
}).bind('paste', function(event, data) {
setTimeout(removeStyling, 1);
/* Reset the position of Hallo toolbar after the input boxes finish resizing */
}).bind('halloactivated', function(event, data) {
$(event.target).one(transitionEvents, function(e) {
data.turnOn();
});
$(event.target).addClass('expanded');
}).bind('hallodeactivated', function(event, data) {
$(event.target).one(transitionEvents, function(e) {
data.turnOff();
});
$(event.target).removeClass('expanded');
});
}

2
wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss
View File

@ -132,7 +132,7 @@
padding-bottom:1em;
@include transition(padding .2s ease);
&.inEditMode{
&.expanded{
padding-top:5em; /* to provide space for editor buttons */
padding-bottom:2em;
}