Merge branch 'MDL-58581-master-take2' of https://github.com/lucaboesch/moodle

lib/classes/output/icon_system_fontawesome.php

@@ -156,7 +156,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:e/spellcheck' => 'fa-check',
             'core:e/split_cells' => 'fa-columns',
             'core:e/strikethrough' => 'fa-strikethrough',
-            'core:e/styleprops' => 'fa-info',
+            'core:e/styleparagraph' => 'fa-font',
             'core:e/subscript' => 'fa-subscript',
             'core:e/superscript' => 'fa-superscript',
             'core:e/table_props' => 'fa-table',

lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js

@@ -67,7 +67,7 @@ Y.namespace('M.atto_title').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             });
         });
         this.addToolbarMenu({
-            icon: 'e/styleprops',
+            icon: 'e/styleparagraph',
             globalItemConfig: {
                 callback: this._changeStyle
             },

lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js

@@ -1 +1 @@
-YUI.add("moodle-atto_title-button",function(e,t){var n="atto_title",r=[{text:"h3",callbackArgs:"<h3>"},{text:"h4",callbackArgs:"<h4>"},{text:"h5",callbackArgs:"<h5>"},{text:"pre",callbackArgs:"<pre>"},{text:"p",callbackArgs:"<p>"}];e.namespace("M.atto_title").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){var t=[];e.Array.each(r,function(e){t.push({text:M.util.get_string(e.text,n),callbackArgs:e.callbackArgs})}),this.addToolbarMenu({icon:"e/styleprops",globalItemConfig:{callback:this._changeStyle},items:t})},_changeStyle:function(e,t){document.execCommand("formatBlock",!1,t),this.markUpdated()}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
+YUI.add("moodle-atto_title-button",function(e,t){var n="atto_title",r=[{text:"h3",callbackArgs:"<h3>"},{text:"h4",callbackArgs:"<h4>"},{text:"h5",callbackArgs:"<h5>"},{text:"pre",callbackArgs:"<pre>"},{text:"p",callbackArgs:"<p>"}];e.namespace("M.atto_title").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){var t=[];e.Array.each(r,function(e){t.push({text:M.util.get_string(e.text,n),callbackArgs:e.callbackArgs})}),this.addToolbarMenu({icon:"e/styleparagraph",globalItemConfig:{callback:this._changeStyle},items:t})},_changeStyle:function(e,t){document.execCommand("formatBlock",!1,t),this.markUpdated()}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});

lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js

@@ -67,7 +67,7 @@ Y.namespace('M.atto_title').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             });
         });
         this.addToolbarMenu({
-            icon: 'e/styleprops',
+            icon: 'e/styleparagraph',
             globalItemConfig: {
                 callback: this._changeStyle
             },

lib/editor/atto/plugins/title/yui/src/button/js/button.js

@@ -65,7 +65,7 @@ Y.namespace('M.atto_title').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             });
         });
         this.addToolbarMenu({
-            icon: 'e/styleprops',
+            icon: 'e/styleparagraph',
             globalItemConfig: {
                 callback: this._changeStyle
             },

pix/e/styleparagraph.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 448 512"><path d="M432 416h-26.7L275.5 42.7c-2.2-6.4-8.3-10.7-15.1-10.7h-72.8c-6.8 0-12.9 4.3-15.1 10.7L42.7 416H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h136c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16h-24l26.6-80.8h138.2l26.6 80.8H296c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h136c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zM174.4 268.3l42-124.1c4.3-15.2 6.6-28.2 7.6-34.6.8 6.5 2.9 19.5 7.7 34.7l41.3 124z" fill="#999"/></svg>