合并冲突

0182079d · Chao Sun · 0ba21937 · 0182079d · 0182079d · 0182079d
Commit 0182079d authored Jun 01, 2020 by Chao Sun
Showing with 17 additions and 59 deletions

src/assets/font/demo_index.html
+17 -43

src/assets/font/iconfont.css
+0 -0

src/assets/font/iconfont.js
+0 -0

src/assets/font/iconfont.json
+0 -10

src/assets/font/iconfont.svg
+0 -6

No files found.
--- a/src/assets/font/demo_index.html
+++ b/src/assets/font/demo_index.html
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8"/>
+  <meta charset="utf-8" />
  <title>IconFont Demo</title>
-  <link rel="shortcut icon" href="https://img.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico" type="image/x-icon"/>
+  <link rel="shortcut icon" href="https://img.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico"
+    type="image/x-icon" />
  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
  <link rel="stylesheet" href="demo.css">
  <link rel="stylesheet" href="iconfont.css">
@@ -13,6 +15,7 @@
  <!-- 代码高亮 -->
  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
 </head>
 <body>
  <div class="main">
    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">&#xe86b;</a></h1>
@@ -23,7 +26,8 @@
        <li class="dib"><span>Symbol</span></li>
      </ul>
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=356495" target="_blank" class="nav-more">查看项目</a>
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=356495" target="_blank"
+        class="nav-more">查看项目</a>
    </div>
    <div class="tab-container">
@@ -31,15 +35,6 @@
        <ul class="icon_lists dib-box">
          <li class="dib">
-<<<<<<< HEAD
-              <span class="icon iconfont">&#xe679;</span>
-                <div class="name">邮箱</div>
-                <div class="code-name">&amp;#xe679;</div>
-              </li>
-            <li class="dib">
-=======
->>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
            <span class="icon iconfont">&#xe678;</span>
            <div class="name">上引号</div>
            <div class="code-name">&amp;#xe678;</div>
@@ -1027,7 +1022,7 @@
          </blockquote>
          <p>Unicode 使用步骤如下：</p>
          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
-<pre><code class="language-css"
+          <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
  src: url('iconfont.eot');
@@ -1039,7 +1034,7 @@
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
-<pre><code class="language-css"
+          <pre><code class="language-css"
 >.iconfont {
  font-family: "iconfont" !important;
  font-size: 16px;
@@ -1049,7 +1044,7 @@
 }
 </code></pre>
          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
-<pre>
+          <pre>
 <code class="language-html"
 >&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
 </code></pre>
@@ -1062,18 +1057,6 @@
        <ul class="icon_lists dib-box">
          <li class="dib">
-<<<<<<< HEAD
-            <span class="icon iconfont icon-youxiang"></span>
-            <div class="name">
-              邮箱
-            </div>
-            <div class="code-name">.icon-youxiang
-            </div>
-          </li>
-          <li class="dib">
-=======
->>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
            <span class="icon iconfont icon-shangyinhao"></span>
            <div class="name">
              上引号
@@ -2546,10 +2529,10 @@
          </ul>
          <p>使用步骤如下：</p>
          <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
-<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+          <pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
 </code></pre>
          <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+          <pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
 </code></pre>
          <blockquote>
            <p>"
@@ -2562,17 +2545,6 @@
          <li class="dib">
            <svg class="icon svg-icon" aria-hidden="true">
-<<<<<<< HEAD
-                  <use xlink:href="#icon-youxiang"></use>
-                </svg>
-                <div class="name">邮箱</div>
-                <div class="code-name">#icon-youxiang</div>
-            </li>
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-=======
->>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
              <use xlink:href="#icon-shangyinhao"></use>
            </svg>
            <div class="name">上引号</div>
@@ -3882,10 +3854,10 @@
          </ul>
          <p>使用步骤如下：</p>
          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
-<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+          <pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
 </code></pre>
          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
