Skip to content

Commit

Permalink
Merge pull request #33 from denco/feature/color-fix
Browse files Browse the repository at this point in the history
feature/color fix
fix #32
  • Loading branch information
denco authored Apr 2, 2021
2 parents bf85f46 + e42d876 commit eaa3693
Show file tree
Hide file tree
Showing 13 changed files with 467 additions and 180 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
on:
workflow_run:
workflows: ["Markup parsing tests"]
branches: [main]
types:
- completed
push:
tags:
- "*"
# https://stackoverflow.com/questions/58457140/dependencies-between-workflows-on-github-actions
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#workflow_run
# https://github.com/actions/create-release

jobs:
publish:
name: Publish Extension
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Install Dependencies
run: npm ci
# - name: Package Extension
# run: npm run package
- name: Publish to Visual Studio Marketplace
run: ./node_modules/.bin/vsce publish -p ${{ secrets.VSCE_PAT }}
- name: Publish to Open VSX Registry
run: ./node_modules/.bin/ovsx publish -p ${{ secrets.OVSX_PAT }}
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Install Dependencies
run: npm ci
- name: Run Linting Checks
run: npm run lint
- name: Run Tests
run: npm run test
- name: Checkout
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Install Dependencies
run: npm ci
- name: Run Linting Checks
run: npm run lint
- name: Run Tests
run: npm run test
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Confluence Wiki Markup

## [0.1.11](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.11)

- enchange color macro with support for rgb and hex colors [Support to {color:}](https://github.com/denco/vscode-confluence-markup/issues/32)
- adjust css, word breakes on space for code/noformat macros
- fix regex for code/noformat macro

## [0.1.10](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.10)

- fix [Error by display of multiply links or escaped link markup in the same line](https://github.com/denco/vscode-confluence-markup/issues/28)
Expand Down
2 changes: 1 addition & 1 deletion media/css/confluence.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pre > code {
background:rgba(0, 0, 0, 0.15);
word-wrap: break-word;
overflow-wrap: break-word;
word-break: break-all;
word-break: break-space;
white-space: normal;
margin: 0px 5px;
padding: 5px 1em;
Expand Down
Loading

0 comments on commit eaa3693

Please sign in to comment.