Skip to content

Commit 6804711

Browse files
jackycutejackycute
authored
Merge pull request #1551 from hackmdio/bugfix/urlpath
2 parents 91fb545 + 0b164a0 commit 6804711

File tree

14 files changed

+55
-42
lines changed

14 files changed

+55
-42
lines changed

‎public/css/font.css‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,206 +3,206 @@
33
font-family: 'Source Code Pro';
44
font-style: normal;
55
font-weight: 300;
6-
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('/fonts/SourceCodePro-Light.woff') format('woff');
6+
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('../fonts/SourceCodePro-Light.woff') format('woff');
77
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
88
}
99
/* latin */
1010
@font-face {
1111
font-family: 'Source Code Pro';
1212
font-style: normal;
1313
font-weight: 300;
14-
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('/fonts/SourceCodePro-Light.woff') format('woff');
14+
src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('../fonts/SourceCodePro-Light.woff') format('woff');
1515
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
1616
}
1717
/* latin-ext */
1818
@font-face {
1919
font-family: 'Source Code Pro';
2020
font-style: normal;
2121
font-weight: 400;
22-
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('/fonts/SourceCodePro-Regular.woff') format('woff');
22+
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../fonts/SourceCodePro-Regular.woff') format('woff');
2323
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
2424
}
2525
/* latin */
2626
@font-face {
2727
font-family: 'Source Code Pro';
2828
font-style: normal;
2929
font-weight: 400;
30-
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('/fonts/SourceCodePro-Regular.woff') format('woff');
30+
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../fonts/SourceCodePro-Regular.woff') format('woff');
3131
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
3232
}
3333
/* latin-ext */
3434
@font-face {
3535
font-family: 'Source Code Pro';
3636
font-style: normal;
3737
font-weight: 500;
38-
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('/fonts/SourceCodePro-Medium.woff') format('woff');
38+
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('../fonts/SourceCodePro-Medium.woff') format('woff');
3939
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
4040
}
4141
/* latin */
4242
@font-face {
4343
font-family: 'Source Code Pro';
4444
font-style: normal;
4545
font-weight: 500;
46-
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('/fonts/SourceCodePro-Medium.woff') format('woff');
46+
src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('../fonts/SourceCodePro-Medium.woff') format('woff');
4747
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
4848
}
4949
/* vietnamese */
5050
@font-face {
5151
font-family: 'Source Sans Pro';
5252
font-style: normal;
5353
font-weight: 300;
54-
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceCodePro-Medium.woff') format('woff');
54+
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceCodePro-Medium.woff') format('woff');
5555
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
5656
}
5757
/* latin-ext */
5858
@font-face {
5959
font-family: 'Source Sans Pro';
6060
font-style: normal;
6161
font-weight: 300;
62-
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff');
62+
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff') format('woff');
6363
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
6464
}
6565
/* latin */
6666
@font-face {
6767
font-family: 'Source Sans Pro';
6868
font-style: normal;
6969
font-weight: 300;
70-
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff');
70+
src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff') format('woff');
7171
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
7272
}
7373
/* vietnamese */
7474
@font-face {
7575
font-family: 'Source Sans Pro';
7676
font-style: normal;
7777
font-weight: 400;
78-
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
78+
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff');
7979
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
8080
}
8181
/* latin-ext */
8282
@font-face {
8383
font-family: 'Source Sans Pro';
8484
font-style: normal;
8585
font-weight: 400;
86-
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
86+
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff');
8787
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
8888
}
8989
/* latin */
9090
@font-face {
9191
font-family: 'Source Sans Pro';
9292
font-style: normal;
9393
font-weight: 400;
94-
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
94+
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff');
9595
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
9696
}
9797
/* vietnamese */
9898
@font-face {
9999
font-family: 'Source Sans Pro';
100100
font-style: normal;
101101
font-weight: 600;
102-
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff');
102+
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff');
103103
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
104104
}
105105
/* latin-ext */
106106
@font-face {
107107
font-family: 'Source Sans Pro';
108108
font-style: normal;
109109
font-weight: 600;
110-
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff');
110+
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff');
111111
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
112112
}
113113
/* latin */
114114
@font-face {
115115
font-family: 'Source Sans Pro';
116116
font-style: normal;
117117
font-weight: 600;
118-
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff');
118+
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff');
119119
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
120120
}
121121
/* vietnamese */
122122
@font-face {
123123
font-family: 'Source Sans Pro';
124124
font-style: italic;
125125
font-weight: 300;
126-
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff');
126+
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff');
127127
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
128128
}
129129
/* latin-ext */
130130
@font-face {
131131
font-family: 'Source Sans Pro';
132132
font-style: italic;
133133
font-weight: 300;
134-
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff');
134+
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff');
135135
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
136136
}
137137
/* latin */
138138
@font-face {
139139
font-family: 'Source Sans Pro';
140140
font-style: italic;
141141
font-weight: 300;
142-
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff');
142+
src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff');
143143
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
144144
}
145145
/* vietnamese */
146146
@font-face {
147147
font-family: 'Source Sans Pro';
148148
font-style: italic;
149149
font-weight: 400;
150-
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff');
150+
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff');
151151
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
152152
}
153153
/* latin-ext */
154154
@font-face {
155155
font-family: 'Source Sans Pro';
156156
font-style: italic;
157157
font-weight: 400;
158-
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff');
158+
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff');
159159
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
160160
}
161161
/* latin */
162162
@font-face {
163163
font-family: 'Source Sans Pro';
164164
font-style: italic;
165165
font-weight: 400;
166-
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff');
166+
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff');
167167
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
168168
}
169169
/* vietnamese */
170170
@font-face {
171171
font-family: 'Source Sans Pro';
172172
font-style: italic;
173173
font-weight: 600;
174-
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
174+
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
175175
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
176176
}
177177
/* latin-ext */
178178
@font-face {
179179
font-family: 'Source Sans Pro';
180180
font-style: italic;
181181
font-weight: 600;
182-
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
182+
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
183183
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
184184
}
185185
/* latin */
186186
@font-face {
187187
font-family: 'Source Sans Pro';
188188
font-style: italic;
189189
font-weight: 600;
190-
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
190+
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff');
191191
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
192192
}
193193
/* latin-ext */
194194
@font-face {
195195
font-family: 'Source Serif Pro';
196196
font-style: normal;
197197
font-weight: 400;
198-
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('/fonts/SourceSerifPro-Regular.woff') format('woff');
198+
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('../fonts/SourceSerifPro-Regular.woff') format('woff');
199199
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
200200
}
201201
/* latin */
202202
@font-face {
203203
font-family: 'Source Serif Pro';
204204
font-style: normal;
205205
font-weight: 400;
206-
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('/fonts/SourceSerifPro-Regular.woff') format('woff');
206+
src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('../fonts/SourceSerifPro-Regular.woff') format('woff');
207207
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
208208
}

