Skip to content

Commit fdb7e26

Browse files
authored
Merge pull request #23 from materializecss/v2-dev
2.2.0
2 parents e41c2e6 + 73d8781 commit fdb7e26

File tree

400 files changed

+4305
-3868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+4305
-3868
lines changed

Diff for: .github/workflows/deploy.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,22 @@ name: Deploy
22
on:
33
push:
44
branches:
5-
- v2-dev
5+
# - v2-dev
66
- main
77
jobs:
88
build:
99
name: Build
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Checkout repo
13-
uses: actions/checkout@v4
14-
- name: Setup
15-
uses: actions/setup-node@v3
1612
- uses: actions/checkout@v4
17-
- uses: pnpm/action-setup@v2
18-
with:
19-
version: 8
20-
run_install: |
21-
- recursive: true
22-
args: [--frozen-lockfile, --strict-peer-dependencies]
23-
- args: [--global, prettier, typescript]
2413

2514
- name: Build
2615
run: |
2716
git submodule init
2817
git submodule update
29-
pnpm install
30-
pnpm build
18+
npm install -g pnpm
19+
pnpm i
20+
pnpm run build
3121
3222
- name: Upload production-ready build files
3323
uses: actions/upload-artifact@v3

Diff for: README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ pnpm preview
3939
### New Release (for Maintainers)
4040

4141
- Execute the release process in the core package incl. releasing on npm
42-
- Update versions in **getting-started.html**, **partials/navbar.html**
43-
- Run docs locally and check manually
44-
- Make commit to dev (message: "chore: release 2.X.X")
45-
- Make PR in GitHub from dev -> main
46-
- Merge the PR
47-
- Party and spread the news via social media channels 🎉
42+
- Switch to branch **v2-dev** and also pull newest package in [packages/materialize]()
43+
- Update version string in **package.json**, **src/getting-started.html**, **partials/navbar.html**
44+
- Run docs locally and check manually with `pnpm dev`
45+
- Make commit to v2-dev (message: "chore: release 2.X.X")
46+
- Make PR from v2-dev -> main
47+
- Merge the PR (The deploy step to gh-pages should be executed)
48+
- Spread news via social media channels

Diff for: config.materialize.js

