Merge pull request #1 from abei2017/1.4

1.4
abei2017 · Dec 11, 2018 · 9daed12 · 9daed12
2 parents 90af351 + fd3c210
commit 9daed12
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -88,9 +88,5 @@ HouJS在界面上使用Semantic UI和JQuery作为基础，同时使用requireJS
 ## Demo（演示地址）
 [Hou-Admin](https://nai8.me/hou)
 
-## Examples（一些常用方案）
-- [使用HouJS集成百度ueditor编辑器](https://nai8.me/forum/detail.html?id=115)
-- [实现houjs中markdown编辑器（SimpleMDE）本地上传功能](https://nai8.me/forum/detail.html?id=122)
-
 ## License（开源协议）
 MIT
diff --git a/admin/hou.html b/admin/hou.html
@@ -19,7 +19,7 @@
     <div class="hou-layout hou-layout-admin">
         <div class="hou-header">
             <div class="hou-logo">
-                <img src="https://nai8.me/images/hou/logo.png" height="100%" alt="">
+                <img src="images/logo.png" alt="">
             </div>
             <div class="hou-nav">
                 <li>
@@ -31,16 +31,7 @@
             </div>
         </div>
         <div class="hou-side" id="hou-side">
-            <div class="hou-user">
-                <div class="hou-user-avatar"><img src="https://semantic-ui.com/images/avatar/large/veronika.jpg" alt=""></div>
-                <div class="hou-user-info">
-                    <a href="" class="nickname">
-                        阿北2017
-                        <i class="caret down icon"></i>
-                    </a>
-                    <a href="" class="logout">退出</a>
-                </div>
-            </div>
+
             <div class="hou-menus">
                 <div class="ui vertical secondary inverted accordion fluid menu">
                     <div class="item">
@@ -52,7 +43,6 @@
                             </a>
                         </div>
                     </div>
-
                     <div class="item">
                         <a class=" title"><i class="th icon"></i><i class="dropdown icon"></i>页面布局</a>
                         <div class=" content">
@@ -162,12 +152,6 @@
                 </div>
             </div>
         </div>
-        <div class="hou-page-nav">
-            <div class="title-box">
-                <h1>控制台</h1>
-            </div>
-
-        </div>
         <div class="hou-body" id="hou-body">
             <iframe id="IFrame" name="contentFrame" src="pages/bootstrap.html" frameborder="0" class="hou-iframe"></iframe>
         </div>

diff --git a/examples/index.html b/examples/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>houjs例子</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/houjs/css/hou.css b/houjs/css/hou.css
@@ -14,62 +14,99 @@ body {
     top: 0;
 }
 
-
-.hou-modals {}
+.hou-modals {
+}
 
 .hou-box {
-
 }
 
 .panel {
-    border-radius:1px;
-    background:#fff;
-    margin-bottom:20px;
-    box-shadow: 0 1px 1px rgba(0,0,0,.05);
+    border-radius: 1px;
+    background: #fff;
+    margin-bottom: 20px;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
 }
 
 .panel:last-child {
-    margin-bottom:0
+    margin-bottom: 0
+}
+
+.panel .panel-header {
+    padding: 20px 20px 0 20px;
 }
 
-.panel .panel-header {padding: 20px 20px 15px 20px;}
 .panel .panel-header .panel-title {
     display: block;
     font-size: 18px;
     color: #37474f;
 }
+
 .panel .panel-header .panel-tip {
-    color:#666666;
-    font-size:13px;
-    margin-top:8px;
-    line-height:1.4;
+    color: #666666;
+    font-size: 13px;
+    margin-top: 8px;
+    line-height: 1.4;
 }
+
 .panel .panel-header .panel-tip strong {
-    color:#000;
+    color: #000;
 }
+
 .panel .panel-content {
-    padding:0 20px 20px 20px;
+    padding:20px;
 }
+
 .panel .panel-content p {
     line-height: 1.5;
 }
 
 .panel .panel-alone-content {
-    padding:20px;
+    padding: 20px;
 }
 
 /* 对semantic样式的复写 */
-.ui.header {font-weight:400;color:#37474f}
-.ui.header .sub.header {margin-top:0.25rem;font-size:14px!important;}
-.ui.statistics>.statistic {margin:0 1.5em 0.5em} /*减小margin-bottom*/
-.ui.modal>.header {background-color:#222222;color:#EEEEEE;padding-top:1rem;padding-bottom:1rem;} /* 弹出层header样式 */
-.ui.modal>.actions {border-top:0;padding-top:0.75rem;padding-bottom:0.75rem;}
+.ui.header {
+    font-weight: 400;
+    color: #37474f
+}
+
+.ui.header .sub.header {
+    margin-top: 0.25rem;
+    font-size: 14px !important;
+}
+
+.ui.statistics > .statistic {
+    margin: 0 1.5em 0.5em
+}
+
+/*减小margin-bottom*/
+.ui.modal > .header {
+    background-color: #222222;
+    color: #EEEEEE;
+    padding-top: 1rem;
+    padding-bottom: 1rem;
+}
+
+/* 优化table */
+.table {}
+.table th {color:#4d4d4d;}
+.table th a {color:#4d4d4d;}
+.table td {color:#666;}
+
+.search-box {}
+
+/* 弹出层header样式 */
+.ui.modal > .actions {
+    border-top: 0;
+    padding-top: 0.75rem;
+    padding-bottom: 0.75rem;
+}
 
 /* 布局头部 */
 .hou-layout-admin .hou-header {
     height: 50px;
     position: relative;
-    border-bottom: 1px solid #f6f6f6;
+    border-bottom: 1px solid #EEE;
     box-sizing: border-box;
     background-color: #fff;
 }
@@ -82,8 +119,9 @@ body {
     width: 220px;
     color: rgba(255, 255, 255, .8);
     height: 49px;
+    background: #262d37;
     line-height: 50px;
-    text-align: center;
+    text-align: left;
     padding: 0 15px;
     box-sizing: border-box;
     overflow: hidden;
@@ -92,10 +130,14 @@ body {
     background-position: center center;
 }
 
+.hou-layout-admin .hou-header .hou-logo img {
+    height:31px;
+    margin:9px 10px;
+}
+
 .hou-layout-admin .hou-header .hou-nav {
     position: absolute;
     left: 220px;
-
 }
 
 .hou-layout-admin .hou-header .hou-nav li {
@@ -114,87 +156,54 @@ body {
     width: 220px;
     position: fixed;
     bottom: 0;
-    display:block;
+    display: block;
     left: 0;
     top: 0;
-    background-color: #222222;
+    background-color: #475262;
     z-index: 999;
     box-shadow: 1px 0 2px 0 rgba(0, 0, 0, .05);
 }
 
-
-/* 左侧菜单登录用户区域 */
-.hou-layout-admin .hou-side .hou-user {
-    margin-top: 65px;
-    text-align: center;
-    overflow-y: auto;
-}
-
-.hou-layout-admin .hou-side .hou-user .hou-user-avatar {
-    width: 50px;
-    margin: 0 auto;
-}
-
-.hou-layout-admin .hou-side .hou-user .hou-user-avatar img {
-    width: 50px;
-    height: 50px;
-    border-radius: 50px;
-}
-
-.hou-layout-admin .hou-side .hou-user .hou-user-info {
-    text-align: center
-}
-
-.hou-layout-admin .hou-side .hou-user .hou-user-info a {
-    font-size: 13px;
-    color: #CCC;
-}
-
-.hou-layout-admin .hou-side .hou-user .hou-user-info .nickname {
-    color:#00b3ee;
-}
-
 .hou-layout-admin .hou-side .hou-menus {
     border-top: #222 solid 1px;
     width: 220px;
-    margin-top:0;
+    margin-top:49px;
     background: 0 0;
     padding-top: 5px;
-    height:90%;
+    height: 90%;
     overflow: hidden;
 
 }
 
 .hou-layout-admin .hou-side .hou-menus .ui.secondary.menu {
-    margin-left:0;
-    margin-right:0
+    margin-left: 0;
+    margin-right: 0
 }
 
 .hou-layout-admin .hou-side .hou-menus .ui.secondary.menu .item {
     margin: 0;
 }
 
-
 /* 一级菜单标题颜色 */
 .hou-layout-admin .hou-side .hou-menus .item > .title {
     font-size: 14px;
-    font-weight:normal;
+    font-weight: normal;
     margin-bottom: 5px;
-    color:#CCCCCC!important;
+    color: #dbdddf !important;
 }
 
-.hou-layout-admin .hou-side .ui.secondary.menu .item .content .item{
-    font-size:14px;
-    border-left:#222 solid 2px!important;
+.hou-layout-admin .hou-side .ui.secondary.menu .item .content .item {
+    font-size: 13px;
+    border-left: #475262 solid 2px !important;
 }
 
 .hou-layout-admin .hou-side .ui.secondary.menu .item .content .item:hover {
-    border-left-color:#00b3ee!important;
+    border-left-color: #00b3ee !important;
 }
 
 .hou-layout-admin .hou-body {
     -webkit-transition: all .3s;
-    top: 90px;
+    top: 50px;
     bottom: 0;
     left: 220px;
     position: absolute;
@@ -206,29 +215,6 @@ body {
     box-sizing: border-box;
 }
 
-.hou-layout-admin .hou-page-nav {
-    height: 40px;
-    line-height: 40px;
-    padding: 0 80px 0 20px;
-    background-color: #fff;
-    box-sizing: border-box;
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .1);
-    position: fixed;
-    top: 50px;
-    right: 0;
-    z-index: 999;
-    left: 220px;
-}
-
-.hou-layout-admin .hou-page-nav .title-box {
-}
-
-.hou-layout-admin .hou-page-nav .title-box h1 {
-    height: 40px;
-    line-height: 40px;
-    font-size: 14px;
-}
-
 .dm-uploader {
     cursor: default;
     -webkit-touch-callout: none;
@@ -256,7 +242,19 @@ body {
 }
 
 /* 登录框 */
-.login-box {margin:10% auto;}
-.login-box .login-logo {text-align:center}
-.login-box .login-logo img {height:80px;}
-.login-box .login-box-c {background:#FFFFFF;padding:15px;}
+.login-box {
+    margin: 10% auto;
+}
+
+.login-box .login-logo {
+    text-align: center
+}
+
+.login-box .login-logo img {
+    height: 80px;
+}
+
+.login-box .login-box-c {
+    background: #FFFFFF;
+    padding: 15px;
+}
diff --git a/houjs/js/libs/chart.js b/houjs/js/libs/chart.js