Skip to content

Commit 5ae6fd4

Browse files
yanglbmeyanglbme
committed
Merge branch 'master' of github.com:doocs/md
2 parents 6143c1e + 17f91e2 commit 5ae6fd4

File tree

16 files changed

+1399
-968
lines changed

16 files changed

+1399
-968
lines changed

‎src/App.vue‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,38 @@
66
</template>
77

88
<script>
9-
import Loading from './components/Loading'
10-
import CodemirrorEditor from './view/CodemirrorEditor'
9+
import Loading from "./components/Loading";
10+
import CodemirrorEditor from "./view/CodemirrorEditor";
1111
export default {
12-
name: 'App',
12+
name: "App",
1313
components: {
1414
Loading,
15-
CodemirrorEditor
15+
CodemirrorEditor,
1616
},
1717
data() {
1818
return {
19-
loading: true
20-
}
19+
loading: true,
20+
};
2121
},
2222
mounted() {
2323
setTimeout(() => {
24-
this.loading = false
24+
this.loading = false;
2525
}, 100);
26-
}
27-
}
28-
26+
},
27+
};
2928
</script>
3029

3130
<style lang="scss" scoped>
32-
.fade-enter, .fade-leave-to {
31+
.fade-enter,
32+
.fade-leave-to {
3333
opacity: 0;
3434
}
35-
.fade-enter-to, .fade-leave {
35+
.fade-enter-to,
36+
.fade-leave {
3637
opacity: 1;
3738
}
38-
.fade-enter-active, .fade-leave-active {
39+
.fade-enter-active,
40+
.fade-leave-active {
3941
transition: all 1s;
4042
}
4143
</style>

‎src/assets/less/app.less‎

Lines changed: 86 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
@import './code-theme.less';
1+
@import "./code-theme.less";
22
* {
3-
box-sizing: border-box;
4-
margin: 0;
5-
padding: 0;
3+
box-sizing: border-box;
4+
margin: 0;
5+
padding: 0;
66
}
77

88
input,
99
button,
1010
textarea {
11-
font-family: inherit;
11+
font-family: inherit;
1212
}
1313

1414
h1,
@@ -17,109 +17,110 @@ h3,
1717
h4,
1818
h5,
1919
h6 {
20-
font-weight: normal;
20+
font-weight: normal;
2121
}
2222

2323
em {
24-
font-style: normal !important;
24+
font-style: normal !important;
2525
}
2626

2727
html,
2828
body {
29-
height: 100%;
30-
font-family: 'PingFang SC', BlinkMacSystemFont, Roboto, 'Helvetica Neue', sans-serif;
29+
height: 100%;
30+
font-family: "PingFang SC", BlinkMacSystemFont, Roboto, "Helvetica Neue",
31+
sans-serif;
3132
}
3233

3334
.el-message__icon {
34-
display: none
35+
display: none;
3536
}
3637

3738
.container {
38-
height: 100%;
39-
display: flex;
40-
flex-direction: column;
39+
height: 100%;
40+
display: flex;
41+
flex-direction: column;
4142
}
4243

4344
.top {
44-
height: 60px;
45-
padding: 10px 20px;
46-
display: flex;
47-
align-items: center;
48-
margin-right: 20px;
45+
height: 60px;
46+
padding: 10px 20px;
47+
display: flex;
48+
align-items: center;
49+
margin-right: 20px;
4950
}
5051

5152
.web-title {
52-
margin: 0 15px 0 5px;
53+
margin: 0 15px 0 5px;
5354
}
5455

5556
.web-icon {
56-
width: auto;
57-
height: 1.5rem;
58-
vertical-align: middle;
57+
width: auto;
58+
height: 1.5rem;
59+
vertical-align: middle;
5960
}
6061

6162
#editor {
62-
height: 100%;
63-
display: block;
64-
border: none;
65-
width: 100%;
66-
padding: 10px;
63+
height: 100%;
64+
display: block;
65+
border: none;
66+
width: 100%;
67+
padding: 10px;
6768
}
6869

6970
section {
70-
height: 100%;
71+
height: 100%;
7172
}
7273

7374
.main-body {
74-
display: flex;
75-
flex-direction: column;
76-
padding-top: 0;
77-
padding-bottom: 10px;
75+
display: flex;
76+
flex-direction: column;
77+
padding-top: 0;
78+
padding-bottom: 10px;
7879
}
7980

8081
.ctrl {
81-
flex-basis: 60px;
82-
flex-grow: 1;
83-
flex-shrink: 1;
84-
display: flex;
85-
align-items: center;
82+
flex-basis: 60px;
83+
flex-grow: 1;
84+
flex-shrink: 1;
85+
display: flex;
86+
align-items: center;
8687
}
8788

8889
.preview-wrapper {
89-
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
90-
padding: 0;
91-
align-items: center;
92-
justify-content: center;
93-
display: flex;
94-
overflow: scroll;
95-
word-break: break-all;
90+
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
91+
padding: 0;
92+
align-items: center;
93+
justify-content: center;
94+
display: flex;
95+
overflow: scroll;
96+
word-break: break-all;
9697
}
9798

9899
.main-section {
99-
display: flex;
100-
height: 100%;
100+
display: flex;
101+
height: 100%;
101102
}
102103

103104
.hint {
104-
opacity: 0.6;
105-
margin: 20px 0;
105+
opacity: 0.6;
106+
margin: 20px 0;
106107
}
107108

108109
.preview {
109-
margin: 0 -20px;
110-
width: 375px;
111-
padding: 20px;
112-
font-size: 14px;
113-
box-sizing: border-box;
114-
outline: none;
115-
box-shadow: 0 0 60px rgba(0, 0, 0, 0.1);
110+
margin: 0 -20px;
111+
width: 375px;
112+
padding: 20px;
113+
font-size: 14px;
114+
box-sizing: border-box;
115+
outline: none;
116+
box-shadow: 0 0 60px rgba(0, 0, 0, 0.1);
116117
}
117118

118119
.preview table {
119-
margin-bottom: 10px;
120-
border-collapse: collapse;
121-
display: table;
122-
width: 100% !important;
120+
margin-bottom: 10px;
121+
border-collapse: collapse;
122+
display: table;
123+
width: 100% !important;
123124
}
124125

125126
/*
@@ -128,60 +129,61 @@ section {
128129
}
129130
*/
130131
.select-item-left {
131-
float: left;
132+
float: left;
132133
}
133134

134135
.select-item-right {
135-
float: right;
136-
color: #8492a6;
137-
font-size: 13px;
136+
float: right;
137+
color: #8492a6;
138+
font-size: 13px;
138139
}
139140

140141
.CodeMirror {
141-
height: 100% !important;
142-
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
143-
font-size: 14px;
144-
padding: 20px;
145-
width: 100% !important;
146-
font-family: 'PingFang SC', BlinkMacSystemFont, Roboto, 'Helvetica Neue', sans-serif !important;
142+
height: 100% !important;
143+
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
144+
font-size: 14px;
145+
padding: 20px;
146+
width: 100% !important;
147+
font-family: "PingFang SC", BlinkMacSystemFont, Roboto, "Helvetica Neue",
148+
sans-serif !important;
147149
}
148150

149151
/* ele ui */
150152
.el-form-item {
151-
margin-bottom: 0 !important;
153+
margin-bottom: 0 !important;
152154
}
153155

154156
.el-tooltip {
155-
cursor: pointer;
157+
cursor: pointer;
156158
}
157159

158160
::-webkit-scrollbar {
159-
width: 6px;
160-
height: 6px;
161-
background-color: #FFF;
161+
width: 6px;
162+
height: 6px;
163+
background-color: #fff;
162164
}
163165

164166
::-webkit-scrollbar-track {
165-
border-radius: 6px;
166-
background-color: rgba(200, 200, 200, 0.3);
167+
border-radius: 6px;
168+
background-color: rgba(200, 200, 200, 0.3);
167169
}
168170

169171
::-webkit-scrollbar-thumb {
170-
border-radius: 6px;
171-
background-color: rgba(144, 146, 152, 0.5);
172-
transition: background-color .3s;
172+
border-radius: 6px;
173+
background-color: rgba(144, 146, 152, 0.5);
174+
transition: background-color 0.3s;
173175
}
174176

175177
::-webkit-scrollbar-thumb:hover {
176-
background-color: rgba(144, 146, 152, 0.5);
178+
background-color: rgba(144, 146, 152, 0.5);
177179
}
178180

179181
.CodeMirror-vscrollbar:focus {
180-
outline: none;
182+
outline: none;
181183
}
182184

183185
.CodeMirror-scroll,
184186
.preview-wrapper {
185-
overflow: unset;
186-
overflow-y: scroll;
187-
}
187+
overflow: unset;
188+
overflow-y: scroll;
189+
}

‎src/assets/less/code-theme.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@import './codeTheme/wechat-code-block.less';
2-
@import './codeTheme/github-code-block.less';
1+
@import "./codeTheme/wechat-code-block.less";
2+
@import "./codeTheme/github-code-block.less";

0 commit comments

Comments
 (0)