+43-23
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ export const config = {
44
id: "index",
55
url: "index.html",
66
name: "Documentation",
7-
description:
8-
"Materialize is a modern responsive CSS framework based on Material Design by Google.",
7+
description: "Materialize is a modern responsive CSS framework based on Material Design by Google.",
98
},
109
{
1110
id: "about",
@@ -17,18 +16,31 @@ export const config = {
1716
id: "gettingstarted",
1817
url: "getting-started.html",
1918
name: "Getting started",
20-
description:
21-
"Learn how to easily start using Materialize and integrate it into your project.",
19+
description: "Learn how to easily start using Materialize and integrate it into your project.",
20+
},
21+
{
22+
id: "color",
23+
url: "color.html",
24+
name: "Color",
25+
description: "Materialize offers a lot of colors which can be used in your next project.",
26+
},
27+
{
28+
id: "grid",
29+
url: "grid.html",
30+
name: "Grid",
31+
description: "Use Materializes powerful grid system which uses CSS Grid to make formatting your web project easier and more comfortable.",
32+
},
33+
{
34+
id: "helpers",
35+
url: "helpers.html",
36+
name: "Helpers",
37+
description: "Get an overview of all helper classes for visibility and common css properties.",
2238
},
23-
{ id: "color", url: "color.html", name: "Color" },
24-
{ id: "grid", url: "grid.html", name: "Grid" },
25-
{ id: "helpers", url: "helpers.html", name: "Helpers" },
2639
{
2740
id: "mediacss",
2841
url: "media-css.html",
2942
name: "Media Styles",
30-
description:
31-
"Responsive images and videos ready to be seen on many devices.",
43+
description: "Responsive images and videos ready to be seen on many devices.",
3244
},
3345
{ id: "pulse", url: "pulse.html", name: "Pulse" },
3446
{ id: "sass", url: "sass.html", name: "Sass" },
@@ -66,8 +78,7 @@ export const config = {
6678
id: "media",
6779
url: "media.html",
6880
name: "Media",
69-
description:
70-
"Use Box and Slider to present your media content in a cool way.",
81+
description: "Use Box and Slider to present your media content in a cool way.",
7182
},
7283
{ id: "modals", url: "modals.html", name: "Modals" },
7384
{ id: "parallax", url: "parallax.html", name: "Parallax" },
@@ -80,7 +91,24 @@ export const config = {
8091
{ id: "autocomplete", url: "autocomplete.html", name: "Autocomplete" },
8192
{ id: "checkboxes", url: "checkboxes.html", name: "Checkboxes" },
8293
{ id: "chips", url: "chips.html", name: "Chips" },
83-
{ id: "pickers", url: "pickers.html", name: "Pickers" },
94+
{
95+
id: "pickers",
96+
url: "pickers.html",
97+
name: "Pickers",
98+
description: "Controlling inputs in a more easy way and send date and time along with your form.",
99+
},
100+
{
101+
id: "datepicker",
102+
url: "datepicker.html",
103+
name: "Date Picker",
104+
description: "Select single or multiple dates, ranges and more.",
105+
},
106+
{
107+
id: "timepicker",
108+
url: "timepicker.html",
109+
name: "Time Picker",
110+
description: "Select a single time with the support of the awesome Timepicker.",
111+
},
84112
{ id: "radiobuttons", url: "radio-buttons.html", name: "Radio Buttons" },
85113
{ id: "range", url: "range.html", name: "Range" },
86114
{ id: "select", url: "select.html", name: "Select" },
@@ -141,22 +169,14 @@ export const config = {
141169
{ id: "tabs" },
142170
{ id: "toasts" },
143171
{ id: "tooltips" },
172+
{ id: "datepicker" },
173+
{ id: "timepicker" },
144174
],
145175
},
146176
{
147177
name: "Forms",
148178
icon: "text_fields",
149-
items: [
150-
{ id: "autocomplete" },
151-
{ id: "checkboxes" },
152-
{ id: "chips" },
153-
{ id: "pickers" },
154-
{ id: "radiobuttons" },
155-
{ id: "range" },
156-
{ id: "select" },
157-
{ id: "switches" },
158-
{ id: "textinputs" },
159-
],
179+
items: [{ id: "autocomplete" }, { id: "checkboxes" }, { id: "chips" }, { id: "radiobuttons" }, { id: "range" }, { id: "select" }, { id: "switches" }, { id: "textinputs" }],
160180
},
161181
{ id: "mobile", icon: "mobile_friendly" },
162182
],

Diff for: demo-page.html

-64
This file was deleted.

Diff for: fab-toolbar-demo.html

-37
This file was deleted.

Diff for: fullscreen-slider-demo.html

-50
This file was deleted.

Diff for: package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build",
8+
"build": "tsc && vite build && cp -r dist/version/latest/* dist && mv dist/version/latest dist/version/v2.2.0",
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
1212
"@material/material-color-utilities": "^0.2.7",
1313
"@materializecss/materialize": "workspace:*",
14-
"glob": "^10.3.3",
15-
"highlight.js": "^11.9.0",
16-
"material-icons": "^1.13.8",
14+
"glob": "^10.4.5",
15+
"highlight.js": "^11.10.0",
16+
"material-icons": "^1.13.12",
1717
"vite-plugin-handlebars": "^1.6.0"
1818
},
1919
"devDependencies": {
20-
"sass": "^1.35.2",
21-
"typescript": "^5.0.2",
22-
"vite": "^4.4.5"
23-
}
20+
"sass": "^1.80.1",
21+
"typescript": "^5.6.3",
22+
"vite": "^4.5.5"
23+
},
24+
"packageManager": "[email protected]+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228"
2425
}

Diff for: packages/materialize

Submodule materialize updated 80 files

0 commit comments

Comments
 (0)