Skip to content

Commit

Permalink
using .mui-body--scroll-lock, bumped version number
Browse files Browse the repository at this point in the history
  • Loading branch information
amorey committed Nov 27, 2015
1 parent b62549c commit 399075c
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# MUI Changelog

## 0.2.5 - November 27, 2015

* Added .mui-body--scroll-lock specifically for scroll lock

## 0.2.4 - November 26, 2015

* Uses body class for scroll lock
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ MUI is a lightweight CSS framework that follows Google's Material Design guideli
**Use From the CDN:**

```html
<link href="//cdn.muicss.com/mui-0.2.4/css/mui.min.css" rel="stylesheet" type="text/css" />
<script src="//cdn.muicss.com/mui-0.2.4/js/mui.min.js"></script>
<link href="//cdn.muicss.com/mui-0.2.5/css/mui.min.css" rel="stylesheet" type="text/css" />
<script src="//cdn.muicss.com/mui-0.2.5/js/mui.min.js"></script>
```

Or for development you can use the latest:
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mui",
"version": "0.2.4",
"version": "0.2.5",
"license": "MIT",
"authors": [
"Andres Morey <[email protected]>"
Expand Down
4 changes: 4 additions & 0 deletions dist/css/mui.css
Original file line number Diff line number Diff line change
Expand Up @@ -3010,3 +3010,7 @@ th {
display: none !important;
}
}

body.mui-body--scroll-lock {
overflow: hidden !important;
}
2 changes: 1 addition & 1 deletion dist/css/mui.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/extra/mui-combined.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/extra/mui-react-combined.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/mui.js
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ var config = require('../config.js'),
doc = document,
nodeInsertedCallbacks = [],
scrollLock = 0,
scrollLockCls = 'mui--overflow-hidden',
scrollLockCls = 'mui-body--scroll-lock',
scrollLockPos,
head,
_supportsPointerEvents;
Expand Down
2 changes: 1 addition & 1 deletion dist/js/mui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/react/mui-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ var config = require('../config.js'),
doc = document,
nodeInsertedCallbacks = [],
scrollLock = 0,
scrollLockCls = 'mui--overflow-hidden',
scrollLockCls = 'mui-body--scroll-lock',
scrollLockPos,
head,
_supportsPointerEvents;
Expand Down
2 changes: 1 addition & 1 deletion dist/react/mui-react.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/webcomponents/mui-webcomponents.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/webcomponents/mui-webcomponents.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion e2e-tests/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,7 @@ var config = require('../config.js'),
doc = document,
nodeInsertedCallbacks = [],
scrollLock = 0,
scrollLockCls = 'mui--overflow-hidden',
scrollLockCls = 'mui-body--scroll-lock',
scrollLockPos,
head,
_supportsPointerEvents;
Expand Down
2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
name: 'muicss:mui',
version: '0.2.4',
version: '0.2.5',
// Brief, one-line summary of the package.
summary: 'MUI is a lightweight framework for sites that follow Google\'s Material Design guidelines',
// URL to the Git repository containing the source code for this package.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "muicss",
"version": "0.2.4",
"version": "0.2.5",
"repository": "https://github.com/muicss/mui",
"main": "js/mui.min.js",
"jspm": {
Expand Down
2 changes: 1 addition & 1 deletion src/js/lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var config = require('../config.js'),
doc = document,
nodeInsertedCallbacks = [],
scrollLock = 0,
scrollLockCls = 'mui--overflow-hidden',
scrollLockCls = 'mui-body--scroll-lock',
scrollLockPos,
head,
_supportsPointerEvents;
Expand Down
10 changes: 10 additions & 0 deletions src/sass/mui/_helpers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -346,3 +346,13 @@
@media (min-width: $mui-screen-lg-min) {
@include x-responsive-invisibility('.mui--hidden-lg');
}



// ============================================================================
// SCROLL BLOCK
// ============================================================================

body.mui-body--scroll-lock {
overflow: hidden !important;
}

0 comments on commit 399075c

Please sign in to comment.