Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .github/actions/compile-themes/action.yml

This file was deleted.

12 changes: 1 addition & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,4 @@ jobs:
with:
node-version: 16
- run: npm ci
- run: npx prettier . --write

compile-themes:
runs-on: ubuntu-latest
name: Compile themes
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: compile sass
uses: ./.github/actions/compile-themes
- run: npx prettier . --write
26 changes: 23 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,27 @@ jobs:
name: compile themes
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v3

- name: Install dependencies
run: npm install

- name: Fetch PR branches
run: git fetch origin +refs/pull/*/head:refs/remotes/origin/pr/*

- name: compile sass
uses: ./.github/actions/compile-themes
- name: Determine PR number
id: get_pr_number
run: echo "::set-output name=pr_number::$(echo $GITHUB_REF | cut -d'/' -f3)"

- name: Checkout PR branch
run: git checkout origin/pr/${{ steps.get_pr_number.outputs.pr_number }}

- name: Compile Sass
run: npm run compile:sass

- name: Add and commit changes
run: |
git config --global user.name "MarkusJohansen"
git config --global user.email "markusarj@gmail.com"
git add build/*.css && git diff --quiet --cached || git commit -am "🤖 Automatic compilation of Sass files"
git push origin HEAD:refs/heads/pr/${{ steps.get_pr_number.outputs.pr_number }}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"description": "A classless CSS-framework for clean, soft and modern design!",
"main": "Chimera.css",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\" && exit 1",
"compile:sass": "sass src/themes/chimera.scss build/chimera.css && sass src/themes/chimera-dark.scss build/chimera-dark.css && sass src/themes/chimera-golden.scss build/chimera-golden.css && sass src/themes/chimera-autumn.scss build/chimera-autumn.css && sass src/themes/chimera-plain.scss build/chimera-plain.css && sass src/themes/chimera-blues.scss build/chimera-blues.css && sass src/themes/chimera-nightsky.scss build/chimera-nightsky.css"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/themes/chimera-golden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $Chimera-darker: hsl(22, 80%, 50%);
$Chimera-input-border: hsl(0, 0%, 51%);
$Chimera-text: hsl(22, 80%, 80%);
$Chimera-text-secondary: #333333;
$Chimera-text-disabled: hsl(0, 0%, 30%);
$Chimera-text-disabled: hsl(0, 0%, 32%);
$Chimera-bg: hsl(0, 0%, 0%);
$Chimera-bg-secondary: hsl(0, 0%, 10%);
$Chimera-bg-disabled: hsl(0, 0%, 30%);
Expand Down