Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e96ddff
Merge branch 'feature/menutab' into develop
Apr 6, 2019
d79b814
fix:删除iconfont.js
Apr 6, 2019
c4fd9a4
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 11, 2019
9878226
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 13, 2019
6434b13
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 16, 2019
15f7717
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 21, 2019
c1a0dc5
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 24, 2019
4de6469
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 24, 2019
dc3580c
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 30, 2019
a794036
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 2, 2019
383d81e
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 3, 2019
b450669
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 5, 2019
93974e2
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 5, 2019
946f926
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 12, 2019
fc620ea
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 12, 2019
9e6c6de
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 12, 2019
ccd5a57
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 13, 2019
3b15688
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 19, 2019
d06f1ff
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jun 30, 2019
b48ba1e
feat:富文本 Tinymce
Jul 10, 2019
9ad3352
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jul 14, 2019
0782146
fix:conflict
Jul 14, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
},
"dependencies": {
"@babel/polyfill": "^7.2.5",
"@tinymce/tinymce-vue": "^2.1.0",
"axios": "~0.18.0",
"element-ui": "^2.8.2",
"event-source-polyfill": "^0.0.16",
Expand All @@ -24,6 +25,7 @@
"moment": "^2.24.0",
"photoswipe": "^4.1.2",
"screenfull": "^4.2.0",
"tinymce": "^5.0.9",
"vue": "^2.6.8",
"vue-awesome-swiper": "^3.1.3",
"vue-croppa": "^1.3.8",
Expand Down
389 changes: 389 additions & 0 deletions public/tinymce/langs/zh_CN.js

Large diffs are not rendered by default.

49 changes: 49 additions & 0 deletions public/tinymce/skins/content/default/content.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/**
* Copyright (c) Tiny Technologies, Inc. All rights reserved.
* Licensed under the LGPL or a commercial license.
* For LGPL see License.txt in the project root for license information.
* For commercial licenses see https://www.tiny.cloud/
*/
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
line-height: 1.4;
margin: 1rem;
}
table {
border-collapse: collapse;
}
table th,
table td {
border: 1px solid #ccc;
padding: 0.4rem;
}
figure {
display: table;
margin: 1rem auto;
}
figure figcaption {
color: #999;
display: block;
margin-top: 0.25rem;
text-align: center;
}
hr {
border-color: #ccc;
border-style: solid;
border-width: 1px 0 0 0;
}
code {
background-color: #e8e8e8;
border-radius: 3px;
padding: 0.1rem 0.2rem;
}
.mce-content-body:not([dir=rtl]) blockquote {
border-left: 2px solid #ccc;
margin-left: 1.5rem;
padding-left: 1rem;
}
.mce-content-body[dir=rtl] blockquote {
border-right: 2px solid #ccc;
margin-right: 1.5rem;
padding-right: 1rem;
}
8 changes: 8 additions & 0 deletions public/tinymce/skins/content/default/content.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions public/tinymce/skins/content/document/content.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/**
* Copyright (c) Tiny Technologies, Inc. All rights reserved.
* Licensed under the LGPL or a commercial license.
* For LGPL see License.txt in the project root for license information.
* For commercial licenses see https://www.tiny.cloud/
*/
@media screen {
html {
background: #f4f4f4;
}
}
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
@media screen {
body {
background-color: #fff;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.15);
box-sizing: border-box;
margin: 1rem auto 0;
max-width: 820px;
min-height: calc(100vh - 1rem);
padding: 4rem 6rem 6rem 6rem;
}
}
table {
border-collapse: collapse;
}
table th,
table td {
border: 1px solid #ccc;
padding: 0.4rem;
}
figure figcaption {
color: #999;
margin-top: 0.25rem;
text-align: center;
}
hr {
border-color: #ccc;
border-style: solid;
border-width: 1px 0 0 0;
}
.mce-content-body:not([dir=rtl]) blockquote {
border-left: 2px solid #ccc;
margin-left: 1.5rem;
padding-left: 1rem;
}
.mce-content-body[dir=rtl] blockquote {
border-right: 2px solid #ccc;
margin-right: 1.5rem;
padding-right: 1rem;
}
8 changes: 8 additions & 0 deletions public/tinymce/skins/content/document/content.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions public/tinymce/skins/content/writer/content.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/**
* Copyright (c) Tiny Technologies, Inc. All rights reserved.
* Licensed under the LGPL or a commercial license.
* For LGPL see License.txt in the project root for license information.
* For commercial licenses see https://www.tiny.cloud/
*/
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
line-height: 1.4;
margin: 1rem auto;
max-width: 900px;
}
table {
border-collapse: collapse;
}
table th,
table td {
border: 1px solid #ccc;
padding: 0.4rem;
}
figure {
display: table;
margin: 1rem auto;
}
figure figcaption {
color: #999;
display: block;
margin-top: 0.25rem;
text-align: center;
}
hr {
border-color: #ccc;
border-style: solid;
border-width: 1px 0 0 0;
}
code {
background-color: #e8e8e8;
border-radius: 3px;
padding: 0.1rem 0.2rem;
}
.mce-content-body:not([dir=rtl]) blockquote {
border-left: 2px solid #ccc;
margin-left: 1.5rem;
padding-left: 1rem;
}
.mce-content-body[dir=rtl] blockquote {
border-right: 2px solid #ccc;
margin-right: 1.5rem;
padding-right: 1rem;
}
8 changes: 8 additions & 0 deletions public/tinymce/skins/content/writer/content.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading