Frans 7 年 前
コミット
60ce07db2d
6 ファイル変更45 行追加33 行削除
  1. 2 2
      sites/demo/index.html
  2. 1 1
      sites/demo/view/index.vue
  3. 14 10
      sites/doc/app.vue
  4. 1 1
      sites/doc/index.html
  5. 11 3
      sites/doc/index.vue
  6. 16 16
      src/config.json

+ 2 - 2
sites/demo/index.html

@@ -29,8 +29,8 @@
     var shareOption = {
     var shareOption = {
       iconUrl: 'http://nutui.jd.com/img/logo_share.png',
       iconUrl: 'http://nutui.jd.com/img/logo_share.png',
       url: 'http://nutui.jd.com/demo.html#/index',
       url: 'http://nutui.jd.com/demo.html#/index',
-      title: '移动端Vue组件库 NutUI 2.0',
-      desc: '一套京东风格的轻量级移动端Vue组件库'
+      title: '轻量级移动端Vue组件库 - NutUI 2.0',
+      desc: '京东风格的Vue组件库'
     };
     };
 
 
     try {
     try {

+ 1 - 1
sites/demo/view/index.vue

@@ -2,7 +2,7 @@
   <div class="demo-list-wrapper">
   <div class="demo-list-wrapper">
     <h1 class="logo"></h1>
     <h1 class="logo"></h1>
     <div class="version">NutUI 2.0</div>
     <div class="version">NutUI 2.0</div>
-    <p>NutUI 是一套轻量级移动端Vue组件库。</p>
+    <p>NutUI 是一套京东风格的移动端Vue组件库</p>
     <div
     <div
       :class="['demo-list-box',{'unfold':foldStatus[item]}]"
       :class="['demo-list-box',{'unfold':foldStatus[item]}]"
       v-for="item in sorts"
       v-for="item in sorts"

+ 14 - 10
sites/doc/app.vue

@@ -362,12 +362,12 @@ export default {
   .showPhone {
   .showPhone {
     padding-right: 25px;
     padding-right: 25px;
     //margin-left: 20px;
     //margin-left: 20px;
-    width: 375px;
+    width: 360px;
     flex-shrink: 0;
     flex-shrink: 0;
     position: relative;
     position: relative;
     .ph {
     .ph {
-      height: 631px;
-      width: 375px;
+      height: 611px;
+      width: 360px;
       position: fixed;
       position: fixed;
       border-radius: 55px;
       border-radius: 55px;
       top: 100px;
       top: 100px;
@@ -377,14 +377,14 @@ export default {
       box-shadow: 0px 0px 9px 5px #eee;
       box-shadow: 0px 0px 9px 5px #eee;
       iframe {
       iframe {
         border: none;
         border: none;
-        width: 375px;
-        height: 562px;
+        width: 360px;
+        height: 542px;
         padding: 0;
         padding: 0;
         box-sizing: border-box;
         box-sizing: border-box;
       }
       }
     }
     }
     .bg {
     .bg {
-      width: 375px;
+      width: 360px;
       height: 64px;
       height: 64px;
       padding-top: 5px;
       padding-top: 5px;
       background: linear-gradient(rgba(55, 55, 55, 0.98), #545456);
       background: linear-gradient(rgba(55, 55, 55, 0.98), #545456);
@@ -493,14 +493,18 @@ body {
     }
     }
   }
   }
 }
 }
-@media screen and (max-width: 1300px) {
+@media screen and (max-width: 1500px) {
   .demo-wrapper {
   .demo-wrapper {
     .showPhone{
     .showPhone{
-      width:360px;
+      width:320px;
       .ph{
       .ph{
-        width:360px;
+        width:320px;
+        height: 581px;
         &>div,iframe{
         &>div,iframe{
-          width:360px;
+          width:320px;
+        }
+        iframe{
+          height:512px;
         }
         }
       }
       }
     }
     }

+ 1 - 1
sites/doc/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta charset="utf-8" />
   <meta content="telephone=no" name="format-detection" />
   <meta content="telephone=no" name="format-detection" />
   <link rel="shortcut icon" href="/favicon.ico">
   <link rel="shortcut icon" href="/favicon.ico">
-  <title>NutUI 2.0 - 一款轻量级移动端Vue组件库</title>
+  <title>NutUI 2.0 - 移动端Vue组件库</title>
   <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>
   <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>
 </head>
 </head>
 
 

+ 11 - 3
sites/doc/index.vue

@@ -676,9 +676,9 @@ export default {
     }
     }
     .btn,
     .btn,
     .blue-btn {
     .blue-btn {
-      border: 1px solid #5396ff;
+      border: 1px solid rgba(83,150,255,1);
       background: #fff;
       background: #fff;
-      color: #5396ff;
+      color: rgba(83,150,255,1);
       width: 130px;
       width: 130px;
       height: 40px;
       height: 40px;
       line-height: 40px;
       line-height: 40px;
@@ -688,11 +688,19 @@ export default {
       text-decoration: none;
       text-decoration: none;
       border-radius: 20px;
       border-radius: 20px;
       animation: fadeInLeft 1s both 1.2s;
       animation: fadeInLeft 1s both 1.2s;
+      &:hover,&:active{
+        border-color:rgba(83,150,255,.8);
+        color: rgba(83,150,255,.8);
+      }
     }
     }
     .blue-btn {
     .blue-btn {
       color: #fff;
       color: #fff;
-      background: #5396ff;
+      background: rgba(83,150,255,1);
       margin-right: 40px;
       margin-right: 40px;
+      &:hover,&:active{
+        background: rgba(83,150,255,.8);
+        color: rgba(255,255,255,.8);
+      }
     }
     }
   }
   }
   .qrcode {
   .qrcode {

+ 16 - 16
src/config.json

@@ -81,16 +81,6 @@
     },
     },
     {
     {
       "version": "1.0.0",
       "version": "1.0.0",
-      "name": "Picker",
-      "sort": "1",
-      "chnName": "选择面板",
-      "desc": "选择面板",
-      "type": "component",
-      "showDemo": true,
-      "author": "iris"
-    },
-    {
-      "version": "1.0.0",
       "name": "TabBar",
       "name": "TabBar",
       "sort": "3",
       "sort": "3",
       "chnName": "标签栏",
       "chnName": "标签栏",
@@ -101,20 +91,20 @@
     },
     },
     {
     {
       "version": "1.0.0",
       "version": "1.0.0",
-      "name": "DatePicker",
+      "name": "Calendar",
       "sort": "1",
       "sort": "1",
-      "chnName": "日期选择",
-      "desc": "日期选择",
+      "chnName": "日",
+      "desc": "日",
       "type": "component",
       "type": "component",
       "showDemo": true,
       "showDemo": true,
       "author": "iris"
       "author": "iris"
     },
     },
     {
     {
       "version": "1.0.0",
       "version": "1.0.0",
-      "name": "Calendar",
+      "name": "DatePicker",
       "sort": "1",
       "sort": "1",
-      "chnName": "日",
-      "desc": "日",
+      "chnName": "日期选择",
+      "desc": "日期选择",
       "type": "component",
       "type": "component",
       "showDemo": true,
       "showDemo": true,
       "author": "iris"
       "author": "iris"
@@ -161,6 +151,16 @@
     },
     },
     {
     {
       "version": "1.0.0",
       "version": "1.0.0",
+      "name": "Picker",
+      "sort": "1",
+      "chnName": "选择面板",
+      "desc": "选择面板",
+      "type": "component",
+      "showDemo": true,
+      "author": "iris"
+    },
+    {
+      "version": "1.0.0",
       "name": "Progress",
       "name": "Progress",
       "sort": "2",
       "sort": "2",
       "chnName": "进度条",
       "chnName": "进度条",