Skip to content

Commit

Permalink
Merge pull request #235 from CelticBoozer/development
Browse files Browse the repository at this point in the history
ci: Add stylelint and prettier
  • Loading branch information
CelticBoozer authored Oct 11, 2024
2 parents 3600486 + 4a24830 commit 8564188
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 11 deletions.
10 changes: 6 additions & 4 deletions .config/swaync/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
color: rgb(212, 190, 152);
border: none;
border-top: 1px solid rgb(80, 73, 69);
border-radius: 0px;
border-radius: 0;
border-right: 1px solid rgb(80, 73, 69);
}

Expand Down Expand Up @@ -104,7 +104,7 @@
background: rgba(80, 73, 69, 0.95);
}

/* Notification close button*/
/* Notification close button */
.close-button {
background: transparent;
color: rgb(212, 190, 152);
Expand Down Expand Up @@ -144,7 +144,6 @@
font-weight: bold;
background: transparent;
color: rgb(212, 190, 152);
/* margin-right: 10px; */
}

.body {
Expand All @@ -162,15 +161,17 @@
-gtk-icon-effect: none;
}

/* Control-center panel which contains the old notifications + widgets*/
/* Control-center panel which contains the old notifications + widgets */
.control-center {
background: rgba(37, 36, 35, 0.85);
color: rgb(212, 190, 152);
border-radius: 12px;
}

.control-center-list-placeholder {
opacity: 0.5;
}

.control-center-list {
background: transparent;
}
Expand All @@ -195,6 +196,7 @@
}

/*** Widgets ***/

/* Title widget */
.widget-title {
color: rgb(212, 190, 152);
Expand Down
8 changes: 4 additions & 4 deletions .config/waybar/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#workspaces button:first-child {
background: #32302f;
border-left: 0px;
border-left: 0;
}

#workspaces button.focused {
Expand Down Expand Up @@ -79,7 +79,7 @@
#tray,
#custom-weather {
background: #32302f;
padding: 0 3 0 3;
padding: 0 3;
}

#cpu,
Expand All @@ -90,7 +90,7 @@
#custom-crypto,
#custom-updates {
background: #3c3836;
padding: 0 3 0 3;
padding: 0 3;
}

/*
Expand Down Expand Up @@ -126,7 +126,7 @@
color: #7daea3;
}

tooltip {
#tooltip {
background: #32302f;
border: 1px solid #252423;
}
21 changes: 21 additions & 0 deletions .github/workflows/prettier.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: prettier
# yamllint disable-line rule:truthy
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
format_check:
name: Check CSS/json/etc files with prettier
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Run prettier
uses: creyD/prettier_action@v4.3
with:
prettier_options: --check
21 changes: 21 additions & 0 deletions .github/workflows/stylelint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: stylelint
# yamllint disable-line rule:truthy
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
lint:
name: Check CSS with stylelint
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Stylelint and config
run: npm install stylelint stylelint-config-standard --save-dev
- name: Run stylelint
run: npx stylelint "**/*.{css,scss}" ".*/**/*.{css,scss}" --config .stylelintrc.json
2 changes: 1 addition & 1 deletion .github/workflows/yamlfmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
- name: Install yamlfmt
run: go install github.com/google/yamlfmt/cmd/yamlfmt@latest
- name: Run yamlfmt
run: yamlfmt -conf .github/.yamlfmt.yaml -lint .
run: yamlfmt -lint .
1 change: 0 additions & 1 deletion .github/workflows/yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ jobs:
uses: ibiqlik/action-yamllint@v3
with:
strict: true
config_file: .github/.yamllint.yaml
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
!.gitmodules
!.gtkrc-2.0
!.ripgreprc
!.stylelintrc.json
!.yamlfmt.yaml
!.yamllint.yaml
!.icons
!LICENSE
!README.md
Expand Down
9 changes: 9 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "stylelint-config-standard",
"rules": {
"color-function-notation": "legacy",
"alpha-value-notation": null,
"selector-type-no-unknown": null,
"font-family-no-missing-generic-family-keyword": null
}
}
2 changes: 1 addition & 1 deletion .github/.yamlfmt.yaml → .yamlfmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
continue_on_error: true
formatter:
include_document_start: true
max_line_length: 80
max_line_length: 100
3 changes: 3 additions & 0 deletions .github/.yamllint.yaml → .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ rules:
spaces: 2
key-duplicates:
forbid-duplicated-merge-keys: true
line-length:
max: 100
level: warning
new-lines:
type: unix

0 comments on commit 8564188

Please sign in to comment.