Merge pull request #53 from denco/feature/valide_html

feature/valide html

Author: denco

.gitattributes

@@ -1,3 +1,4 @@
 * text=auto
+**/common/**/*.confluence	text eol=lf
 **/nix/**/*.confluence	text eol=lf
 **/win/**/*.confluence	text eol=crlf

.github/workflows/cd.yml

@@ -29,9 +29,12 @@ jobs:
         run: npm ci
       - name: Build extension package
         run: npm run build
+      - name: Build checksum
+        run: sha512sum confluence-markup-${{ steps.release-version.outputs.version }}.vsix > confluence-markup-${{ steps.release-version.outputs.version }}.vsix.sha512
       # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions
       - name: Get release version
-        run: echo "::set-output name=version::${GITHUB_REF#refs/*/}"
+      # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-output-parameter
+        run: echo "version=${GITHUB_REF#refs/*/}" >> "$GITHUB_OUTPUT"
         id: release-version
       - name: Create release notes for version ${{ steps.release-version.outputs.version }}
         # run: npm run --silent changelog > RELEASE_NOTES_${{ steps.release-version.outputs.version }}.md
@@ -47,8 +50,8 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           name: ${{ steps.release-version.outputs.version }}
-          artifact: "confluence-markup-${{ steps.release-version.outputs.version }}.vsix"
-          artifactContentType: application/zip
+          artifacts: "confluence-markup-${{ steps.release-version.outputs.version }}.vsix,confluence-markup-${{ steps.release-version.outputs.version }}.vsix.sha512"
+          # artifactContentType: application/zip
           bodyFile: "RELEASE_NOTES_${{ steps.release-version.outputs.version }}.md"
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to Visual Studio Marketplace

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Confluence Wiki Markup
 
