From ccddfe87bc51dd61bd95413d53a13db7df260cd1 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 23 Oct 2017 10:53:39 +0800 Subject: [PATCH 01/84] refactor: refine layout directory structure --- src/views/layout/Layout.vue | 6 ++++-- src/views/layout/{ => components}/AppMain.vue | 0 src/views/layout/{ => components}/Levelbar.vue | 0 src/views/layout/{ => components}/Navbar.vue | 3 --- src/views/layout/{ => components}/Sidebar.vue | 0 src/views/layout/{ => components}/SidebarItem.vue | 0 src/views/layout/{ => components}/TabsView.vue | 0 src/views/layout/{ => components}/index.js | 5 +---- 8 files changed, 5 insertions(+), 9 deletions(-) rename src/views/layout/{ => components}/AppMain.vue (100%) rename src/views/layout/{ => components}/Levelbar.vue (100%) rename src/views/layout/{ => components}/Navbar.vue (97%) rename src/views/layout/{ => components}/Sidebar.vue (100%) rename src/views/layout/{ => components}/SidebarItem.vue (100%) rename src/views/layout/{ => components}/TabsView.vue (100%) rename src/views/layout/{ => components}/index.js (72%) diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index f31a5b8c..45fc7224 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -3,20 +3,22 @@
+
+ + From cddace507dc36330d2b53769c5f085e3b59e6bd4 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 23 Oct 2017 14:26:07 +0800 Subject: [PATCH 04/84] style: refine screenful style --- src/components/Screenfull/index.vue | 17 +-- src/views/layout/components/Navbar.vue | 140 +++++++++++++------------ 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue index ceca3c81..c872ce10 100644 --- a/src/components/Screenfull/index.vue +++ b/src/components/Screenfull/index.vue @@ -1,16 +1,14 @@ diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 52a42daa..54b9b343 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -1,29 +1,33 @@ From a8459fa5722b26b71b677bac4b9f123dfdb7b3e8 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 24 Oct 2017 14:49:29 +0800 Subject: [PATCH 05/84] style: refactor styles --- src/components/Github/index.vue | 29 ++++++ src/components/Icon-svg/index.vue | 10 ++ src/components/MarkdownEditor/index.vue | 6 +- src/styles/element-ui.scss | 18 ---- src/styles/index.scss | 119 +++--------------------- 5 files changed, 58 insertions(+), 124 deletions(-) diff --git a/src/components/Github/index.vue b/src/components/Github/index.vue index cd2677ca..ed2e85e1 100644 --- a/src/components/Github/index.vue +++ b/src/components/Github/index.vue @@ -11,3 +11,32 @@ + diff --git a/src/components/Icon-svg/index.vue b/src/components/Icon-svg/index.vue index 5ac1ec60..3e77146e 100644 --- a/src/components/Icon-svg/index.vue +++ b/src/components/Icon-svg/index.vue @@ -20,3 +20,13 @@ export default { } } + + diff --git a/src/components/MarkdownEditor/index.vue b/src/components/MarkdownEditor/index.vue index 922b2f16..d287b2e5 100644 --- a/src/components/MarkdownEditor/index.vue +++ b/src/components/MarkdownEditor/index.vue @@ -79,7 +79,6 @@ export default { diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 3b005d07..86f8d55b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -1,22 +1,4 @@ //覆盖一些element-ui样式 - .block-checkbox { - display: block; - } - - .operation-container { - .cell { - padding: 10px !important; - } - .el-button { - &:nth-child(3) { - margin-top: 10px; - margin-left: 0px; - } - &:nth-child(4) { - margin-top: 10px; - } - } - } .el-upload { input[type="file"] { diff --git a/src/styles/index.scss b/src/styles/index.scss index 9090126f..09b3463a 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -2,6 +2,7 @@ @import './btn.scss'; @import './element-ui.scss'; @import './sidebar.scss'; + body { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; @@ -72,6 +73,17 @@ a:hover { display: block; } +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + code { background: #eef1f6; padding: 15px 10px; @@ -87,9 +99,10 @@ code { } } +//globl transition css .fade-enter-active, .fade-leave-active { - transition: all .2s ease + transition: opacity 0.28s; } .fade-enter, @@ -119,14 +132,6 @@ code { text-align: center } -.svg-icon { - width: 1em; - height: 1em; - vertical-align: -0.15em; - fill: currentColor; - overflow: hidden; -} - .sub-navbar { height: 50px; line-height: 50px; @@ -157,57 +162,6 @@ code { } } -.publishedTag, -.draftTag, -.deletedTag { - color: #fff; - background-color: $panGreen; - line-height: 1; - text-align: center; - margin: 0; - padding: 8px 12px; - font-size: 14px; - border-radius: 4px; - position: absolute; - left: 20px; - top: 10px; -} - -.draftTag { - background-color: $yellow; -} - -.deletedTag { - background-color: $red; -} - -.input-label { - font-size: 14px; - color: #48576a; - line-height: 1; - padding: 11px 5px 11px 0; -} - -.clearfix { - &:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; - } -} - -.no-marginLeft { - .el-checkbox { - margin: 0 20px 15px 0; - } - .el-checkbox+.el-checkbox { - margin-left: 0px; - } -} - .filter-container { padding-bottom: 10px; .filter-item { @@ -225,48 +179,3 @@ code { .multiselect--active { z-index: 1000 !important; } - -//refine simplemde -.simplemde-container { - .editor-toolbar.fullscreen, - .CodeMirror-fullscreen { - z-index: 1003; - } -} - -//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; -} - -//github-corner -.github-corner:hover .octo-arm { - animation: octocat-wave 560ms ease-in-out -} - -@keyframes octocat-wave { - 0%, - 100% { - transform: rotate(0) - } - 20%, - 60% { - transform: rotate(-25deg) - } - 40%, - 80% { - transform: rotate(10deg) - } -} - -@media (max-width:500px) { - .github-corner:hover .octo-arm { - animation: none - } - .github-corner .octo-arm { - animation: octocat-wave 560ms ease-in-out - } -} From a465652be6ffa1ceaab04bfb4c9171d857bd9d8a Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 24 Oct 2017 16:30:46 +0800 Subject: [PATCH 06/84] refactor: components name --- .../{Github => GithubCorner}/index.vue | 0 .../{jsonEditor.vue => JsonEditor.vue} | 7 +- src/views/dashboard/admin/index.vue | 122 +++++++++--------- src/views/dashboard/editor/index.vue | 6 +- 4 files changed, 68 insertions(+), 67 deletions(-) rename src/components/{Github => GithubCorner}/index.vue (100%) rename src/views/components/{jsonEditor.vue => JsonEditor.vue} (89%) diff --git a/src/components/Github/index.vue b/src/components/GithubCorner/index.vue similarity index 100% rename from src/components/Github/index.vue rename to src/components/GithubCorner/index.vue diff --git a/src/views/components/jsonEditor.vue b/src/views/components/JsonEditor.vue similarity index 89% rename from src/views/components/jsonEditor.vue rename to src/views/components/JsonEditor.vue index f71c4378..3bbbc34f 100644 --- a/src/views/components/jsonEditor.vue +++ b/src/views/components/JsonEditor.vue @@ -1,6 +1,6 @@ - - From 3ded46cf231abc59aa6b64e891e37b3191172d04 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 24 Oct 2017 16:38:11 +0800 Subject: [PATCH 08/84] refactor: case sensitive --- src/components/JsonEditor/index.vue | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 src/components/JsonEditor/index.vue diff --git a/src/components/JsonEditor/index.vue b/src/components/JsonEditor/index.vue new file mode 100644 index 00000000..dcb5ee2d --- /dev/null +++ b/src/components/JsonEditor/index.vue @@ -0,0 +1,64 @@ + + + + + From 88d1338f297eb9656d537884cc0029cc84767df7 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 24 Oct 2017 17:29:11 +0800 Subject: [PATCH 09/84] refactor: case sensitive --- src/views/components/JsonEditor.vue | 31 ----------------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/views/components/JsonEditor.vue diff --git a/src/views/components/JsonEditor.vue b/src/views/components/JsonEditor.vue deleted file mode 100644 index 3bbbc34f..00000000 --- a/src/views/components/JsonEditor.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - From 99417081ed6918c1dc557fdf2b474c430178406c Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 24 Oct 2017 17:29:32 +0800 Subject: [PATCH 10/84] refactor: case sensitive --- src/views/components/jsonEditor.vue | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/views/components/jsonEditor.vue diff --git a/src/views/components/jsonEditor.vue b/src/views/components/jsonEditor.vue new file mode 100644 index 00000000..3bbbc34f --- /dev/null +++ b/src/views/components/jsonEditor.vue @@ -0,0 +1,31 @@ + + + + + + From f99b97d9f1f1bb74c7bde4062ceab2be45e0e479 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 24 Oct 2017 17:37:14 +0800 Subject: [PATCH 11/84] refactor: change DndList name --- src/components/{twoDndList => DndList}/index.vue | 12 ++++++------ src/views/components/dndList.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) rename src/components/{twoDndList => DndList}/index.vue (94%) diff --git a/src/components/twoDndList/index.vue b/src/components/DndList/index.vue similarity index 94% rename from src/components/twoDndList/index.vue rename to src/components/DndList/index.vue index 09e1fe0d..da9e76a5 100644 --- a/src/components/twoDndList/index.vue +++ b/src/components/DndList/index.vue @@ -1,6 +1,6 @@