-<pre><code class="language-html">&lt;style&gt;
+          <pre><code class="language-html">&lt;style&gt;
 .icon {
  width: 1em;
  height: 1em;
@@ -3896,7 +3868,7 @@
 &lt;/style&gt;
 </code></pre>
          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+          <pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
 &lt;/svg&gt;
 </code></pre>
@@ -3925,4 +3897,5 @@
    })
  </script>
 </body>
 </html>
\ No newline at end of file
--- a/src/assets/font/iconfont.css
+++ b/src/assets/font/iconfont.css
--- a/src/assets/font/iconfont.js
+++ b/src/assets/font/iconfont.js
--- a/src/assets/font/iconfont.json
+++ b/src/assets/font/iconfont.json
@@ -6,16 +6,6 @@
  "description": "",
  "glyphs": [
    {
-<<<<<<< HEAD
-      "icon_id": "9592761",
-      "name": "邮箱",
-      "font_class": "youxiang",
-      "unicode": "e679",
-      "unicode_decimal": 59001
-    },
-    {
-=======
->>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
      "icon_id": "816614",
      "name": "上引号",
      "font_class": "shangyinhao",

--- a/src/assets/font/iconfont.svg
+++ b/src/assets/font/iconfont.svg
@@ -20,12 +20,6 @@ Created by iconfont
  />
    <missing-glyph />
-<<<<<<< HEAD
-    <glyph glyph-name="youxiang" unicode="&#59001;" d="M983.899806 110.614218V671.113777h0.180631l-0.180631 4.696419c-0.180632 5.238314-0.722526 10.476627-1.806315 15.714941-2.890104 25.469042-21.675781 44.977245-45.519139 47.686717H122.287529c-11.741048 0-23.482096-1.625684-34.861881-5.238314-30.346093-10.295996-50.757453-40.100194-50.576821-74.058917v-534.849885c-0.361263-21.314518 5.780208-42.087141 17.701887-59.789028l0.361263-0.722526 5.418946-3.973893c18.243782-21.856412 44.977245-34.319986 73.517022-34.500618H904.421944c37.751984 0 70.265655 27.094726 79.477862 66.291763l0.180631 0.541894c0.361263 5.96084 0.361263 11.741048-0.180631 17.701888zM390.16405 348.505909l55.453872-49.854295 43.893456-40.100194c5.418945-5.96084 13.005468-9.57347 21.133886-9.57347 7.947786 0 15.534309 3.431999 21.133886 9.57347l101.153642 91.941436 272.753572-263.721997H126.622685L390.16405 348.505909z m120.119951-30.346092L111.449638 679.96472H115.604163c214.409596 0.903158 703.559711 2.890104 793.875463 0.361263l-399.195625-362.166166z m165.458458 69.72376l251.619686 227.956959v-474.518963L675.742459 387.883577z m-328.568707-0.180631L93.205856 135.721997V617.104957l253.967896-229.402011z"  horiz-adv-x="1024" />
-=======
->>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
    <glyph glyph-name="shangyinhao" unicode="&#59000;" d="M505.6 691.2c0-12.8-12.8-25.6-44.8-44.8C307.2 531.2 236.8 441.6 236.8 371.2c0-38.4 25.6-70.4 70.4-83.2 70.4-25.6 96-70.4 96-115.2 0-38.4-19.2-134.4-134.4-134.4-89.6 0-204.8 64-204.8 217.6C64 409.6 211.2 576 416 723.2 428.8 736 441.6 736 448 736c12.8 0 25.6-6.4 38.4-19.2C499.2 704 505.6 697.6 505.6 691.2zM960 691.2c0-12.8-12.8-25.6-44.8-44.8-153.6-108.8-224-204.8-224-275.2 0-38.4 25.6-70.4 70.4-83.2 70.4-25.6 96-70.4 96-115.2 0-38.4-19.2-134.4-134.4-134.4-89.6 0-204.8 64-204.8 217.6 0 160 147.2 326.4 352 473.6 12.8 12.8 25.6 12.8 38.4 12.8C928 736 960 704 960 691.2z"  horiz-adv-x="1024" />