moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-55324 atto_media: Reduce maximum height of atto modal

Browse source 
Previously after adding a few sources or expanding a few fieldsets
the modal would be pushed off the bottom of the screen. Here we
reduce the maximum height to allow it to remain visible.
This commit is contained in:
Cameron Ball 2016-11-24 10:59:21 +08:00
parent e24699cc7a
commit 4d85886b5f
No known key found for this signature in database
GPG key ID: 305B7F70214D810C
6 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/editor/atto/plugins/media/styles.css
View file

@ -6,7 +6,7 @@
} }
.atto_form.atto_media > .tab-content { .atto_form.atto_media > .tab-content {
max-height: 60vh; max-height: 45vh;
overflow-x: hidden; overflow-x: hidden;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;

1
lib/editor/atto/plugins/media/tests/behat/media.feature
View file

@ -58,6 +58,7 @@ Feature: Add media to Atto
And I click on "Private files" "link" in the ".moodle-dialogue-base[aria-hidden='false'] .fp-repo-area" "css_element" And I click on "Private files" "link" in the ".moodle-dialogue-base[aria-hidden='false'] .fp-repo-area" "css_element"
And I click on "moodle-logo.png" "link" And I click on "moodle-logo.png" "link"
And I click on "Select this file" "button" in the ".moodle-dialogue-base[aria-hidden='false']" "css_element" And I click on "Select this file" "button" in the ".moodle-dialogue-base[aria-hidden='false']" "css_element"
And I change window size to "large"
And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_width_entry ')]" to "420" And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_width_entry ')]" to "420"
And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_height_entry ')]" to "69" And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_height_entry ')]" to "69"
And I click on "Display options" "link" And I click on "Display options" "link"

1
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js vendored
View file

@ -740,7 +740,6 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
* @private * @private
*/ */
_addMediaSourceComponent: function(element, callback) { _addMediaSourceComponent: function(element, callback) {
window.console.log(this.get('help').addsource);
var mediumType = this._getMediumTypeFromTabPane(element.ancestor('.tab-pane')); var mediumType = this._getMediumTypeFromTabPane(element.ancestor('.tab-pane'));
var context = this._getContext({ var context = this._getContext({
multisource: true, multisource: true,

2
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js vendored
View file

File diff suppressed because one or more lines are too long

1
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js vendored
View file

@ -740,7 +740,6 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
* @private * @private
*/ */
_addMediaSourceComponent: function(element, callback) { _addMediaSourceComponent: function(element, callback) {
window.console.log(this.get('help').addsource);
var mediumType = this._getMediumTypeFromTabPane(element.ancestor('.tab-pane')); var mediumType = this._getMediumTypeFromTabPane(element.ancestor('.tab-pane'));
var context = this._getContext({ var context = this._getContext({
multisource: true, multisource: true,

1
lib/editor/atto/plugins/media/yui/src/button/js/button.js vendored
View file

@ -738,7 +738,6 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
* @private * @private
*/ */
_addMediaSourceComponent: function(element, callback) { _addMediaSourceComponent: function(element, callback) {
window.console.log(this.get('help').addsource);
var mediumType = this._getMediumTypeFromTabPane(element.ancestor('.tab-pane')); var mediumType = this._getMediumTypeFromTabPane(element.ancestor('.tab-pane'));
var context = this._getContext({ var context = this._getContext({
multisource: true, multisource: true,