Skip to content

Commit e705fdd

Browse files
committed
changes
- disable header transform when the header will not be condesing - transform fixed header - remove transitions from the header's primary element - update the header's layout content position when the layout doesn't have a custom scrolling region
1 parent 0ee67e3 commit e705fdd

File tree

12 files changed

+258
-2969
lines changed

12 files changed

+258
-2969
lines changed

demo/package-lock.json

Lines changed: 222 additions & 2943 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"bootstrap": "^4.1.3",
1414
"dom-factory": "^1.0.0",
15-
"material-design-kit": "1.0.0-alpha.21",
15+
"material-design-kit": "1.0.0-alpha.22",
1616
"sass-md-colors": "^1.0.0"
1717
},
1818
"devDependencies": {
@@ -23,6 +23,6 @@
2323
"expose-loader": "^0.7.5",
2424
"lite-server": "^2.2.0",
2525
"surge": "^0.17.7",
26-
"theme-mix": "^0.5.0"
26+
"theme-mix": "^0.6.0"
2727
}
2828
}

demo/theme-mix.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cssDest: dist/assets/css
1717
jsSrc: src/js/**/**.{js,vue}
1818
jsDest: dist/assets/js
1919
htmlDest: dist/[path][name].html
20+
htmllint: false
2021
laravelMixOptions:
2122
processCssUrls: false
2223
expose:

dist/header-layout.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/header.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/header.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/material-design-kit.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/material-design-kit.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-design-kit",
3-
"version": "1.0.0-alpha.21",
3+
"version": "1.0.0-alpha.22",
44
"description": "Interactive web components inspired from Material Design, using vanilla CSS, JavaScript and HTML.",
55
"scripts": {
66
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",

src/header-layout/header-layout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const headerLayoutComponent = () => ({
7474
const gutter = parseInt(window.getComputedStyle(this.header.element).marginBottom, 10)
7575
const containerStyle = this.contentContainer.style
7676

77-
if (this.hasScrollingRegion && (this.header.fixed || this.header.willCondense())) {
77+
if (this.header.fixed || this.header.willCondense()) {
7878
containerStyle.paddingTop = `${ headerHeight + gutter }px`
7979
containerStyle.marginTop = ''
8080
}

0 commit comments

Comments
 (0)