From 0c8dac3290af204867363f4db3b09a7f253bae39 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 11:05:40 +0300 Subject: [PATCH 01/11] ci: Add stylelint and prettier --- .config/swaync/style.css | 10 ++++++---- .config/waybar/style.css | 8 ++++---- .github/workflows/prettier.yaml | 21 +++++++++++++++++++++ .github/workflows/stylelint.yaml | 19 +++++++++++++++++++ .gitignore | 3 +++ .stylelintrc.json | 9 +++++++++ .github/.yamlfmt.yaml => .yamlfmt.yaml | 0 .github/.yamllint.yaml => .yamllint.yaml | 0 8 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/prettier.yaml create mode 100644 .github/workflows/stylelint.yaml create mode 100644 .stylelintrc.json rename .github/.yamlfmt.yaml => .yamlfmt.yaml (100%) rename .github/.yamllint.yaml => .yamllint.yaml (100%) diff --git a/.config/swaync/style.css b/.config/swaync/style.css index 9c908e1..0a3c759 100644 --- a/.config/swaync/style.css +++ b/.config/swaync/style.css @@ -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); } @@ -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); @@ -144,7 +144,6 @@ font-weight: bold; background: transparent; color: rgb(212, 190, 152); - /* margin-right: 10px; */ } .body { @@ -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; } @@ -195,6 +196,7 @@ } /*** Widgets ***/ + /* Title widget */ .widget-title { color: rgb(212, 190, 152); diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 0e86649..f7d3809 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -20,7 +20,7 @@ #workspaces button:first-child { background: #32302f; - border-left: 0px; + border-left: 0; } #workspaces button.focused { @@ -79,7 +79,7 @@ #tray, #custom-weather { background: #32302f; - padding: 0 3 0 3; + padding: 0 3; } #cpu, @@ -90,7 +90,7 @@ #custom-crypto, #custom-updates { background: #3c3836; - padding: 0 3 0 3; + padding: 0 3; } /* @@ -126,7 +126,7 @@ color: #7daea3; } -tooltip { +#tooltip { background: #32302f; border: 1px solid #252423; } diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml new file mode 100644 index 0000000..a3e0a3a --- /dev/null +++ b/.github/workflows/prettier.yaml @@ -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 diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml new file mode 100644 index 0000000..4dd752a --- /dev/null +++ b/.github/workflows/stylelint.yaml @@ -0,0 +1,19 @@ +--- +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: Run stylelint + uses: actions-hub/stylelint@master diff --git a/.gitignore b/.gitignore index 4d2d4d3..caa172a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ !.gitmodules !.gtkrc-2.0 !.ripgreprc +!.stylelintrc.json +!.yamlfmt.yaml +!.yamllint.yaml !.icons !LICENSE !README.md diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 0000000..323cc1e --- /dev/null +++ b/.stylelintrc.json @@ -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 + } +} diff --git a/.github/.yamlfmt.yaml b/.yamlfmt.yaml similarity index 100% rename from .github/.yamlfmt.yaml rename to .yamlfmt.yaml diff --git a/.github/.yamllint.yaml b/.yamllint.yaml similarity index 100% rename from .github/.yamllint.yaml rename to .yamllint.yaml From d2f4c27adea710dc153547b36261087d13230cce Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 11:13:55 +0300 Subject: [PATCH 02/11] ci: Fix yamlfmt, yamllint and stylelint --- .github/workflows/stylelint.yaml | 2 +- .github/workflows/yamlfmt.yaml | 2 +- .github/workflows/yamllint.yaml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 4dd752a..396288a 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -16,4 +16,4 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Run stylelint - uses: actions-hub/stylelint@master + uses: reviewdog/action-stylelint@v1.29.0 diff --git a/.github/workflows/yamlfmt.yaml b/.github/workflows/yamlfmt.yaml index 3a4c5a9..b7fee11 100644 --- a/.github/workflows/yamlfmt.yaml +++ b/.github/workflows/yamlfmt.yaml @@ -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 . diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index db49023..24f6e57 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/yamllint.yaml @@ -19,4 +19,3 @@ jobs: uses: ibiqlik/action-yamllint@v3 with: strict: true - config_file: .github/.yamllint.yaml From b4b971acad66d4858ddb2bb4b8fccfa6e293c48b Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 11:43:06 +0300 Subject: [PATCH 03/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 396288a..773afaf 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -15,5 +15,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + - name: Install npm + uses: bahmutov/npm-install@v1 + - name: Install stylelint + run: npm init stylelint - name: Run stylelint - uses: reviewdog/action-stylelint@v1.29.0 + run: npx stylelint **/*.scss From 2188563e73fb940cac31fd0bd3091e951995c46c Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 11:45:42 +0300 Subject: [PATCH 04/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 773afaf..3ce22c1 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -15,8 +15,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Install npm - uses: bahmutov/npm-install@v1 - name: Install stylelint run: npm init stylelint - name: Run stylelint From 66b65fea956ff66dead4c0e366a157eec703968a Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 14:41:19 +0300 Subject: [PATCH 05/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 3ce22c1..02417c3 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -18,4 +18,4 @@ jobs: - name: Install stylelint run: npm init stylelint - name: Run stylelint - run: npx stylelint **/*.scss + run: npx stylelint "**/*.scss" --config .stylelintrc.json From 2802fcd37d61ae4c12e54b9648b9c405773b0c36 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 15:02:51 +0300 Subject: [PATCH 06/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 02417c3..6986c1a 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -15,7 +15,5 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Install stylelint - run: npm init stylelint - name: Run stylelint run: npx stylelint "**/*.scss" --config .stylelintrc.json From 29e6e3389b134acdf19213a9bc5a7d7f412a825e Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 15:05:27 +0300 Subject: [PATCH 07/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 6986c1a..c717b16 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -15,5 +15,7 @@ jobs: 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 "**/*.scss" --config .stylelintrc.json From b7fa25a18cf8fc44b9b85c6e721cbe38b2c99810 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 15:13:36 +0300 Subject: [PATCH 08/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index c717b16..3503438 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -18,4 +18,4 @@ jobs: - name: Install Stylelint and config run: npm install stylelint stylelint-config-standard --save-dev - name: Run stylelint - run: npx stylelint "**/*.scss" --config .stylelintrc.json + run: npx stylelint "**/*.css" --config .stylelintrc.json From f740ba02749ad59f4f3d3e464589f07710ba5e50 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 15:26:45 +0300 Subject: [PATCH 09/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 3503438..8596e98 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -18,4 +18,6 @@ jobs: - name: Install Stylelint and config run: npm install stylelint stylelint-config-standard --save-dev - name: Run stylelint - run: npx stylelint "**/*.css" --config .stylelintrc.json + run: > + npx stylelint "**/*.{css,scss}" ".*/*.{css,scss}" + --config .stylelintrc.json From 63845e580ef6864dc3ba90db2b0d61989fb35a85 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 15:36:06 +0300 Subject: [PATCH 10/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 4 +--- .yamllint.yaml | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 8596e98..2191a84 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -18,6 +18,4 @@ jobs: - 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 + run: npx stylelint "**/*.{css,scss}" ".**/*.{css,scss}" --config .stylelintrc.json diff --git a/.yamllint.yaml b/.yamllint.yaml index b1b2dcb..cc2ca91 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -22,3 +22,6 @@ rules: forbid-duplicated-merge-keys: true new-lines: type: unix + line-length: + max: 80 + level: warning From 4a24830a7d47f83e27ec58b78b82cd3737574511 Mon Sep 17 00:00:00 2001 From: CelticBoozer Date: Fri, 11 Oct 2024 15:42:23 +0300 Subject: [PATCH 11/11] ci: Fix stylelint --- .github/workflows/stylelint.yaml | 2 +- .yamlfmt.yaml | 2 +- .yamllint.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/stylelint.yaml b/.github/workflows/stylelint.yaml index 2191a84..69a46fe 100644 --- a/.github/workflows/stylelint.yaml +++ b/.github/workflows/stylelint.yaml @@ -18,4 +18,4 @@ jobs: - 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 + run: npx stylelint "**/*.{css,scss}" ".*/**/*.{css,scss}" --config .stylelintrc.json diff --git a/.yamlfmt.yaml b/.yamlfmt.yaml index b8b3fa6..4427a17 100644 --- a/.yamlfmt.yaml +++ b/.yamlfmt.yaml @@ -4,4 +4,4 @@ continue_on_error: true formatter: include_document_start: true - max_line_length: 80 + max_line_length: 100 diff --git a/.yamllint.yaml b/.yamllint.yaml index cc2ca91..e5256ef 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -20,8 +20,8 @@ rules: spaces: 2 key-duplicates: forbid-duplicated-merge-keys: true - new-lines: - type: unix line-length: - max: 80 + max: 100 level: warning + new-lines: + type: unix