Minor changes to icons following the move to Font awesome 6. Includin…

…g using a FA icon for the import pages button as the old image looked more out of place alongside the newer icons
thexerteproject · Aug 16, 2024 · aa077ab · aa077ab
1 parent ebcf608
commit aa077ab
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/editor/importpages/import-choose.php b/editor/importpages/import-choose.php
@@ -158,7 +158,7 @@
 
                 </div>
                 <div id="merge_button_container">
-                    <button id="merge" class="xerte_button_dark"><img id="merge_button_icon" class=xerte_icon" src="editor/img/mergeIcon.svg"><?php echo MERGE;?></button>
+                    <button id="merge" class="xerte_button_dark"><i class="fa fa-file-import xerte-icon"></i><?php echo MERGE;?></button>
                 </div>
         </div>
     </div>

diff --git a/editor/js/toolbox.js b/editor/js/toolbox.js
@@ -2729,8 +2729,8 @@ var EDITOR = (function ($, parent) {
             '<button id="poly_'+ id + '" class="hseditModeButton" title="' + language.editHotspot.Buttons.Polygon + '"><i class="fas fa-2x fa-draw-polygon"></i></button>' +
             '<button id="icon_' + id + '" class="hseditModeButton" title="' + language.editHotspot.Buttons.Icon + '"><i class="fas fa-2x fa-info-circle"></i></button>' +
             '<button id="reset_'+ id + '" class="hseditModeButton firstoption" title="' + language.editHotspot.Buttons.Reset + '" disabled><i class="fas fa-2x fa-undo-alt"></i></button>' +
-            '<button id="' + id + '_cancel" name="cancel" class="hseditModeButton" title="' + language.Alert.cancellabel + '" style="float:right"><i class="fas fa-2x fa-window-close"></i></button>' +
-            '<button id="' + id + '_ok" name="ok" class="hseditModeButton" title="' + language.Alert.oklabel + '" style="float:right"><i class="fas fa-2x fa-check-square"></i></button>' +
+            '<button id="' + id + '_cancel" name="cancel" class="hseditModeButton" title="' + language.Alert.cancellabel + '" style="float:right"><i class="fas fa-2x fa-xmark"></i></button>' +
+            '<button id="' + id + '_ok" name="ok" class="hseditModeButton" title="' + language.Alert.oklabel + '" style="float:right"><i class="fas fa-2x fa-check"></i></button>' +
             '</div>');
 
         edit_img.append('<div class="overlayWrapper" id="overlayWrapper_' + id + '"><canvas id="hscanvas_' + id + '" class="overlayCanvas"></canvas></div>');

diff --git a/editor/js/tree.js b/editor/js/tree.js
@@ -154,7 +154,7 @@ var EDITOR = (function ($, parent) {
                         {
                             name: language.btnMerge.$label,
                             tooltip: language.btnMerge.$tooltip,
-                            imgicon: 'editor/img/mergeIcon.svg',
+                            icon: 'fa-file-import',
                             id: 'merge_button',
                             click: refresh_workspaceMerge
                         },

diff --git a/index.php b/index.php
@@ -365,7 +365,7 @@
 					<button title="<?php echo INDEX_BUTTON_EDIT; ?>" type="button" class="xerte_workspace_button disabled" disabled="disabled"
 							id="edit"><i class="fa fa-pencil-square-o xerte-icon"></i></button>
 					<button title="<?php echo INDEX_BUTTON_PROPERTIES; ?>" type="button" class="xerte_workspace_button disabled" disabled="disabled"
-							id="properties"><i class="fa fa-info-circle xerte-icon"></i></button>
+							id="properties"><i class="fa fa-info xerte-icon"></i></button>
 					<button title="<?php echo INDEX_BUTTON_PREVIEW; ?>" type="button" class="xerte_workspace_button disabled" disabled="disabled"
 							id="preview"><i class="fa fa-play xerte-icon"></i></button>
 				</div>

diff --git a/website_code/php/display_library.php b/website_code/php/display_library.php
@@ -1446,7 +1446,7 @@ function list_blank_templates() {
           ?>
           <button id="<?php echo $template['template_name'] ?>_button" type="button" class="xerte_button_c_no_width"
                   onclick="javascript:template_toggle('<?php echo $template['template_name'] ?>')">
-              <i class="fa fa-circle-plus xerte-icon"></i><?php echo DISPLAY_CREATE; ?><span class="sr-only"> <?php echo $template['display_name']; ?></span>
+              <i class="fa fa-plus xerte-icon"></i><?php echo DISPLAY_CREATE; ?><span class="sr-only"> <?php echo $template['display_name']; ?></span>
           </button>
           </div>
           <div id="<?php echo $template['template_name']; ?>" class="rename">

diff --git a/website_code/styles/xerte_buttons.css b/website_code/styles/xerte_buttons.css
@@ -159,4 +159,9 @@
     -ms-filter: grayscale(100%);
     -o-filter: grayscale(100%);
     filter: gray; /* IE6+ */
+}
+
+.file_mgt_area_buttons .xerte_workspace_button {
+    padding-top: 4px;
+    padding-bottom: 4px;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -158,7 +158,7 @@ @@
                     </div>
                     <div id="merge_button_container">
-                        <button id="merge" class="xerte_button_dark"><img id="merge_button_icon" class=xerte_icon" src="editor/img/mergeIcon.svg"><?php echo MERGE;?></button>
+                        <button id="merge" class="xerte_button_dark"><i class="fa fa-file-import xerte-icon"></i><?php echo MERGE;?></button>
                     </div>
             </div>
         </div>
@@ Expand Down @@