Skip to content

Commit

Permalink
Merge pull request #258 from Smankusors/release-1.1.0
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
Smankusors authored Apr 20, 2022
2 parents 4463268 + 6c5c8d1 commit 330502e
Show file tree
Hide file tree
Showing 12 changed files with 18,030 additions and 5,050 deletions.
189 changes: 114 additions & 75 deletions CHANGELOG.md

Large diffs are not rendered by default.

1,761 changes: 618 additions & 1,143 deletions dist/css/materialize.css

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions dist/css/materialize.min.css

Large diffs are not rendered by default.

7,432 changes: 3,655 additions & 3,777 deletions dist/js/materialize.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/materialize.min.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions docs/css/ghpages-materialize.css

Large diffs are not rendered by default.

13,644 changes: 13,616 additions & 28 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Builds Materialize distribution packages",
"author": "Alvin Wang, Alan Chang",
"homepage": "https://materializecss.github.io/materialize/",
"version": "1.1.0-alpha",
"version": "1.1.0",
"main": "dist/js/materialize.js",
"style": "dist/css/materialize.css",
"sass": "sass/materialize.scss",
Expand Down
8 changes: 4 additions & 4 deletions pug/getting_started/getting_started_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ <h3 class="header">Download</h3>
<div class="col s12 m6">
<h5>Materialize</h5>
<p>This is the standard version that comes with both the minified and unminified CSS and JavaScript files. This option requires little to no setup. Use this if you are unfamiliar with Sass.</p>
<a id="download-source" class="btn waves-effect waves-light" href="https://github.com/materializecss/materialize/releases/download/1.1.0-alpha/materialize-v1.1.0-alpha.zip">Materialize<i class="material-icons right">file_download</i></a>
<a id="download-source" class="btn waves-effect waves-light" href="https://github.com/materializecss/materialize/releases/download/1.1.0/materialize-v1.1.0.zip">Materialize<i class="material-icons right">file_download</i></a>
</div>
<div class="col s12 m6">
<h5>Sass</h5>
<p>This version contains the source SCSS files. By choosing this version you have more control over which components to include. You will need a Sass compiler if you choose this option.</p>
<a id="download-sass" class="btn waves-effect waves-light" href="https://github.com/materializecss/materialize/releases/download/1.1.0-alpha/materialize-src-v1.1.0-alpha.zip">Source<i class="material-icons right">file_download</i></a>
<a id="download-sass" class="btn waves-effect waves-light" href="https://github.com/materializecss/materialize/releases/download/1.1.0/materialize-src-v1.1.0.zip">Source<i class="material-icons right">file_download</i></a>
</div>
<div class="col s12">
<br>
Expand All @@ -39,10 +39,10 @@ <h5>CDN</h5>
<i class="material-icons copyButton">content_copy</i>
<code class="language-markup copiedText">
&lt;!-- Compiled and minified CSS -->
&lt;link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/[email protected]-alpha/dist/css/materialize.min.css">
&lt;link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/[email protected]/dist/css/materialize.min.css">

&lt;!-- Compiled and minified JavaScript -->
&lt;script src="https://cdn.jsdelivr.net/npm/@materializecss/[email protected]-alpha/dist/js/materialize.min.js">&lt;/script>
&lt;script src="https://cdn.jsdelivr.net/npm/@materializecss/[email protected]/dist/js/materialize.min.js">&lt;/script>
</code></pre>
</div>
<div class="col s12">
Expand Down
2 changes: 1 addition & 1 deletion pug/index/index_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h4 class="light">Simple. Built on open source. The responsive front-end library
<div class="row center">
<a href="getting-started.html" id="download-button" class="btn-large waves-effect waves-light">Get Started</a>
</div>
<div class="row center"><a class="current-version-number" href="https://github.com/materializecss/materialize">Release: 1.1.0-alpha</a></div>
<div class="row center"><a class="current-version-number" href="https://github.com/materializecss/materialize">Release: 1.1.0</a></div>
<br>
</div>
<div class="github-commit">
Expand Down
Binary file modified templates/parallax-template.zip
Binary file not shown.
Binary file modified templates/starter-template.zip
Binary file not shown.

0 comments on commit 330502e

Please sign in to comment.