Skip to content

Commit

Permalink
Merge branch 'MDL-56773-master' of git://github.com/rezaies/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyatregubov authored and stronk7 committed Oct 5, 2021
2 parents 598f3c2 + d4dfd44 commit 85c1947
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
4 changes: 0 additions & 4 deletions lib/editor/atto/plugins/equation/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@
padding: 5px;
min-width: 206px;
}

.atto_form .atto_equation_preview {
margin-bottom: 0; /* Turn off the margin-bottom from the class "well" */
}
2 changes: 2 additions & 0 deletions lib/editor/atto/plugins/equation/tests/behat/equation.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Feature: Atto equation editor
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
And I click on "Equation editor" "button"
And the "class" attribute of "Edit equation using" "field" should contain "text-ltr"
And I set the field "Edit equation using" to " = 1 \div 0"
And I click on "\infty" "button"
And I click on "Save equation" "button"
Expand All @@ -31,6 +32,7 @@ Feature: Atto equation editor
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
And I click on "Equation editor" "button"
And the "class" attribute of "Edit equation using" "field" should contain "text-ltr"
Then the field "Edit equation using" matches value " \pi "
And I click on "Save equation" "button"
And the field "Description" matches value "<p>\( \pi \)</p>"
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ var COMPONENTNAME = 'atto_equation',
'<form class="atto_form">' +
'{{{library}}}' +
'<label for="{{elementid}}_{{CSS.EQUATION_TEXT}}">{{{get_string "editequation" component texdocsurl}}}</label>' +
'<textarea class="fullwidth {{CSS.EQUATION_TEXT}}" ' +
'<textarea class="fullwidth text-ltr {{CSS.EQUATION_TEXT}}" ' +
'id="{{elementid}}_{{CSS.EQUATION_TEXT}}" rows="8"></textarea><br/>' +
'<label for="{{elementid}}_{{CSS.EQUATION_PREVIEW}}">{{get_string "preview" component}}</label>' +
'<div describedby="{{elementid}}_cursorinfo" class="well well-small p-1 fullwidth {{CSS.EQUATION_PREVIEW}}" ' +
'<div describedby="{{elementid}}_cursorinfo" ' +
'class="border rounded bg-light p-1 fullwidth {{CSS.EQUATION_PREVIEW}}" ' +
'id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div id="{{elementid}}_cursorinfo">{{get_string "cursorinfo" component}}</div>' +
'<div class="mdl-align">' +
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 85c1947

Please sign in to comment.