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.

Sign up for GitHub

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

Jump to bottom

fix(styling): properly import Vanilla-Calendar CSS and only once #1492

Merged
merged 3 commits into from
Apr 29, 2024
Merged

fix(styling): properly import Vanilla-Calendar CSS and only once #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd935a7
fix(styling): properly import Vanilla-Calendar CSS and only once
ghiscoding-SE Apr 29, 2024
fe9f8f5
chore(deps): update Vanilla-Calendar to fix a few SF issues
ghiscoding-SE Apr 29, 2024
4c99671
chore(deps): update Vanilla-Calendar to fix a few SF issues
ghiscoding-SE Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/vite-demo-vanilla-bundle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"moment-tiny": "^2.30.3",
"multiple-select-vanilla": "^3.1.0",
"rxjs": "^7.8.1",
"vanilla-calendar-picker": "^2.11.2",
"vanilla-calendar-picker": "^2.11.4",
"whatwg-fetch": "^3.6.20"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"typescript-eslint": "^7.7.1",
"vanilla-calendar-picker": "^2.11.2",
"vanilla-calendar-picker": "^2.11.4",
"whatwg-fetch": "^3.6.20"
},
"funding": {
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"multiple-select-vanilla": "^3.1.0",
"sortablejs": "^1.15.2",
"un-flatten-tree": "^2.0.12",
"vanilla-calendar-picker": "^2.11.2"
"vanilla-calendar-picker": "^2.11.4"
},
"devDependencies": {
"autoprefixer": "^10.4.19",
Expand Down
3 changes: 3 additions & 0 deletions packages/common/src/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// import external lib CSS files (without the .css extension)
@import 'vanilla-calendar-picker/build/vanilla-calendar.min';

/*
* SlickGrid-Universal theming variables, used by all Themes
* Lib Website (https://github.com/ghiscoding/slickgrid-universal)
Expand Down
3 changes: 1 addition & 2 deletions packages/common/src/styles/slickgrid-theme-bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
* @author: Ghislain B. (ghiscoding)
*/

/** SlickGrid Bootstrap Theme */
@import 'vanilla-calendar-picker/build/vanilla-calendar.min.css';
/** SlickGrid Bootstrap Theme */
@import './slick-grid';
@import './slick-editors';
@import './slick-plugins';
Expand Down
1 change: 0 additions & 1 deletion packages/common/src/styles/slickgrid-theme-material.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* sames as `slickgrid-theme-material.lite.scss` but includes all external 3rd party lib styling
*/

@import 'vanilla-calendar-picker/build/vanilla-calendar.min.css';
@import './roboto-font';
@import './variables-theme-material';
@import './slick-without-bootstrap-min-styling';
Expand Down
2 changes: 0 additions & 2 deletions packages/common/src/styles/slickgrid-theme-salesforce.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
*/

@import './sass-utilities';
@import 'vanilla-calendar-picker/build/vanilla-calendar.min.css';

@import './variables-theme-salesforce';
@import './slick-without-bootstrap-min-styling';
@import './slick-grid';
Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla-bundle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@slickgrid-universal/utils": "workspace:~",
"dequal": "^2.0.3",
"sortablejs": "^1.15.2",
"vanilla-calendar-picker": "^2.11.2",
"vanilla-calendar-picker": "^2.11.4",
"whatwg-fetch": "^3.6.20"
},
"devDependencies": {
Expand Down
20 changes: 10 additions & 10 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.