diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 2a81e55..3161c54 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -18,6 +18,10 @@ jobs: - run: | sudo apt-get install zip -y zip -r AntCMS.zip . + - run: | + npm install -D tailwindcss + rm -f ./src/Themes/Default/Assets/Dist/tailwind.css + npx tailwindcss -i ./src/Themes/Default/Assets/tailwind.css -o ./src/Themes/Default/Assets/Dist/tailwind.css --minify working-directory: ./src - uses: ncipollo/release-action@v1 with: diff --git a/src/Themes/Bootstrap/Templates/default_layout.html b/src/Themes/Bootstrap/Templates/default_layout.html new file mode 100644 index 0000000..ce52115 --- /dev/null +++ b/src/Themes/Bootstrap/Templates/default_layout.html @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + <!--AntCMS-Title--> + + + + + + + +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/Themes/Bootstrap/Templates/nav_layout.html b/src/Themes/Bootstrap/Templates/nav_layout.html new file mode 100644 index 0000000..9809633 --- /dev/null +++ b/src/Themes/Bootstrap/Templates/nav_layout.html @@ -0,0 +1,3 @@ +
  • + +
    • diff --git a/src/Themes/Tailwind/Assets/Dist/tailwind.css b/src/Themes/Default/Assets/Dist/tailwind.css similarity index 100% rename from src/Themes/Tailwind/Assets/Dist/tailwind.css rename to src/Themes/Default/Assets/Dist/tailwind.css diff --git a/src/Themes/Tailwind/Assets/tailwind.css b/src/Themes/Default/Assets/tailwind.css similarity index 100% rename from src/Themes/Tailwind/Assets/tailwind.css rename to src/Themes/Default/Assets/tailwind.css diff --git a/src/Themes/Default/Templates/default_layout.html b/src/Themes/Default/Templates/default_layout.html index ce52115..a7e2368 100644 --- a/src/Themes/Default/Templates/default_layout.html +++ b/src/Themes/Default/Templates/default_layout.html @@ -1,5 +1,5 @@ - + @@ -8,26 +8,24 @@ - - + <!--AntCMS-Title--> - + - -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    - + + \ No newline at end of file diff --git a/src/Themes/Default/Templates/nav_layout.html b/src/Themes/Default/Templates/nav_layout.html index 9809633..bbb31d2 100644 --- a/src/Themes/Default/Templates/nav_layout.html +++ b/src/Themes/Default/Templates/nav_layout.html @@ -1,3 +1,3 @@ -
  • - -
    • +
  • + +
    • \ No newline at end of file diff --git a/src/Themes/Tailwind/Templates/default_layout.html b/src/Themes/Tailwind/Templates/default_layout.html deleted file mode 100644 index a7e2368..0000000 --- a/src/Themes/Tailwind/Templates/default_layout.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - <!--AntCMS-Title--> - - - - - - - -
    -
    -
    -
    -
    -
    -
    - -
    -
    - Powered by - AntCMS - -
    -
    - - - - \ No newline at end of file diff --git a/src/Themes/Tailwind/Templates/nav_layout.html b/src/Themes/Tailwind/Templates/nav_layout.html deleted file mode 100644 index bbb31d2..0000000 --- a/src/Themes/Tailwind/Templates/nav_layout.html +++ /dev/null @@ -1,3 +0,0 @@ -
  • - -
    • \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 3b7e03f..b7f5dbe 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,10 +1,10 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: ["./src/Themes/Tailwind/Templates/*.{html,js}"], + content: ["./src/Themes/Default/Templates/*.{html,js}"], theme: { extend: {}, }, plugins: [ require('@tailwindcss/typography'), ], -} \ No newline at end of file +}