Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into ckeditor5
  • Loading branch information
khalima committed Oct 26, 2023
2 parents e2c2bc9 + 12c03f3 commit a41131c
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 13 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/v6-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: v6 sync

on:
push:
branches: [ "main" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: '6.x'

- name: Merge main to 6.x branch
run: |
# Set git user from the latest commit
git config user.name "$(git --no-pager log --format=format:'%an' -n 1)"
git config user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
git pull origin main
git push origin 6.x
10 changes: 7 additions & 3 deletions backstop_data/backstop_dynamic_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ function getConfig(hostname, type) {
'.breadcrumb__container',
'.block--react-and-share',
'.footer',
'.sliding-popup-bottom'
'.sliding-popup-bottom',
'iframe',
];

// All of our breakpoints
Expand Down Expand Up @@ -239,7 +240,7 @@ function getConfig(hostname, type) {
'url': `https://${hostname}/en/dc-components/dc-announcements`,
'removeSelectors': removeDefault,
'selectors': [
'.block-hdbt-subtheme-announcements'
'#block-hdbt-subtheme-announcements'
],
'selectorExpansion': expandComponents,
},
Expand Down Expand Up @@ -369,6 +370,9 @@ function getConfig(hostname, type) {
'label': 'DC: Phasing',
'url': `https://${hostname}/en/dc-components/dc-phasing`,
'removeSelectors': removeDefault,
'selectors': [
'.components'
],
'selectorExpansion': expandComponents,
},
{
Expand Down Expand Up @@ -412,7 +416,7 @@ function getConfig(hostname, type) {
'url': `https://${hostname}/en/dc-components/dc-text`,
'removeSelectors': removeDefault,
'selectors': [
'.component--paragraph-text'
'.components'
],
'selectorExpansion': expandComponents,
},
Expand Down
2 changes: 1 addition & 1 deletion dist/css/ckeditor.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/styles.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions src/scss/06_components/pages/_service-channel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@
font-weight: 500;
}

.service-channel--printable_form .service-channel__link::after {
@include pseudo-icon('printableform', calc(var(--line-height) * 1em), currentColor, inline-block);
}

.service-channel__address {
.address > span {
display: block;
Expand Down

0 comments on commit a41131c

Please sign in to comment.