Skip to content

Commit

Permalink
Merge pull request #14 from materializecss/v2-dev
Browse files Browse the repository at this point in the history
Release 2.1.1
  • Loading branch information
wuda-io authored Sep 26, 2024
2 parents 8802244 + 5826c2b commit fb7617f
Show file tree
Hide file tree
Showing 6 changed files with 874 additions and 3,480 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup
uses: actions/setup-node@v3
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
Expand Down
14 changes: 7 additions & 7 deletions getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h5>Materialize</h5>
tabindex="0"
id="download-source"
class="btn filled waves-effect waves-light icon-right"
href="https://github.com/materializecss/materialize/releases/download/2.1.0/materialize-v2.1.0.zip"
href="https://github.com/materializecss/materialize/releases/download/v2.1.1/materialize-v2.1.1.zip"
>
Materialize<i class="material-icons">file_download</i>
</a>
Expand All @@ -46,7 +46,7 @@ <h5>Sass</h5>
tabindex="0"
id="download-sass"
class="btn outlined waves-effect waves-light icon-right"
href="https://github.com/materializecss/materialize/releases/download/2.1.0/materialize-src-v2.1.0.zip"
href="https://github.com/materializecss/materialize/releases/download/v2.1.1/materialize-src-v2.1.1.zip"
>
Source<i class="material-icons right">file_download</i>
</a>
Expand All @@ -55,10 +55,10 @@ <h5>Sass</h5>

