more renames markdown -> markup

templates/repo/diff/comment_form.tmpl

@@ -27,7 +27,7 @@
 			</div>
 		</div>
 		<div class="field footer">
-			<span class="markdown-info">{{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}}</span>
+			<span class="markup-info">{{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}}</span>
 			<div class="ui right">
 				{{if $.reply}}
 					<button class="ui submit green tiny button btn-reply" type="submit">{{$.root.i18n.Tr "repo.diff.comment.reply"}}</button>

web_src/js/index.js

@@ -11,8 +11,8 @@ import initClipboard from './features/clipboard.js';
 import initHeatmap from './features/heatmap.js';
 import initProject from './features/projects.js';
 import initServiceWorker from './features/serviceworker.js';
-import initMarkdownAnchors from './markdown/anchors.js';
-import renderMarkdownContent from './markdown/content.js';
+import initMarkupAnchors from './markup/anchors.js';
+import renderMarkupContent from './markup/content.js';
 import attachTribute from './features/tribute.js';
 import createColorPicker from './features/colorpicker.js';
 import createDropzone from './features/dropzone.js';
@@ -51,7 +51,7 @@ function initCommentPreviewTab($form) {
     }, (data) => {
       const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`);
       $previewPanel.html(data);
-      renderMarkdownContent();
+      renderMarkupContent();
     });
   });
 
@@ -81,7 +81,7 @@ function initEditPreviewTab($form) {
       }, (data) => {
         const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`);
         $previewPanel.html(data);
-        renderMarkdownContent();
+        renderMarkupContent();
       });
     });
   }
@@ -1107,7 +1107,7 @@ async function initRepository() {
               dz.emit('submit');
               dz.emit('reload');
             }
-            renderMarkdownContent();
+            renderMarkupContent();
           });
         });
       } else {
@@ -1476,7 +1476,7 @@ function initWikiForm() {
             wiki: true
           }, (data) => {
             preview.innerHTML = `<div class="markup ui segment">${data}</div>`;
-            renderMarkdownContent();
+            renderMarkupContent();
           });
         };
 
@@ -2772,7 +2772,7 @@ $(document).ready(async () => {
   searchTeams();
   searchRepositories();
 
-  initMarkdownAnchors();
+  initMarkupAnchors();
   initCommentForm();
   initInstall();
   initArchiveLinks();
@@ -2830,7 +2830,7 @@ $(document).ready(async () => {
     initServiceWorker(),
     initNotificationCount(),
     initStopwatch(),
-    renderMarkdownContent(),
+    renderMarkupContent(),
     initGithook(),
     initImageDiff(),
   ]);

web_src/less/_base.less

@@ -102,8 +102,8 @@
   --color-active: #00000014;
   --color-menu: #ffffff;
   --color-card: #ffffff;
-  --color-markdown-table-row: #00000008;
-  --color-markdown-code-block: #00000010;
+  --color-markup-table-row: #00000008;
+  --color-markup-code-block: #00000010;
   --color-button: #ffffff;
   --color-code-bg: #ffffff;
   --color-shadow: #00000030;

web_src/less/_repository.less

@@ -580,7 +580,7 @@
           border-right-color: var(--color-box-body);
         }
 
-        .markdown {
+        .markup {
           font-size: 14px;
         }
       }
@@ -1020,7 +1020,7 @@
             }
           }
 
-          .markdown {
+          .markup {
             font-size: 14px;
           }
 
@@ -1040,7 +1040,7 @@
               overflow: hidden;
             }
 
-            .tab.markdown {
+            .tab.markup {
               min-height: 5rem;
             }
           }
@@ -1244,7 +1244,7 @@
       margin-bottom: 1.5rem;
     }
 
-    .markdown {
+    .markup {
       font-size: 14px;
     }
   }
@@ -1996,7 +1996,7 @@
         margin-top: -5px;
       }
 
