From c33e7f3c4a68145e36de9decd473e0dfe748c385 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 22:33:32 +0800
Subject: [PATCH] no message

Former-commit-id: 60505912651ddacc577a71a241cca629061a71f6
Former-commit-id: cdf8bdb5787d66c32b2e1d769c97b83b80fd8ced
Former-commit-id: 1671b0c2f378c6cb4fe9588b477677a5c4abb1d8
---
 src/assets/style/theme/d2/setting.scss   | 2 +-
 src/assets/style/theme/star/setting.scss | 4 ++--
 src/router/index.js                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index 0d0a2b3c..2c1c25d7 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -5,7 +5,7 @@ $theme-bg-color: $color-bg;
 // 主题背景图片
 // $theme-bg-image: '/static/image/bg/xxx.jpg';
 // container组件的边框
-$theme-container-border-inner: 1px solid $color-border-1;
+$theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index a2a1f59e..a9a6cee6 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -5,8 +5,8 @@ $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/star.jpg';
 // container组件的边框
-$theme-container-border-inner: 1px solid #d8dfea;
-$theme-container-border-outer: 1px solid #d8dfea;
+$theme-container-border-inner: 1px solid $color-border-2;
+$theme-container-border-outer: none;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/router/index.js b/src/router/index.js
index 8b7f2599..b7909d79 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,7 +28,7 @@ const routes = [
     children: (pre => [
       { path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue') },
       { path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue') },
-      { path: 'container/normal', name: `${pre}container-card`, component: () => import('@/pages/demo/components/container/card.vue') },
+      { path: 'container/card', name: `${pre}container-card`, component: () => import('@/pages/demo/components/container/card.vue') },
       { path: 'countup', name: `${pre}countup`, component: () => import('@/pages/demo/components/countup/index.vue') },
       { path: 'editor-quill', name: `${pre}editor-quill`, component: () => import('@/pages/demo/components/editor-quill/index.vue') },
       { path: 'editor-simpleMDE', name: `${pre}editor-simpleMDE`, component: () => import('@/pages/demo/components/editor-simpleMDE/index.vue') },