Skip to content

Commit eaa3693

Browse files
authored
Merge pull request #33 from denco/feature/color-fix
feature/color fix fix #32
2 parents bf85f46 + e42d876 commit eaa3693

File tree

13 files changed

+467
-180
lines changed

13 files changed

+467
-180
lines changed

.github/workflows/cd.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
on:
2+
workflow_run:
3+
workflows: ["Markup parsing tests"]
4+
branches: [main]
5+
types:
6+
- completed
7+
push:
8+
tags:
9+
- "*"
10+
# https://stackoverflow.com/questions/58457140/dependencies-between-workflows-on-github-actions
11+
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#workflow_run
12+
# https://github.com/actions/create-release
13+
14+
jobs:
15+
publish:
16+
name: Publish Extension
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Node.js
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: 14.x
25+
- name: Install Dependencies
26+
run: npm ci
27+
# - name: Package Extension
28+
# run: npm run package
29+
- name: Publish to Visual Studio Marketplace
30+
run: ./node_modules/.bin/vsce publish -p ${{ secrets.VSCE_PAT }}
31+
- name: Publish to Open VSX Registry
32+
run: ./node_modules/.bin/ovsx publish -p ${{ secrets.OVSX_PAT }}

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
os: [macos-latest, ubuntu-latest, windows-latest]
1717
runs-on: ${{ matrix.os }}
1818
steps:
19-
- name: Checkout
20-
uses: actions/checkout@v2
21-
- name: Install Node.js
22-
uses: actions/setup-node@v1
23-
with:
24-
node-version: 14.x
25-
- name: Install Dependencies
26-
run: npm ci
27-
- name: Run Linting Checks
28-
run: npm run lint
29-
- name: Run Tests
30-
run: npm run test
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Node.js
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: 14.x
25+
- name: Install Dependencies
26+
run: npm ci
27+
- name: Run Linting Checks
28+
run: npm run lint
29+
- name: Run Tests
30+
run: npm run test

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Confluence Wiki Markup
22

3+
## [0.1.11](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.11)
4+
5+
- enchange color macro with support for rgb and hex colors [Support to {color:}](https://github.com/denco/vscode-confluence-markup/issues/32)
6+
- adjust css, word breakes on space for code/noformat macros
7+
- fix regex for code/noformat macro
8+
39
## [0.1.10](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.10)
410

511
- fix [Error by display of multiply links or escaped link markup in the same line](https://github.com/denco/vscode-confluence-markup/issues/28)

media/css/confluence.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pre > code {
5353
background:rgba(0, 0, 0, 0.15);
5454
word-wrap: break-word;
5555
overflow-wrap: break-word;
56-
word-break: break-all;
56+
word-break: break-space;
5757
white-space: normal;
5858
margin: 0px 5px;
5959
padding: 5px 1em;

0 commit comments

Comments
 (0)