Skip to content

Commit

Permalink
Merge branch '3.2' into 3
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
GuySartorelli committed Jun 20, 2024
2 parents 5b1ba27 + a1b87a7 commit a3cd77c
Show file tree
Hide file tree
Showing 7 changed files with 488 additions and 833 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/add-prs-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Add new PRs to github project

on:
pull_request_target:
types:
- opened
- ready_for_review

permissions: {}

jobs:
addprtoproject:
name: Add PR to GitHub Project
# Only run on the silverstripe account
if: github.repository_owner == 'silverstripe'
runs-on: ubuntu-latest
steps:
- name: Add PR to github project
uses: silverstripe/gha-add-pr-to-project@v1
with:
app_id: ${{ vars.PROJECT_PERMISSIONS_APP_ID }}
private_key: ${{ secrets.PROJECT_PERMISSIONS_APP_PRIVATE_KEY }}
3 changes: 0 additions & 3 deletions .stylelintignore

This file was deleted.

2 changes: 1 addition & 1 deletion client/dist/styles/bundle.css

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

4 changes: 2 additions & 2 deletions client/src/components/BannerBlock/Frontend.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

.banner-element__call-to-action {
padding: 10px;
background: red;
color: white !important;
background: #f00;
color: #fff !important;
display: inline-block;
text-decoration: none;
margin-bottom: 10px;
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/BlockLinkField/BlockLinkField.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
}
}

.block-link-field__icon::before {
.block-link-field__icon:before {
content: "2"; // font-icon-link
font-family: silverstripe;
font-family: "silverstripe";
font-size: $font-size-lg * 1.2;
left: $btn-icon-spacing;
margin-right: $btn-icon-spacing * 3;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "yarn && NODE_ENV=development webpack --watch --progress",
"css": "WEBPACK_CHILD=css npm run build",
"test": "jest",
"lint": "eslint client/src; stylelint **/client/src/**/*.scss",
"lint": "eslint client/src; stylelint client/src",
"lint-js-fix": "eslint client/src --fix"
},
"repository": {
Expand Down Expand Up @@ -36,7 +36,7 @@
"reactstrap": "^8.9.0"
},
"devDependencies": {
"@silverstripe/eslint-config": "^1.2.1",
"@silverstripe/eslint-config": "^1.3.0",
"@silverstripe/webpack-config": "^2.1.0",
"@testing-library/react": "^14.0.0",
"babel-jest": "^29.2.2",
Expand Down
Loading

0 comments on commit a3cd77c

Please sign in to comment.