Browse Source

chore: upd icon close

richard1015 3 years ago
parent
commit
9a24d20faf

+ 26 - 26
src/packages/styles/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon nutui-iconfont">&#xe6cd;</span>
+                <div class="name">close_fill</div>
+                <div class="code-name">&amp;#xe6cd;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon nutui-iconfont">&#xe6c9;</span>
                 <div class="name">常用_返回</div>
                 <div class="code-name">&amp;#xe6c9;</div>
@@ -433,12 +439,6 @@
               </li>
           
             <li class="dib">
-              <span class="icon nutui-iconfont">&#xe69a;</span>
-                <div class="name">mask-close</div>
-                <div class="code-name">&amp;#xe69a;</div>
-              </li>
-          
-            <li class="dib">
               <span class="icon nutui-iconfont">&#xe699;</span>
                 <div class="name">circle-close</div>
                 <div class="code-name">&amp;#xe699;</div>
@@ -822,9 +822,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'nutui-iconfont';
-  src: url('iconfont.woff2?t=1667903871674') format('woff2'),
-       url('iconfont.woff?t=1667903871674') format('woff'),
-       url('iconfont.ttf?t=1667903871674') format('truetype');
+  src: url('iconfont.woff2?t=1668762221765') format('woff2'),
+       url('iconfont.woff?t=1668762221765') format('woff'),
+       url('iconfont.ttf?t=1668762221765') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -851,6 +851,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon nutui-iconfont nut-icon-mask-close"></span>
+            <div class="name">
+              close_fill
+            </div>
+            <div class="code-name">.nut-icon-mask-close
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon nutui-iconfont nut-icon-rect-left"></span>
             <div class="name">
               常用_返回
@@ -1418,15 +1427,6 @@
           </li>
           
           <li class="dib">
-            <span class="icon nutui-iconfont nut-icon-mask-close"></span>
-            <div class="name">
-              mask-close
-            </div>
-            <div class="code-name">.nut-icon-mask-close
-            </div>
-          </li>
-          
-          <li class="dib">
             <span class="icon nutui-iconfont nut-icon-circle-close"></span>
             <div class="name">
               circle-close
@@ -2004,6 +2004,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#nut-icon-mask-close"></use>
+                </svg>
+                <div class="name">close_fill</div>
+                <div class="code-name">#nut-icon-mask-close</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#nut-icon-rect-left"></use>
                 </svg>
                 <div class="name">常用_返回</div>
@@ -2508,14 +2516,6 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#nut-icon-mask-close"></use>
-                </svg>
-                <div class="name">mask-close</div>
-                <div class="code-name">#nut-icon-mask-close</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#nut-icon-circle-close"></use>
                 </svg>
                 <div class="name">circle-close</div>

+ 7 - 7
src/packages/styles/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nutui-iconfont"; /* Project id 2166874 */
-  src: url('iconfont.woff2?t=1667903871674') format('woff2'),
-       url('iconfont.woff?t=1667903871674') format('woff'),
-       url('iconfont.ttf?t=1667903871674') format('truetype');
+  src: url('iconfont.woff2?t=1668762221765') format('woff2'),
+       url('iconfont.woff?t=1668762221765') format('woff'),
+       url('iconfont.ttf?t=1668762221765') format('truetype');
 }
 
 .nutui-iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nut-icon-mask-close:before {
+  content: "\e6cd";
+}
+
 .nut-icon-rect-left:before {
   content: "\e6c9";
 }
@@ -265,10 +269,6 @@
   content: "\e69b";
 }
 
-.nut-icon-mask-close:before {
-  content: "\e69a";
-}
-
 .nut-icon-circle-close:before {
   content: "\e699";
 }

File diff suppressed because it is too large
+ 1 - 1
src/packages/styles/font/iconfont.js


+ 7 - 7
src/packages/styles/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "nutui 3.0字体管理",
   "glyphs": [
     {
+      "icon_id": "257405",
+      "name": "close_fill",
+      "font_class": "mask-close",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
       "icon_id": "24330526",
       "name": "常用_返回",
       "font_class": "rect-left",
@@ -447,13 +454,6 @@
       "unicode_decimal": 59035
     },
     {
-      "icon_id": "18193248",
-      "name": "mask-close",
-      "font_class": "mask-close",
-      "unicode": "e69a",
-      "unicode_decimal": 59034
-    },
-    {
       "icon_id": "18193089",
       "name": "circle-close",
       "font_class": "circle-close",

BIN
src/packages/styles/font/iconfont.ttf


BIN
src/packages/styles/font/iconfont.woff


BIN
src/packages/styles/font/iconfont.woff2