浏览代码

Add 'cancel' icon to campaigns UI

Kailash Nadh 5 年之前
父节点
当前提交
d9197668c6

+ 14 - 14
frontend/fontello/config.json

@@ -482,6 +482,20 @@
         "arrow-down"
       ]
     },
+    {
+      "uid": "2ffb565ecad215e58aeec2e2d52a9d3e",
+      "css": "cancel",
+      "code": 59426,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M500 84Q582 84 659.2 115.2T794.9 205.1 884.8 340.8 916 500 884.8 659.2 794.9 794.9 659.2 884.8 500 916 340.8 884.8 205.1 794.9 115.2 659.2 84 500 115.2 340.8 205.1 205.1 340.8 115.2 500 84ZM500 166Q410.2 166 333 210.9T210.9 333 166 500Q166 613.3 236.3 705.1L705.1 236.3Q613.3 166 500 166ZM500 834Q589.8 834 667 789.1T789.1 667 834 500Q834 386.7 763.7 294.9L294.9 763.7Q386.7 834 500 834Z",
+        "width": 1000
+      },
+      "search": [
+        "cancel"
+      ]
+    },
     {
       "uid": "f4ad3f6d071a0bfb3a8452b514ed0892",
       "css": "vector-square",
@@ -26200,20 +26214,6 @@
         "arrow-up-bold-box-outline"
       ]
     },
-    {
-      "uid": "2ffb565ecad215e58aeec2e2d52a9d3e",
-      "css": "cancel",
-      "code": 984890,
-      "src": "custom_icons",
-      "selected": false,
-      "svg": {
-        "path": "M500 84Q582 84 659.2 115.2T794.9 205.1 884.8 340.8 916 500 884.8 659.2 794.9 794.9 659.2 884.8 500 916 340.8 884.8 205.1 794.9 115.2 659.2 84 500 115.2 340.8 205.1 205.1 340.8 115.2 500 84ZM500 166Q410.2 166 333 210.9T210.9 333 166 500Q166 613.3 236.3 705.1L705.1 236.3Q613.3 166 500 166ZM500 834Q589.8 834 667 789.1T789.1 667 834 500Q834 386.7 763.7 294.9L294.9 763.7Q386.7 834 500 834Z",
-        "width": 1000
-      },
-      "search": [
-        "cancel"
-      ]
-    },
     {
       "uid": "150f3fab4099cb4f3d367a3941798c3d",
       "css": "file-account",

+ 1 - 0
frontend/src/assets/icons/fontello.css

@@ -74,3 +74,4 @@
 .mdi-minus:before { content: '\e81f'; } /* '' */
 .mdi-arrow-up:before { content: '\e820'; } /* '' */
 .mdi-arrow-down:before { content: '\e821'; } /* '' */
+.mdi-cancel:before { content: '\e822'; } /* '' */

二进制
frontend/src/assets/icons/fontello.woff2


+ 1 - 1
frontend/src/views/Campaign.vue

@@ -84,7 +84,7 @@
                   <div class="column">
                     <br />
                     <b-field v-if="form.sendLater"
-                      :message="$utils.duration(Date(), form.sendAtDate)">
+                      :message="form.sendAtDate ? $utils.duration(Date(), form.sendAtDate) : ''">
                       <b-datetimepicker
                         v-model="form.sendAtDate"
                         :disabled="!canEdit"

+ 1 - 1
frontend/src/views/Campaigns.vue

@@ -163,7 +163,7 @@
                   @click.prevent="$utils.confirm(null,
                     () => changeCampaignStatus(props.row, 'cancelled'))">
                   <b-tooltip label="Cancel" type="is-dark">
-                    <b-icon icon="trash-can-outline" size="is-small" />
+                    <b-icon icon="cancel" size="is-small" />
                   </b-tooltip>
                 </a>
                 <a href="" v-if="canDelete(props.row)"