Merge branch 'elkowar:master' into master

.github/pull_request_template.md

@@ -4,7 +4,7 @@ Please follow this template, if applicable.
 
 Provide a short description of the changes your PR introduces.
 This includes the actual feature you are adding,
-as well as any other relevant additions that where necessary to implement your feature.
+as well as any other relevant additions that were necessary to implement your feature.
 
 ## Usage
 
@@ -18,7 +18,7 @@ This is not strictly required, but strongly appreciated.
 
 ## Additional Notes
 
-Anything else you want to add, such as remaining questions or explainations.
+Anything else you want to add, such as remaining questions or explanations.
 
 ## Checklist
 

.github/workflows/build.yml

@@ -27,6 +27,6 @@ jobs:
            run: cargo check --no-default-features --features=x11
          - name: Build wayland
            run: cargo check --no-default-features --features=wayland
-         - name: Build no-x11-wayland
-           run: cargo check --no-default-features --features=no-x11-wayland
+         - name: Build no-backend
+           run: cargo check --no-default-features
 

.github/workflows/gh-pages.yml

@@ -6,7 +6,8 @@ on:
         paths:
             - "docs/**"
             - "gen-docs.js"
-            - "src/widgets/widget_definitions.rs"
+            - "crates/eww/src/widgets/widget_definitions.rs"
+            - "crates/eww/src/config/inbuilt.rs"
             - ".github/workflows/**"
 jobs:
     build:
@@ -21,7 +22,7 @@ jobs:
               uses: denoland/setup-deno@main
               with:
                   deno-version: "v1.x"
-            - run: deno run --allow-read --allow-write gen-docs.ts ./src/widgets/widget_definitions.rs ./src/config/inbuilt.rs
+            - run: deno run --allow-read --allow-write gen-docs.ts ./crates/eww/src/widgets/widget_definitions.rs ./crates/eww/src/config/inbuilt.rs
 
             # Build & deploy
             - name: build mdBook page

.gitignore

@@ -1 +1,2 @@
 /target
+/**/target