lifeifan 7 years ago
parent
commit
dad7c42223
2 changed files with 6 additions and 2 deletions
  1. 4 0
      sites/demo/index.html
  2. 2 2
      src/packages/skeleton/skeleton.scss

+ 4 - 0
sites/demo/index.html

@@ -26,7 +26,11 @@
 
     //分享配置
     var shareOption = {
+<<<<<<< HEAD
       iconUrl: 'http://nutui.jd.com/img/logo_share.png',
+=======
+      iconUrl: 'http://nutui.jd.com/img/logo.png',
+>>>>>>> 55dce3e80e4da8064bd69c50b4d619f7478b3e6d
       url: 'http://nutui.jd.com/demo.html#/index',
       title: '移动端Vue组件库 NutUI 2.0',
       desc: '一套京东风格的轻量级移动端Vue组件库'

+ 2 - 2
src/packages/skeleton/skeleton.scss

@@ -26,7 +26,7 @@
         -webkit-animation: backpos 0.9s ease-in-out 0s infinite;
         animation: backpos 0.9s ease-in-out 0s infinite;
     }
-    .skeleton-bac-content {
+    .skeleton-bac-content{
         overflow: hidden;
     }
 }
@@ -44,7 +44,7 @@
 }
 
 .vue-skeleton-square-wrap {
-    justify-content: center; // align-items:center;
+    justify-content: center;
     display: flex;
     flex-direction: column;
     .vue-skeleton-square {