clean for theme creation

Makerspace-Amiens · Jul 3, 2024 · 5c66579 · 5c66579
1 parent 43d384c
commit 5c66579
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 343 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,8 +9,6 @@ jobs:
   # Build job
   build:
     runs-on: ubuntu-latest
-    env:
-      working-directory: ./docs
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -20,7 +18,5 @@ jobs:
           ruby-version: '3.3' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
-          working-directory: ${{env.working-directory}}
       - name: Build with Jekyll
-        run: bundle exec jekyll build
-        working-directory: ${{env.working-directory}}
+        run: bundle exec jekyll build
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -8,10 +8,7 @@ name: Deploy Jekyll site to Pages
 
 on:
   push:
-    branches:
-      - "main"
-    paths:
-      - "docs/**"
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -31,8 +28,6 @@ jobs:
   # Build job
   build:
     runs-on: ubuntu-latest
-    env:
-      working-directory: ./docs
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,7 +37,6 @@ jobs:
           ruby-version: '3.3' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
-          working-directory: ${{env.working-directory}}
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v5
@@ -51,12 +45,9 @@ jobs:
         run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
         env:
           JEKYLL_ENV: production
-        working-directory: ${{env.working-directory}}
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v3
-        with:
-          path: "docs/_site/"
 
   # Deployment job
   deploy:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+Gemfile.lock
 _site/
 .sass-cache/
 .jekyll-cache/

diff --git a/docs/Gemfile → Gemfile b/docs/Gemfile → Gemfile
diff --git a/docs/_config.yml → _config.yml b/docs/_config.yml → _config.yml
@@ -5,7 +5,3 @@ theme: just-the-docs
 url: https://github.com/Makerspace-Amiens/CraftTheDocs-V1.0
 
 color_scheme: custom_scheme
-
-# Include custom CSS
-sass:
-  sass_dir: _sass
diff --git a/docs/_sass/color_schemes/custom_scheme.scss → _sass/color_schemes/custom_scheme.scss b/docs/_sass/color_schemes/custom_scheme.scss → _sass/color_schemes/custom_scheme.scss
diff --git a/docs/_sass/custom/custom.scss → _sass/custom/custom.scss b/docs/_sass/custom/custom.scss → _sass/custom/custom.scss
diff --git a/docs/_sass/custom/setup.scss → _sass/custom/setup.scss b/docs/_sass/custom/setup.scss → _sass/custom/setup.scss
diff --git a/docs/assets/css/custom.css → assets/css/custom.css b/docs/assets/css/custom.css → assets/css/custom.css
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock