Merge branch 'main' of https://github.com/yaoqs/Issues-LordYao

yaoqs · Jun 26, 2024 · c83fb00 · c83fb00
2 parents d4f6fbf + b6cbc4f
commit c83fb00
Showing 1 changed file with 0 additions and 34 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -8,11 +8,7 @@
     <meta name="MobileOptimized" content="320" />
     <meta name="description" content="A scholar magazine/journal like blog，FUTURE & CIVILIZATION，Natural/Social Philosophy & Infomation Sciences">
     <meta name="keywords" content="LordYao,scholar,要庆生,yaoqs,FUTURE & CIVILIZATION，Natural/Social Philosophy & Infomation Sciences">
-<<<<<<< HEAD
     <link rel="shortcut icon" href="/favicon-fish.ico" />
-=======
-    <link rel="shortcut icon" href="favicon-fish.ico" />
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
     <link rel="alternate" type="application/rss+xml" title="LordYao" href="[object Object]">
     <link href="//cdn.staticfile.org/Primer/21.0.7/primer.css" rel="stylesheet" />
     <link href="//cdn.staticfile.org/bootstrap/5.1.3/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
@@ -28,15 +24,12 @@
     <script src="//d3js.org/d3.v7.min.js"></script>
 </head>
 <style>
-<<<<<<< HEAD
     /*General css rule*/
     * {
         padding: 0;
         margin: 0;
     }
 
-=======
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
     body {
         box-sizing: border-box;
         min-width: 200px;
@@ -50,10 +43,6 @@
 
     header {
         padding-bottom: 8px;
-<<<<<<< HEAD
-=======
-        border-bottom: 1px solid var(--borderColor-muted, var(--color-border-muted));
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
         margin-bottom: 16px;
     }
 
@@ -63,7 +52,6 @@
         font-size: small;
     }
 
-<<<<<<< HEAD
     a {
         text-decoration: none;
         color: rgb(0, 0, 0);
@@ -121,9 +109,6 @@
         }
     }
 
-=======
-    /**********************************/
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
     #avatar img {
         margin-top: 4em;
         margin-bottom: -1.73em;
@@ -134,7 +119,6 @@
         -webkit-border-radius: 4.5em;
         border: none;
     }
-<<<<<<< HEAD
 
     /*能旋转的rss图标*/
     #rss {
@@ -144,8 +128,6 @@
     #rss:hover {
         transform: rotate(360deg);
     }
-=======
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
 </style>
 
 <body>
@@ -183,22 +165,13 @@ <h1><img id="author" href="https://github.com/yaoqs"> LordYao </img></h1>
 
 
             <div id="weibo"></div>
-<<<<<<< HEAD
             <script src="https://tjs.sjs.sinajs.cn/open/api/js/wb.js" type="text/javascript" crossorigin="anonymous" async></script>
             <iframe src="https://widget.weibo.com/relationship/followbutton.php?btn=red&amp;style=2&amp;uid=1262655355&amp;width=86&amp;height=24&amp;language=zh_cn" scrolling="no" marginheight="0" width="86" height="24" frameborder="0"></iframe><wb:follow-button uid="1262655355" type="red_2" width="86" height="24"></wb:follow-button>
-=======
-            <script src="https://tjs.sjs.sinajs.cn/open/api/js/wb.js" type="text/javascript"></script>
-            <iframe src="https://widget.weibo.com/relationship/followbutton.php?btn=red&amp;style=2&amp;uid=1262655355&amp;width=86&amp;height=24&amp;language=zh_cn" scrolling="no" marginheight="0" width="86" height="24" frameborder="0"></iframe>
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
 
 
             <a id="rss" href="/atom.xml" title="RSS"><i class="fa fa-rss fa-1x"></i></a>
 
-<<<<<<< HEAD
             <div style=" text-align: right;width: 100%;">
-=======
-            <div  style=" text-align: right;width: 100%;">
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
 
                 <span id="slogan">
                     <ul>
@@ -257,11 +230,7 @@ <h1><img id="author" href="https://github.com/yaoqs"> LordYao </img></h1>
             </div>
         </div>
         <hr>
-<<<<<<< HEAD
         <div style="display: inline;">
-=======
-        <div style="display: inline-flex;">
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
             <img src="https://img.shields.io/badge/Author-Yao_Qingsheng-ffffff?style=flat-square&logo=china&logoColor=black"></img><img src="https://img.shields.io/badge/Address-Department_of_Natural_Philosophy_&_Infomation_Sciences,CHINA-blue?style=flat-square&logo=china&logoColor=black"></img>
         </div>
         <div id="follow-icons" style="display: inline;">
@@ -302,10 +271,7 @@ <h1><img id="author" href="https://github.com/yaoqs"> LordYao </img></h1>
             <a href="https://widget.weibo.com/relationship/followbutton.php?btn=red&amp;style=2&amp;uid=1262655355&amp;width=86&amp;height=24&amp;language=zh_cn" title="加关注"><img src=""
                     class=""><img></a>
             <img src="https://img.shields.io/badge/-C++-black?style=flat-square&logo=c"><img><img src="https://img.shields.io/badge/Matlab-black?style=flat-square&logo=mathworksmatlab"><img><img src="https://img.shields.io/badge/Html+css+js-black?style=flat-square&logo=Html5"><img><img src="https://img.shields.io/badge/d3.js-black?style=flat-square&logo=d3.js"><img><img src="https://img.shields.io/badge/node.js-black?style=flat-square&logo=node.js"><img><img src="https://img.shields.io/badge/Echarts.js-black?style=flat-square&logo=Apacheecharts"><img></div>
-<<<<<<< HEAD
         <hr>
-=======
->>>>>>> c27c8a108c19bbeba4454ec60b94cf5881395970
     </header>