Skip to content

Commit a122a98

Browse files
silverwindsilverwind
committed
more renames markdown -> markup
1 parent ead5a0b commit a122a98

File tree

13 files changed

+31
-31
lines changed

13 files changed

+31
-31
lines changed

‎templates/repo/diff/comment_form.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</div>
2828
</div>
2929
<div class="field footer">
30-
<span class="markdown-info">{{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}}</span>
30+
<span class="markup-info">{{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}}</span>
3131
<div class="ui right">
3232
{{if $.reply}}
3333
<button class="ui submit green tiny button btn-reply" type="submit">{{$.root.i18n.Tr "repo.diff.comment.reply"}}</button>

‎web_src/js/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import initClipboard from './features/clipboard.js';
1111
import initHeatmap from './features/heatmap.js';
1212
import initProject from './features/projects.js';
1313
import initServiceWorker from './features/serviceworker.js';
14-
import initMarkdownAnchors from './markdown/anchors.js';
15-
import renderMarkdownContent from './markdown/content.js';
14+
import initMarkupAnchors from './markup/anchors.js';
15+
import renderMarkupContent from './markup/content.js';
1616
import attachTribute from './features/tribute.js';
1717
import createColorPicker from './features/colorpicker.js';
1818
import createDropzone from './features/dropzone.js';
@@ -51,7 +51,7 @@ function initCommentPreviewTab($form) {
5151
}, (data) => {
5252
const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`);
5353
$previewPanel.html(data);
54-
renderMarkdownContent();
54+
renderMarkupContent();
5555
});
5656
});
5757

@@ -81,7 +81,7 @@ function initEditPreviewTab($form) {
8181
}, (data) => {
8282
const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`);
8383
$previewPanel.html(data);
84-
renderMarkdownContent();
84+
renderMarkupContent();
8585
});
8686
});
8787
}
@@ -1107,7 +1107,7 @@ async function initRepository() {
11071107
dz.emit('submit');
11081108
dz.emit('reload');
11091109
}
1110-
renderMarkdownContent();
1110+
renderMarkupContent();
11111111
});
11121112
});
11131113
} else {
@@ -1476,7 +1476,7 @@ function initUncycloForm() {
14761476
wiki: true
14771477
}, (data) => {
14781478
preview.innerHTML = `<div class="markup ui segment">${data}</div>`;
1479-
renderMarkdownContent();
1479+
renderMarkupContent();
14801480
});
14811481
};
14821482

@@ -2772,7 +2772,7 @@ $(document).ready(async () => {
27722772
searchTeams();
27732773
searchRepositories();
27742774

2775-
initMarkdownAnchors();
2775+
initMarkupAnchors();
27762776
initCommentForm();
27772777
initInstall();
27782778
initArchiveLinks();
@@ -2830,7 +2830,7 @@ $(document).ready(async () => {
28302830
initServiceWorker(),
28312831
initNotificationCount(),
28322832
initStopwatch(),
2833-
renderMarkdownContent(),
2833+
renderMarkupContent(),
28342834
initGithook(),
28352835
initImageDiff(),
28362836
]);

‎web_src/js/markdown/anchors.js renamed to ‎web_src/js/markup/anchors.js

File renamed without changes.

‎web_src/js/markdown/content.js renamed to ‎web_src/js/markup/content.js

File renamed without changes.

‎web_src/js/markdown/mermaid.js renamed to ‎web_src/js/markup/mermaid.js

File renamed without changes.

‎web_src/less/_base.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
--color-active: #00000014;
103103
--color-menu: #ffffff;
104104
--color-card: #ffffff;
105-
--color-markdown-table-row: #00000008;
106-
--color-markdown-code-block: #00000010;
105+
--color-markup-table-row: #00000008;
106+
--color-markup-code-block: #00000010;
107107
--color-button: #ffffff;
108108
--color-code-bg: #ffffff;
109109
--color-shadow: #00000030;

‎web_src/less/_repository.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@
580580
border-right-color: var(--color-box-body);
581581
}
582582

583-
.markdown {
583+
.markup {
584584
font-size: 14px;
585585
}
586586
}
@@ -1020,7 +1020,7 @@
10201020
}
10211021
}
10221022

1023-
.markdown {
1023+
.markup {
10241024
font-size: 14px;
10251025
}
10261026

@@ -1040,7 +1040,7 @@
10401040
overflow: hidden;
10411041
}
10421042

1043-
.tab.markdown {
1043+
.tab.markup {
10441044
min-height: 5rem;
10451045
}
10461046
}
@@ -1244,7 +1244,7 @@
12441244
margin-bottom: 1.5rem;
12451245
}
12461246