‎public/js/lib/editor/markdown-lint/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
// load CM lint plugin explicitly
44
import '@hackmd/codemirror/addon/lint/lint'
5-
import './lint.css'
65

76
window.markdownit = require('markdown-it')
87
// eslint-disable-next-line

‎public/js/lib/editor/markdown-lint/lint.css‎ renamed to ‎public/markdown-lint/css/lint.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
}
3232

3333
.CodeMirror-lint-mark-error {
34-
background-image: url(/images/lint/mark-error.png);
34+
background-image: url(../images/mark-error.png);
3535
}
3636

3737
.CodeMirror-lint-mark-warning {
38-
background-image: url(/images/lint/mark-warning.png);
38+
background-image: url(../images/mark-warning.png);
3939
}
4040

4141
.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
@@ -58,15 +58,15 @@
5858
}
5959

6060
.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
61-
background-image: url(/images/lint/message-error.png);
61+
background-image: url(../images/message-error.png);
6262
}
6363

6464
.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
65-
background-image: url(/images/lint/message-warning.png);
65+
background-image: url(../images/message-warning.png);
6666
}
6767

6868
.CodeMirror-lint-marker-multiple {
69-
background-image: url(/images/lint/mark-multiple.png);
69+
background-image: url(../images/mark-multiple.png);
7070
background-repeat: no-repeat;
7171
background-position: right bottom;
7272
width: 100%; height: 100%;

‎public/images/lint/mark-error.png‎ renamed to ‎public/markdown-lint/images/mark-error.png‎

File renamed without changes.

‎public/images/lint/mark-multiple.png‎ renamed to ‎public/markdown-lint/images/mark-multiple.png‎

File renamed without changes.

‎public/images/lint/mark-warning.png‎ renamed to ‎public/markdown-lint/images/mark-warning.png‎

File renamed without changes.

‎public/images/lint/message-error.png‎ renamed to ‎public/markdown-lint/images/message-error.png‎

File renamed without changes.

‎public/images/lint/message-warning.png‎ renamed to ‎public/markdown-lint/images/message-warning.png‎

File renamed without changes.

‎public/views/codimd/head.ejs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@
1818
<%- include ../shared/polyfill %>
1919
<% } else { %>
2020
<link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
21+
<link rel="stylesheet" href='<%- serverURL %>/css/font.css'>
22+
<link rel="stylesheet" href='<%- serverURL %>/build/fork-awesome/css/fork-awesome.min.css'>
2123
<%- include ../build/index-pack-header %>
2224
<% } %>
25+
<link rel="stylesheet" href='<%- serverURL %>/markdown-lint/css/lint.css'>

‎public/views/includes/scripts.ejs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script src="<%= webpackConfig.output.baseUrl %>/config"></script>
1+
<script src="<%= '\<\%= serverURL \%\>' %>/config"></script>
22
<% for (var js in htmlWebpackPlugin.files.js) { %>
33
<script src="<%= '\<\%= serverURL \%\>'%><%= htmlWebpackPlugin.files.js[js] %>" defer></script>
44
<% } %>

0 commit comments

Comments
 (0)