Skip to content

Commit e6b4932

Browse files
authored
Merge pull request #11 from materializecss/v2-dev
Release 2.1.0
2 parents 0ad83f5 + fe35986 commit e6b4932

66 files changed

Lines changed: 6261 additions & 7441 deletions

Some content is hidden

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

.github/workflows/deploy.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ name: Deploy
22
on:
33
push:
44
branches:
5+
- v2-dev
56
- main
67
jobs:
78
build:
89
name: Build
910
runs-on: ubuntu-latest
1011
steps:
1112
- name: Checkout repo
12-
uses: actions/checkout@v3
13+
uses: actions/checkout@v3
1314
- name: Setup
1415
uses: actions/setup-node@v3
1516
- uses: actions/checkout@v3
@@ -20,14 +21,14 @@ jobs:
2021
- recursive: true
2122
args: [--frozen-lockfile, --strict-peer-dependencies]
2223
- args: [--global, prettier, typescript]
23-
24+
2425
- name: Build
2526
run: |
2627
git submodule init
2728
git submodule update
2829
pnpm install
2930
pnpm build
30-
31+
3132
- name: Upload production-ready build files
3233
uses: actions/upload-artifact@v3
3334
with:

404.html

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
<div class="row">
1212
<div class="col s12 m9">
1313
<h1 class="header center-on-small-only">404</h1>
14-
<h4 class="light red-text text-lighten-4 center-on-small-only">
15-
Page not found.
16-
</h4>
14+
<h4 class="light red-text text-lighten-4 center-on-small-only">Page not found.</h4>
1715
</div>
1816
</div>
1917
</div>
@@ -22,18 +20,13 @@ <h4 class="light red-text text-lighten-4 center-on-small-only">
2220
<div class="container">
2321
<!-- Outer row -->
2422
<div class="row">
25-
<div class="col s12 ">
23+
<div class="col s12">
2624
<!-- Material Design -->
2725
<div id="materialdesign" class="section scrollspy">
2826
<h2 class="header">Are You Lost?</h2>
2927
<p class="caption">
30-
The page you were looking for does not exist. If you think this
31-
is a mistake and one of our pages has gone missing, Open an
32-
issue on
33-
<a
34-
href="https://github.com/materializecss/materialize/issues/new"
35-
>GitHub</a
36-
>>. Click below to learn more about our CSS framework.
28+
The page you were looking for does not exist. If you think this is a mistake and one of our pages has gone missing, Open an issue on
29+
<a href="https://github.com/materializecss/materialize/issues/new">GitHub</a>. Click below to learn more about our CSS framework.
3730
</p>
3831
<a href="about.html" class="btn-large">Learn More</a>
3932
</div>

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,13 @@ Note: when a new page is selected it takes some time to render completely the pa
3535
pnpm build
3636
pnpm preview
3737
```
38+
39+
### New Release (for Maintainers)
40+
41+
- 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 🎉

about.html

Lines changed: 23 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<html lang="en">
33
<head>
44
{{> head }}
5+
<style>
6+
.promo {
7+
width: 100%;
8+
}
9+
</style>
510
</head>
611
<body>
712
{{> navbar }}
@@ -16,20 +21,11 @@
1621
<div id="materialdesign" class="section scrollspy">
1722
<h2 class="header">Material Design</h2>
1823
<p class="caption">
19-
Created and designed by Google, Material Design is a design
20-
language that combines the classic principles of successful
21-
design along with innovation and technology. Google's goal is to
22-
develop a system of design that allows for a unified user
23-
experience across all their products on any platform.
24+
Created and designed by Google, Material Design is a design language that combines the classic principles of successful design along with innovation and technology.
25+
Google's goal is to develop a system of design that allows for a unified user experience across all their products on any platform.
2426
</p>
2527
<div class="video-container">
26-
<iframe
27-
width="853"
28-
height="480"
29-
src="https://www.youtube.com/embed/Q8TXgCzxEnw?rel=0"
30-
frameborder="0"
31-
allowfullscreen
32-
></iframe>
28+
<iframe width="853" height="480" src="https://www.youtube.com/embed/Q8TXgCzxEnw?rel=0" frameborder="0" allowfullscreen></iframe>
3329
</div>
3430
<div class="section">
3531
<h3 class="header light">Principles</h3>
@@ -38,38 +34,28 @@ <h3 class="header light">Principles</h3>
3834
<img class="promo" src="images/metaphor.png" />
3935
<h4 class="center">Material is the metaphor</h4>
4036
<p>
41-
The metaphor of material defines the relationship between
42-
space and motion. The idea is that the technology is
43-
inspired by paper and ink and is utilized to facilitate
44-
creativity and innovation. Surfaces and edges provide
45-
familiar visual cues that allow users to quickly
46-
understand the technology beyond the physical world.
37+
The metaphor of material defines the relationship between space and motion. The idea is that the technology is inspired by paper and ink and is utilized to
38+
facilitate creativity and innovation. Surfaces and edges provide familiar visual cues that allow users to quickly understand the technology beyond the
39+
physical world.
4740
</p>
4841
</div>
4942

5043
<div class="col s12 l4">
5144
<img class="promo" src="images/bold.png" />
5245
<h4 class="center">Bold, graphic, intentional</h4>
5346
<p>
54-
Elements and components such as grids, typography, color,
55-
and imagery are not only visually pleasing, but also
56-
create a sense of hierarchy, meaning, and focus. Emphasis
57-
on different actions and components create a visual guide
58-
for users.
47+
Elements and components such as grids, typography, color, and imagery are not only visually pleasing, but also create a sense of hierarchy, meaning, and
48+
focus. Emphasis on different actions and components create a visual guide for users.
5949
</p>
6050
</div>
6151

6252
<div class="col s12 l4">
6353
<img class="promo" src="images/motion.png" />
6454
<h4 class="center">Motion provides meaning</h4>
6555
<p>
66-
Motion allows the user to draw a parallel between what
67-
they see on the screen and in real life. By providing both
68-
feedback and familiarity, this allows the user to fully
69-
immerse him or herself into unfamiliar technology. Motion
70-
contains consistency and continuity in addition to giving
71-
users additional subconscious information about objects
72-
and transformations.
56+
Motion allows the user to draw a parallel between what they see on the screen and in real life. By providing both feedback and familiarity, this allows the
57+
user to fully immerse him or herself into unfamiliar technology. Motion contains consistency and continuity in addition to giving users additional
58+
subconscious information about objects and transformations.
7359
</p>
7460
</div>
7561
</div>
@@ -83,11 +69,8 @@ <h2 class="header">Meet the Team</h2>
8369
<h5>The community</h5>
8470

8571
<p class="caption">
86-
Due to inactivity of the original developers, MaterializeCSS has
87-
been forked by a community of enthusiasts, which continues to be
88-
fully maintained by open source principes since 2021. Without
89-
the many contributors who participated in this fork, this
90-
project would probably not have received any updates anymore.
72+
Due to inactivity of the original developers, MaterializeCSS has been forked by a community of enthusiasts, which continues to be fully maintained by open source
73+
principes since 2021. Without the many contributors who participated in this fork, this project would probably not have received any updates anymore.
9174
</p>
9275

9376
<div class="center">
@@ -103,18 +86,14 @@ <h5>The community</h5>
10386

10487
<h5>The original team</h5>
10588
<p class="caption">
106-
<a href="https://www.materializecss.com" target="_blank"
107-
>MaterializeCSS</a
108-
>
109-
was originally launched in 2014 by a team of students from
110-
Carnegie Mellon University. After 4 years of development, the
111-
latest official release was released in September 2018 and
112-
received more than 38K stars on GitHub.
89+
<a href="https://www.materializecss.com" target="_blank">MaterializeCSS</a>
90+
was originally launched in 2014 by a team of students from Carnegie Mellon University. After 4 years of development, the latest official release was released in
91+
September 2018 and received more than 38K stars on GitHub.
11392
</p>
11493

11594
<div class="center">
11695
<div class="image-container">
117-
<img src="images/materialize_team.jpeg" style="width:100%;" />
96+
<img src="images/materialize_team.jpeg" style="width: 100%" />
11897
</div>
11998
</div>
12099
</div>
@@ -123,7 +102,7 @@ <h5>The original team</h5>
123102
<!-- Table of Contents -->
124103
<div class="col hide-on-small-only m3 xl3">
125104
<div class="toc-wrapper">
126-
<div style="height: 1px;">
105+
<div style="height: 1px">
127106
<ul class="section table-of-contents">
128107
<li><a href="#materialdesign">Material Design</a></li>
129108
<li><a href="#team">Meet the Team</a></li>

auto-init.html

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@
1313
<div class="col s12 m8 offset-m1 xl7 offset-xl1">
1414
<div id="introduction" class="section scrollspy">
1515
<p class="caption">
16-
Auto Init allows you to initialize all of the Materialize
17-
Components with a single function call. It is important to note
18-
that you cannot pass in options using this method.
16+
Auto Init allows you to initialize all of the Materialize Components with a single function call. It is important to note that you cannot pass in options using this
17+
method.
1918
</p>
2019
</div>
2120

2221
<div id="initialization" class="scrollspy section">
2322
<h3 class="header">Initialization</h3>
24-
<pre><code class="language-javascript">
25-
M.AutoInit();
26-
</code></pre>
23+
<pre><code class="language-javascript">M.AutoInit();</code></pre>
2724
</div>
2825

2926
<div id="options" class="scrollspy section">
@@ -51,19 +48,16 @@ <h3 class="header">Options</h3>
5148

5249
<div id="options" class="scrollspy section">
5350
<h3 class="header">Ignoring Elements</h3>
54-
5551
<p>
5652
If you want
57-
<code class="language-javascript">M.AutoInit()</code> to ignore
58-
a certain element, you can add the class
59-
<code class="language-markdown">.no-autoinit</code> to the
53+
<code class="language-javascript">M.AutoInit()</code> to ignore a certain element, you can add the class <code class="language-markdown">.no-autoinit</code> to the
6054
element and it will not be initialized by autoinit.
6155
</p>
6256
</div>
6357
</div>
6458
<div class="col hide-on-small-only m3 xl3">
6559
<div class="toc-wrapper">
66-
<div style="height: 1px;">
60+
<div style="height: 1px">
6761
<ul class="section table-of-contents">
6862
<li><a href="#introduction">Introduction</a></li>
6963
<li><a href="#initialization">Initialization</a></li>

0 commit comments

Comments
 (0)