Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mahmutduva committed Dec 18, 2016
2 parents 9122783 + 1499be2 commit 9b3f668
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-aside-menu",
"version": "1.5.0",
"version": "1.5.1",
"homepage": "https://github.com/mahmutduva/angular-aside-menu",
"author": "Mahmut Duva <[email protected]>",
"description": "Angularjs side menu",
Expand Down
4 changes: 2 additions & 2 deletions dist/aside-menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body{
top: 0;
bottom: 0;
z-index: 0;
overflow: hidden;
overflow-x: hidden;
min-height: 100%;
max-height: 100%;
width: 275px;
Expand All @@ -29,7 +29,7 @@ body{
width: 100%;
height: 100%;
background-color: #fff;
overflow: hidden;
overflow-x: hidden;
-webkit-transform: none;
transform: none;
z-index: 1;
Expand Down
2 changes: 1 addition & 1 deletion dist/aside-menu.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"name": "angular-aside-menu",
"description": "# angular-aside-menu Side menu for website",
"version": "1.5.0",
"version": "1.5.1",
"scripts": {
"build": "grunt",
"test": "grunt test"
Expand Down
4 changes: 2 additions & 2 deletions src/aside-menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body{
top: 0;
bottom: 0;
z-index: 0;
overflow: hidden;
overflow-x: hidden;
min-height: 100%;
max-height: 100%;
width: 275px;
Expand All @@ -29,7 +29,7 @@ body{
width: 100%;
height: 100%;
background-color: #fff;
overflow: hidden;
overflow-x: hidden;
-webkit-transform: none;
transform: none;
z-index: 1;
Expand Down

0 comments on commit 9b3f668

Please sign in to comment.