+## [1.0.3](https://github.com/denco/vscode-confluence-markup/releases/tag/1.0.3)
+
+- fix render emoticons and local image files
+- render to valid html
+- disable output channel log on disposed panel
+- code cosmetic
+
 ## [1.0.2](https://github.com/denco/vscode-confluence-markup/releases/tag/1.0.2)
 
 - add render tip, note, info and warning macros [he info, tip, note, and warning macros are not rendered](https://github.com/denco/vscode-confluence-markup/issues/41)

media/css/confluence.css

@@ -1,10 +1,15 @@
 body {
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-	padding: 0 26px;
+	padding: 0 30px;
 	line-height: 1em;
 	word-wrap: break-word;
 }
 
+div {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
 img {
 	max-width: 100%;
 	max-height: 100%;
@@ -14,7 +19,11 @@ a {
 	color: #4080D0;
 	text-decoration: none;
 }
-a:focus, input:focus, select:focus, textarea:focus {
+
+a:focus,
+input:focus,
+select:focus,
+textarea:focus {
 	outline: 1px solid -webkit-focus-ring-color;
 	outline-offset: -1px;
 }
@@ -32,7 +41,9 @@ h1 {
 	border-bottom-style: solid;
 }
 
-h1, h2, h3 {
+h1,
+h2,
+h3 {
 	font-weight: normal;
 }
 
@@ -41,12 +52,22 @@ blockquote {
 	border-left: 5px solid;
 }
 
-table, th, td {
+table,
+th,
+td {
 	border: 1px solid;
 	border-collapse: collapse;
 	padding: 7px;
 }
 
+.vscode-light th {
+	background-color: rgba(0, 0, 0, 0.18);
+}
+
+.vscode-dark th {
+	background-color: rgba(255, 255, 255, 0.18);
+}
+
 .code-block {
 	display: block;
 	width: 90%;
@@ -55,7 +76,7 @@ table, th, td {
 
 .code-title {
 	display: block;
-	background:#c6c3c3;
+	background: #c6c3c3;
 	color: black;
 	font-weight: bold;
 	border-bottom-color: #ccc;
@@ -68,9 +89,9 @@ pre {
 	margin: 0px;
 }
 
-pre > code {
+pre>code {
 	display: block;
-	background:rgba(0, 0, 0, 0.15);
+	background: rgba(0, 0, 0, 0.15);
 	word-wrap: break-word;
 	overflow-wrap: break-word;
 	word-break: break-space;
@@ -82,7 +103,11 @@ pre > code {
 	line-height: 1.5em;
 }
 
-.panel, .tip, .info, .note, .warning {
+.panel,
+.tip,
+.info,
+.note,
+.warning {
 	display: inline-block;
 	width: 90%;
 	color: black;
@@ -96,42 +121,54 @@ pre > code {
 	font-weight: bold;
 	padding: 5px 3px;
 	border-style: solid;
-	/* border-bottom: none; */
 }
 
 .panel-body {
 	background-color: lightgrey;
 	padding: 3px;
 	border-style: solid;
-	border-top: none;
 }
 
-.info, .info-title, .info-body {
+.info,
+.info-title,
+.info-body {
 	border-color: #aab8c6;
 	border-style: solid;
 	background-color: #fcfcfc;
 }
 
-.tip, .tip-title, .tip-body {
+.tip,
+.tip-title,
+.tip-body {
 	border-color: #91c89c;
 	border-style: solid;
 	background-color: #f3f9f4;
 }
 
-.note, .note-title, .note-body {
+.note,
+.note-title,
+.note-body {
 	border-color: #ffeaae;
 	border-style: solid;
 	background-color: #fffdf6;
 }
 
-.warning, .warning-title, .warning-body {
+.warning,
+.warning-title,
+.warning-body {
 	border-color: #d04437;
 	border-style: solid;
 	background-color: #fff8f7;
 }
 
-.info-title, .tip-title, .note-title, .warning-title,
-.info-title-iconless, .tip-title-iconless, .note-title-iconless, .warning-title-iconless {
+.info-title,
+.tip-title,
+.note-title,
+.warning-title,
+.info-title-iconless,
+.tip-title-iconless,
+.note-title-iconless,
+.warning-title-iconless {
 	font-weight: bold;
 	padding: 2px;
 	margin: 0px;
@@ -143,7 +180,10 @@ pre > code {
 	border-bottom: none;
 }
 
-.info-body, .tip-body, .note-body, .warning-body {
+.info-body,
+.tip-body,
+.note-body,
+.warning-body {
 	padding: 2px;
 	margin: 0px;
 	padding-left: 35px;
@@ -154,34 +194,47 @@ pre > code {
 	border-top: none;
 }
 
-.info-title:before, .tip-title:before, .note-title:before, .warning-title:before,
-.info-title-iconless:before, .tip-title-iconless:before, .note-title-iconless:before, .warning-title-iconless:before {
+.info-title:before,
+.tip-title:before,
+.note-title:before,
+.warning-title:before,
+.info-title-iconless:before,
+.tip-title-iconless:before,
+.note-title-iconless:before,
+.warning-title-iconless:before {
 	margin-left: -16px;
 	margin-right: 5px;
 	vertical-align: middle;
 }
 
-.info-title:before, .info-title-iconless:before {
+.info-title:before,
+.info-title-iconless:before {
 	content: url('./../icons/macro-info.png');
 }
 
-.tip-title:before, .tip-title-iconless:before {
+.tip-title:before,
+.tip-title-iconless:before {
 	content: url('./../icons/macro-tip.png');
 }
 
-.note-title:before, .note-title-iconless:before {
+.note-title:before,
+.note-title-iconless:before {
 	content: url('./../icons/macro-note.png');
 }
 
-.warning-title:before, .warning-title-iconless:before {
+.warning-title:before,
+.warning-title-iconless:before {
 	content: url('./../icons/macro-warning.png');
 }
 
-.info-title-iconless:before, .tip-title-iconless:before,.note-title-iconless:before, .warning-title-iconless:before {
+.info-title-iconless:before,
+.tip-title-iconless:before,
+.note-title-iconless:before,
+.warning-title-iconless:before {
 	opacity: 0.0;
 }
 
-pre > code > p {
+pre>code>p {
 	margin: .5em 0;
 }
 
@@ -197,10 +250,10 @@ ol.initial {
 	list-style: decimal;
 }
 
-ol.initial > ol {
+ol.initial>li>ol {
 	list-style-type: lower-alpha;
 }
 
-ol.initial > ol > ol {
+ol.initial>li>ol>li>ol {
 	list-style-type: lower-roman;
 }