Skip to content

Commit 0690eea

Browse files
committed
Merge branch 'v2-dev' of https://github.com/wuda-io/materialize into textfieldsCSSonlyAndM3
2 parents 2ed9e75 + 234c202 commit 0690eea

25 files changed

+1451
-1089
lines changed

.github/workflows/docs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
with:
4343
github_token: ${{ secrets.GITHUB_TOKEN }}
4444
publish_dir: ./docs
45+
cname: materializeweb.com
4546
exclude_assets: node_modules
4647
user_name: 'github-actions[bot]'
4748
user_email: 'github-actions[bot]@users.noreply.github.com'

CHANGELOG.md

+1-23
Original file line numberDiff line numberDiff line change
@@ -1,23 +1 @@
1-
# Changelog
2-
3-
## [1.2.1](https://github.com/materializecss/materialize/tree/1.2.1) (2022-12-19)
4-
5-
[Full Changelog](https://github.com/materializecss/materialize/compare/1.2.0...1.2.1)
6-
7-
**Fixed bugs:**
8-
9-
- fix\(select\): misplaced aria-required attribute [\#318](https://github.com/materializecss/materialize/pull/318) ([mauromascarenhas](https://github.com/mauromascarenhas))
10-
- fix: remove postinstall hook from packed package [\#313](https://github.com/materializecss/materialize/pull/313) ([Chicken](https://github.com/Chicken))
11-
12-
**Documentation changes:**
13-
14-
- fix\(fab\): fab toolbar demo [\#319](https://github.com/materializecss/materialize/pull/319) ([mauromascarenhas](https://github.com/mauromascarenhas))
15-
- Added Example for alignment option [\#298](https://github.com/materializecss/materialize/pull/298) ([CypherpunkSamurai](https://github.com/CypherpunkSamurai))
16-
17-
**Meta changes:**
18-
19-
- Fix missed files when replacing old version with new one [\#316](https://github.com/materializecss/materialize/pull/316) ([Smankusors](https://github.com/Smankusors))
20-
21-
22-
23-
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
1+
https://github.com/materializecss/materialize/releases/tag/1.2.2

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ module.exports = function(grunt) {
173173
bsFiles: ['bin/*', 'css/ghpages-materialize.css', '!**/node_modules/**/*'],
174174
options: {
175175
server: {
176-
baseDir: './' // make server from root dir
176+
baseDir: './docs/' // make server from root dir
177177
},
178178
port: 8000,
179179
ui: {

dist/css/materialize.css

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* Materialize v1.2.1 (https://materializecss.github.io/materialize)
3-
* Copyright 2014-2022 Materialize
2+
* Materialize v1.2.2 (https://materializecss.github.io/materialize)
3+
* Copyright 2014-2023 Materialize
44
* MIT License (https://raw.githubusercontent.com/materializecss/materialize/master/LICENSE)
55
*/
66
@charset "UTF-8";
@@ -7918,16 +7918,24 @@ input[type=range]::-ms-thumb {
79187918
.slider .indicators .indicator-item {
79197919
display: inline-block;
79207920
position: relative;
7921-
cursor: pointer;
79227921
height: 16px;
79237922
width: 16px;
79247923
margin: 0 12px;
7924+
}
7925+
.slider .indicators .indicator-item-btn {
7926+
position: absolute;
7927+
top: 0;
7928+
left: 0;
7929+
cursor: pointer;
79257930
background-color: #e0e0e0;
79267931
-webkit-transition: background-color 0.3s;
79277932
transition: background-color 0.3s;
79287933
border-radius: 50%;
7934+
border-width: 0;
7935+
width: 100%;
7936+
height: 100%;
79297937
}
7930-
.slider .indicators .indicator-item.active {
7938+
.slider .indicators .indicator-item-btn.active {
79317939
background-color: #4CAF50;
79327940
}
79337941

dist/css/materialize.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)