1247-
.markdown {
1247+
.markup {
12481248
font-size: 14px;
12491249
}
12501250
}
@@ -1996,7 +1996,7 @@
19961996
margin-top: -5px;
19971997
}
19981998

1999-
> .markdown {
1999+
> .markup {
20002000
padding: 15px 30px;
20012001

20022002
h1,
@@ -2991,7 +2991,7 @@ td.blob-excerpt {
29912991
.webhook-info {
29922992
padding: 7px 12px;
29932993
margin: 10px 0;
2994-
background-color: var(--color-markdown-code-block);
2994+
background-color: var(--color-markup-code-block);
29952995
border: 1px solid var(--color-secondary);
29962996
border-radius: 3px;
29972997
font-size: 13px;

‎web_src/less/_review.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
.ui.active.tab {
8282
padding: .5em;
8383

84-
&.markdown {
84+
&.markup {
8585
padding: 1em;
8686
min-height: 168px;
8787
}
@@ -95,7 +95,7 @@
9595
border-top: 1px solid var(--color-secondary);
9696
padding: 10px 0;
9797

98-
.markdown-info {
98+
.markup-info {
9999
display: inline-block;
100100
margin: 5px 0;
101101
font-size: 12px;

‎web_src/less/features/animations.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
border-radius: 100%;
2929
}
3030

31-
.markdown pre.is-loading,
31+
.markup pre.is-loading,
3232
.editor-loading.is-loading {
3333
height: 12rem;
3434
}

‎web_src/less/index.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
@import "./features/imagediff.less";
1010
@import "./features/codeeditor.less";
1111
@import "./features/projects.less";
12-
@import "./markdown/mermaid.less";
12+
@import "./markup/content.less";
13+
@import "./markup/mermaid.less";
1314

1415
@import "./chroma/base.less";
1516
@import "./chroma/light.less";
@@ -18,7 +19,6 @@
1819
@import "_tribute";
1920
@import "_font_i18n";
2021
@import "_base";
21-
@import "_markup";
2222
@import "_home";
2323
@import "_install";
2424
@import "_form";

‎web_src/less/_markup.less renamed to ‎web_src/less/markup/content.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.markup:not(code) {
1+
.markup {
22
overflow: hidden;
33
font-size: 16px;
44
line-height: 1.5 !important;
@@ -290,7 +290,7 @@
290290
}
291291

292292
table tr:nth-child(2n) {
293-
background-color: var(--color-markdown-table-row);
293+
background-color: var(--color-markup-table-row);
294294
}
295295

296296
img {
@@ -404,7 +404,7 @@
404404
padding: .2em .4em;
405405
margin: 0;
406406
font-size: 85%;
407-
background-color: var(--color-markdown-code-block);
407+
background-color: var(--color-markup-code-block);
408408
border-radius: 4px;
409409
}
410410

@@ -437,7 +437,7 @@
437437
padding: 16px;
438438
font-size: 85%;
439439
line-height: 1.45;
440-
background-color: var(--color-markdown-code-block);
440+
background-color: var(--color-markup-code-block);
441441
border-radius: 4px;
442442
}
443443

@@ -477,7 +477,7 @@
477477
line-height: 10px;
478478
color: var(--color-text-light);
479479
vertical-align: middle;
480-
background-color: var(--color-markdown-code-block);
480+
background-color: var(--color-markup-code-block);
481481
border: 1px solid var(--color-secondary);
482482
border-radius: 3px;
483483
box-shadow: inset 0 -1px 0 var(--color-secondary);

‎web_src/less/markdown/mermaid.less renamed to ‎web_src/less/markup/mermaid.less

File renamed without changes.

‎web_src/less/themes/theme-arc-green.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
--color-active: #ffffff16;
9898
--color-menu: #2e323e;
9999
--color-card: #2e323e;
100-
--color-markdown-table-row: #ffffff06;
101-
--color-markdown-code-block: #2a2e3a;
100+
--color-markup-table-row: #ffffff06;
101+
--color-markup-code-block: #2a2e3a;
102102
--color-button: #353846;
103103
--color-code-bg: #2a2e3a;
104104
--color-shadow: #00000060;
@@ -300,7 +300,7 @@ a.ui.basic.green.label:hover {
300300
& + .editor-preview-side {
301301
background: #353945;
302302

303-
.markdown:not(code).ui.segment {
303+
.markup.ui.segment {
304304
border-width: 0;
305305
}
306306
}
@@ -753,7 +753,7 @@ img[src$="/img/matrix.svg"] {
753753
border-color: #4a4c58 #4a4c58 #d7d7da #d7d7da;
754754
}
755755

756-
.markdown-block-error {
756+
.markup-block-error {
757757
border: 1px solid rgba(121, 71, 66, .5) !important;
758758
border-bottom: none !important;
759759
}

0 commit comments

Comments
 (0)