Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Windi to Tailwind #4614

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
7658ab7
windi -> tailwind
pat-s Dec 23, 2024
251b3bb
missed files
pat-s Dec 23, 2024
11db140
refactor custom hover class
pat-s Dec 23, 2024
96ac374
standalone tailwind.css
pat-s Dec 23, 2024
6e64b94
use .js
pat-s Dec 23, 2024
200f08f
working build
pat-s Dec 23, 2024
18c5727
format
pat-s Dec 23, 2024
3a73832
fix too large padding
pat-s Dec 23, 2024
160837b
fix overflowing input field
pat-s Dec 23, 2024
877981f
max-w-full
pat-s Dec 23, 2024
44e78f5
yamllint ignore pnpm lock
pat-s Dec 23, 2024
627a9d3
use custom w-fill
pat-s Dec 23, 2024
ccac6de
readd p-4
pat-s Dec 23, 2024
76c5952
fix login div
pat-s Dec 23, 2024
4b53893
use scoped admin repos style
pat-s Dec 23, 2024
ec66deb
w and h for login
pat-s Dec 23, 2024
e1a09d7
fromat
pat-s Dec 23, 2024
c6c5c82
override padding for pipeline list
pat-s Dec 23, 2024
7b05372
move p-4 to scoped class
pat-s Dec 23, 2024
f514def
clean
pat-s Dec 23, 2024
99fd2d5
delete package.json
pat-s Dec 24, 2024
a270216
fix yamllint ignore
pat-s Dec 24, 2024
8229584
Merge branch 'main' into refactor/windi-to-tailwind
pat-s Dec 24, 2024
798cd3c
fix lockfiles
pat-s Dec 24, 2024
141e134
lint
pat-s Dec 24, 2024
99afa10
border-b-1 -> border-b
pat-s Dec 25, 2024
a521d1b
fix admin-agent list padding
pat-s Dec 25, 2024
52876d4
remove rounded-non override for pipeline list
pat-s Dec 25, 2024
0cd2fec
also add sub-styles for admin orgs and admin users
pat-s Dec 25, 2024
e728910
Merge branch 'main' into refactor/windi-to-tailwind
pat-s Dec 28, 2024
8649dd8
update
pat-s Dec 28, 2024
d345998
fix webkit colors
pat-s Dec 28, 2024
52908b3
Merge branch 'main' into refactor/windi-to-tailwind
pat-s Dec 28, 2024
1a763da
use tailwind.config.ts and fix important modifier
xoxys Dec 28, 2024
c57745e
cleanup unused eslint-disable directive
xoxys Dec 28, 2024
947c62d
switch back to ignore-from-file and add .yamlignore
xoxys Dec 28, 2024
648087a
drop vite-plugin-windicss
xoxys Dec 28, 2024
7a09948
use pre-defined class
xoxys Dec 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ vscode:
- 'EditorConfig.EditorConfig'
- 'dbaeumer.vscode-eslint'
- 'esbenp.prettier-vscode'
- 'voorjaar.windicss-intellisense'
- 'bradlc.vscode-tailwindcss'
- 'Vue.volar'
- 'redhat.vscode-yaml'
- 'davidanson.vscode-markdownlint'
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"voorjaar.windicss-intellisense",
"bradlc.vscode-tailwindcss",
"Vue.volar",
"redhat.vscode-yaml",
"davidanson.vscode-markdownlint"
Expand Down
1 change: 1 addition & 0 deletions .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ignore-from-file:
- .gitignore
- server/store/datastore/migration/test-files/.gitignore
- web/.gitignore
- web/pnpm-lock.yaml
xoxys marked this conversation as resolved.
Show resolved Hide resolved

rules:
line-length: disable
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/92-development/03-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ The following list contains some tools and frameworks used by the Woodpecker UI.
- use `setup` and composition api
- place (re-usable) components in `web/src/components/`
- views should have a route in `web/src/router.ts` and are located in `web/src/views/`
- [Windicss](https://windicss.org/) (similar to Tailwind)
- use Windicss classes where possible
- if needed extend the Windicss config to use new classes
- [Tailwind CSS](https://tailwindcss.com/)
- use Tailwind classes where possible
- if needed extend the Tailwind config to use new classes
- [Vite](https://vitejs.dev/) (similar to Webpack)
- [Typescript](https://www.typescriptlang.org/)
- avoid using `any` and `unknown` (the linter will prevent you from doing so anyways :wink:)
Expand Down
5 changes: 5 additions & 0 deletions package.json
xoxys marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"tailwindcss": "^3.4.17"
}
}
10 changes: 8 additions & 2 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,24 @@
"@intlify/unplugin-vue-i18n": "^6.0.0",
"@kyvg/vue3-notification": "^3.2.1",
"@mdi/js": "^7.4.47",
"@tailwindcss/postcss": "4.0.0-beta.8",
"@tailwindcss/typography": "^0.5.15",
"@tailwindcss/vite": "4.0.0-beta.8",
"@vueuse/core": "^12.0.0",
"ansi_up": "^6.0.2",
"autoprefixer": "^10.4.20",
"dompurify": "^3.2.0",
"fuse.js": "^7.0.0",
"js-base64": "^3.7.7",
"lodash": "^4.17.21",
"marked": "^15.0.0",
"node-emoji": "^2.1.3",
"pinia": "^2.2.1",
"postcss": "^8.4.49",
"prismjs": "^1.29.0",
"semver": "^7.6.3",
"simple-icons": "^13.5.0",
"tailwindcss": "^3.4.17",
"vue": "^3.4.38",
"vue-i18n": "^10.0.3",
"vue-router": "^4.4.3"
Expand All @@ -57,14 +63,14 @@
"jsdom": "^25.0.0",
"prettier": "^3.3.3",
"tinycolor2": "^1.6.0",
"ts-node": "^10.9.2",
"typescript": "5.6.3",
"vite": "^6.0.0",
"vite-plugin-prismjs": "^0.0.11",
"vite-plugin-windicss": "^1.9.3",
"vite-svg-loader": "^5.1.0",
"vitest": "^2.0.5",
"vue-tsc": "^2.0.29",
"windicss": "^3.5.6"
"vue-tsc": "^2.0.29"
},
"pnpm": {
"overrides": {
Expand Down
Loading