-      > .markdown {
+      > .markup {
         padding: 15px 30px;
 
         h1,
@@ -2991,7 +2991,7 @@ td.blob-excerpt {
 .webhook-info {
   padding: 7px 12px;
   margin: 10px 0;
-  background-color: var(--color-markdown-code-block);
+  background-color: var(--color-markup-code-block);
   border: 1px solid var(--color-secondary);
   border-radius: 3px;
   font-size: 13px;

web_src/less/_review.less

@@ -81,7 +81,7 @@
   .ui.active.tab {
     padding: .5em;
 
-    &.markdown {
+    &.markup {
       padding: 1em;
       min-height: 168px;
     }
@@ -95,7 +95,7 @@
     border-top: 1px solid var(--color-secondary);
     padding: 10px 0;
 
-    .markdown-info {
+    .markup-info {
       display: inline-block;
       margin: 5px 0;
       font-size: 12px;

web_src/less/features/animations.less

@@ -28,7 +28,7 @@
   border-radius: 100%;
 }
 
-.markdown pre.is-loading,
+.markup pre.is-loading,
 .editor-loading.is-loading {
   height: 12rem;
 }

web_src/less/index.less

@@ -9,7 +9,8 @@
 @import "./features/imagediff.less";
 @import "./features/codeeditor.less";
 @import "./features/projects.less";
-@import "./markdown/mermaid.less";
+@import "./markup/content.less";
+@import "./markup/mermaid.less";
 
 @import "./chroma/base.less";
 @import "./chroma/light.less";
@@ -18,7 +19,6 @@
 @import "_tribute";
 @import "_font_i18n";
 @import "_base";
-@import "_markup";
 @import "_home";
 @import "_install";
 @import "_form";

web_src/less/_markup.less → web_src/less/markup/content.less

@@ -1,4 +1,4 @@
-.markup:not(code) {
+.markup {
   overflow: hidden;
   font-size: 16px;
   line-height: 1.5 !important;
@@ -290,7 +290,7 @@
   }
 
   table tr:nth-child(2n) {
-    background-color: var(--color-markdown-table-row);
+    background-color: var(--color-markup-table-row);
   }
 
   img {
@@ -404,7 +404,7 @@
     padding: .2em .4em;
     margin: 0;
     font-size: 85%;
-    background-color: var(--color-markdown-code-block);
+    background-color: var(--color-markup-code-block);
     border-radius: 4px;
   }
 
@@ -437,7 +437,7 @@
     padding: 16px;
     font-size: 85%;
     line-height: 1.45;
-    background-color: var(--color-markdown-code-block);
+    background-color: var(--color-markup-code-block);
     border-radius: 4px;
   }
 
@@ -477,7 +477,7 @@
     line-height: 10px;
     color: var(--color-text-light);
     vertical-align: middle;
-    background-color: var(--color-markdown-code-block);
+    background-color: var(--color-markup-code-block);
     border: 1px solid var(--color-secondary);
     border-radius: 3px;
     box-shadow: inset 0 -1px 0 var(--color-secondary);

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

@@ -97,8 +97,8 @@
   --color-active: #ffffff16;
   --color-menu: #2e323e;
   --color-card: #2e323e;
-  --color-markdown-table-row: #ffffff06;
-  --color-markdown-code-block: #2a2e3a;
+  --color-markup-table-row: #ffffff06;
+  --color-markup-code-block: #2a2e3a;
   --color-button: #353846;
   --color-code-bg: #2a2e3a;
   --color-shadow: #00000060;
@@ -300,7 +300,7 @@ a.ui.basic.green.label:hover {
   & + .editor-preview-side {
     background: #353945;
 
-    .markdown:not(code).ui.segment {
+    .markup.ui.segment {
       border-width: 0;
     }
   }
@@ -753,7 +753,7 @@ img[src$="/img/matrix.svg"] {
   border-color: #4a4c58 #4a4c58 #d7d7da #d7d7da;
 }
 
-.markdown-block-error {
+.markup-block-error {
   border: 1px solid rgba(121, 71, 66, .5) !important;
   border-bottom: none !important;
 }