<div class="is-closed" id="download-thanks">
<div class="card p-3 mt-3">
<p class="primary-text"><b>Thank you for downloading!</b></p>
<p class="m-0 primary-text"><b>Support our work</b></p>
<p class="caption">
We hope you find Materialize useful in your next project. We would appreciate if you help us spread the word about Materialize by giving us a star or support
our work.
Thank you for downloading. We hope you find Materialize useful in your next project. We would appreciate if you help us spread the word about Materialize by
giving us a star or support our work.
</p>
<div class="row">
<a href="https://github.com/materializecss/materialize" target="_blank">
Expand All @@ -80,9 +80,9 @@ <h5>CDN</h5>
<span class="copyMessage">Copied!</span>
<i class="material-icons copyButton">content_copy</i>
<code class="language-html copiedText"><xmp><!-- Compiled and minified CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/[email protected].0/dist/css/materialize.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/[email protected].1/dist/css/materialize.min.css">
<!-- Compiled and minified JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/@materializecss/[email protected].0/dist/js/materialize.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@materializecss/[email protected].1/dist/js/materialize.min.js"></script>
</xmp></code></pre>
</div>
<div class="col s12">
Expand Down
2 changes: 1 addition & 1 deletion packages/materialize
Submodule materialize updated 85 files
+8 −1 .eslintrc
+1 −0 .github/workflows/nightly.yml
+6 −17 .gitignore
+1 −3 .prettierignore
+1 −1 FOR_MAINTAINERS.md
+0 −292 Gruntfile.js
+35 −0 ci/compress.js
+0 −0 ci/empty.js
+223 −758 dist/css/materialize.css
+7 −5 dist/css/materialize.min.css
+1 −0 dist/css/materialize.min.css.map
+7,593 −0 dist/js/materialize.cjs.js
+2,333 −0 dist/js/materialize.d.ts
+6,416 −6,532 dist/js/materialize.js
+5 −6 dist/js/materialize.min.js
+0 −1 dist/js/materialize.min.js.map
+7,563 −0 dist/js/materialize.mjs
+41 −0 index.html
+6 −0 index.js
+29 −0 index.mjs
+2,220 −7,919 package-lock.json
+26 −26 package.json
+186 −0 rollup.config.ts
+11 −8 sass/components/_dropdown.scss
+11 −9 sass/components/_grid.scss
+2 −2 sass/components/_tapTarget.scss
+2 −22 sass/components/forms/_select.scss
+38 −82 spec/helpers/helper.js
+27 −0 spec/support/jasmine-browser.mjs
+267 −0 spec/tests/autocomplete/autocompleteSpec.js
+215 −0 spec/tests/cards/cardsSpec.js
+43 −0 spec/tests/carousel/carouselSpec.js
+33 −37 spec/tests/chips/chipsSpec.js
+98 −54 spec/tests/collapsible/collapsibleSpec.js
+22 −31 spec/tests/datepicker/datepickerSpec.js
+110 −0 spec/tests/dropdown/dropdownSpec.js
+32 −12 spec/tests/fab/fabSpec.js
+98 −17 spec/tests/forms/formsSpec.js
+39 −0 spec/tests/materialbox/materialboxSpec.js
+80 −51 spec/tests/modal/modalSpec.js
+392 −0 spec/tests/select/selectSpec.js
+53 −55 spec/tests/sidenav/sidenavSpec.js
+101 −0 spec/tests/slider/sliderSpec.js
+56 −44 spec/tests/tabs/tabsSpec.js
+82 −0 spec/tests/toast/toastSpec.js
+147 −0 spec/tests/tooltip/tooltipSpec.js
+7 −4 src/autocomplete.ts
+1 −2 src/cards.ts
+1 −0 src/chips.ts
+1 −0 src/dropdown.ts
+20 −20 src/forms.ts
+0 −114 src/global.ts
+98 −2 src/index.ts
+17 −0 src/modal.ts
+2 −1 src/range.ts
+27 −62 src/select.ts
+1 −1 src/slider.ts
+15 −15 src/waves.ts
+0 −18 tests/spec/autocomplete/autocompleteFixture.html
+0 −146 tests/spec/autocomplete/autocompleteSpec.js
+0 −80 tests/spec/cards/cardsFixture.html
+0 −149 tests/spec/cards/cardsSpec.js
+0 −14 tests/spec/carousel/carouselFixture.html
+0 −31 tests/spec/carousel/carouselSpec.js
+0 −4 tests/spec/chips/chipsFixture.html
+0 −59 tests/spec/collapsible/collapsible.html
+0 −6 tests/spec/datepicker/datepickerFixture.html
+0 −42 tests/spec/dropdown/dropdownFixture.html
+0 −88 tests/spec/dropdown/dropdownSpec.js
+0 −77 tests/spec/fab/fabSpec.js
+0 −56 tests/spec/forms/formsFixture.html
+0 −3 tests/spec/materialbox/materialboxFixture.html
+0 −35 tests/spec/materialbox/materialboxSpec.js
+0 −44 tests/spec/modal/modalFixture.html
+0 −53 tests/spec/select/selectFixture.html
+0 −329 tests/spec/select/selectSpec.js
+0 −16 tests/spec/sidenav/sidenavFixture.html
+0 −36 tests/spec/slider/sliderFixture.html
+0 −76 tests/spec/slider/sliderSpec.js
+0 −22 tests/spec/tabs/tabsFixture.html
+0 −66 tests/spec/toast/toastSpec.js
+0 −33 tests/spec/tooltip/tooltipFixture.html
+0 −126 tests/spec/tooltip/tooltipSpec.js
+16 −14 tsconfig.json
+0 −38 webpack.config.js
7 changes: 4 additions & 3 deletions partials/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@
<li class="version">
<a class="dropdown-trigger" href="#" data-target="version-dropdown">
<!-- svg -->
2.1.0<svg class="caret" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
v2.1.1<svg class="caret" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M7 10l5 5 5-5z"></path>
<path d="M0 0h24v24H0z" fill="none"></path>
</svg>
</a>
<ul class="dropdown-content" id="version-dropdown">
<li><a>v2.1.1</a></li>
<li><a>2.1.0</a></li>
<li><a>2.0.4</a></li>
<li><a>2.0.3-alpha</a></li>
Expand All @@ -74,9 +75,9 @@ <h4>Color Scheme</h4>
<label>Primary Color</label>
<input type="color" id="color-picker" value="#0000ff" />
</div>
<button id="downloadCss" type="button" class="btn">Download css style</button>
<button id="downloadCss" type="button" class="btn tonal">Download css style</button>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect btn-flat">Close</a>
<a href="#!" class="modal-close waves-effect btn text">Close</a>
</div>
</div>
Loading

0 comments on commit fb7617f

Please sign in to comment.