Improvement: Change list item icons to FontAwesome.

moodle-an-hochschulen · Apr 9, 2019 · ad8c184 · ad8c184
1 parent dff4f03
commit ad8c184
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 18 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2019-04-09 - Improvement: Change list item icons to FontAwesome.
 * 2019-04-09 - Improvement: Add preview to dropdown menu.
 * 2019-04-09 - Check compatibility for Moodle 3.6, no functionality change.
 

diff --git a/pix/block.png b/pix/block.png
diff --git a/pix/inline.png b/pix/inline.png
diff --git a/styles.css b/styles.css
@@ -14,15 +14,8 @@
     display: inline-block;
     height: 15px;
     margin-right: 10px;
-    vertical-align: sub;
     width: 15px;
 }
-.editor_atto_menu .atto_styles_button .dropdown-menu > li > a i.inlineelement:before {
-    content: url([[pix:atto_styles|inline]]);
-}
-.editor_atto_menu .atto_styles_button .dropdown-menu > li > a i.blockelement:before {
-    content: url([[pix:atto_styles|block]]);
-}
 
 /* Override Atto core paddings for menu items to prevent the disabled inline menu items from showing a hand cursor */
 /* Additionally remove text underline from menu items in this widget because Boost adds underlines to menu items by default

diff --git a/version.php b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'atto_styles';
-$plugin->version = 2019040900;
+$plugin->version = 2019040901;
 $plugin->release = 'v3.5-r2';
 $plugin->requires = 2018120300;
 $plugin->maturity = MATURITY_STABLE;
diff --git a/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-debug.js b/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-debug.js
@@ -51,13 +51,13 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
             span = '<span>';
             spanpreview = '<span class="title">';
             if (style.type === 'nostyle') {
-                icon = '<i class="nostyleelement"></i>';
+                icon = '<i class="fa fa-fw fa-times"></i>';
                 span = '<span class="nostyle">';
             } else if (style.type === 'block') {
-                icon = '<i class="blockelement"></i>';
+                icon = '<i class="fa fa-fw fa-tint"></i>';
                 span = '<span class="blockstyle">';
             } else if (style.type == 'inline') {
-                icon = '<i class="inlineelement"></i>';
+                icon = '<i class="fa fa-fw fa-i-cursor"></i>';
                 span = '<span class="inlinestyle">';
             }
             if (style.preview === true) {

diff --git a/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-min.js b/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-min.js
diff --git a/yui/build/moodle-atto_styles-button/moodle-atto_styles-button.js b/yui/build/moodle-atto_styles-button/moodle-atto_styles-button.js
@@ -51,13 +51,13 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
             span = '<span>';
             spanpreview = '<span class="title">';
             if (style.type === 'nostyle') {
-                icon = '<i class="nostyleelement"></i>';
+                icon = '<i class="fa fa-fw fa-times"></i>';
                 span = '<span class="nostyle">';
             } else if (style.type === 'block') {
-                icon = '<i class="blockelement"></i>';
+                icon = '<i class="fa fa-fw fa-tint"></i>';
                 span = '<span class="blockstyle">';
             } else if (style.type == 'inline') {
-                icon = '<i class="inlineelement"></i>';
+                icon = '<i class="fa fa-fw fa-i-cursor"></i>';
                 span = '<span class="inlinestyle">';
             }
             if (style.preview === true) {

diff --git a/yui/src/button/js/button.js b/yui/src/button/js/button.js
@@ -49,13 +49,13 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
             span = '<span>';
             spanpreview = '<span class="title">';
             if (style.type === 'nostyle') {
-                icon = '<i class="nostyleelement"></i>';
+                icon = '<i class="fa fa-fw fa-times"></i>';
                 span = '<span class="nostyle">';
             } else if (style.type === 'block') {
-                icon = '<i class="blockelement"></i>';
+                icon = '<i class="fa fa-fw fa-tint"></i>';
                 span = '<span class="blockstyle">';
             } else if (style.type == 'inline') {
-                icon = '<i class="inlineelement"></i>';
+                icon = '<i class="fa fa-fw fa-i-cursor"></i>';
                 span = '<span class="inlinestyle">';
             }
             if (style.preview === true) {