Skip to content

Commit

Permalink
angular upgraded to v1.5, angular material upgraded to v1.0, closes #33
Browse files Browse the repository at this point in the history
…, closes #39
  • Loading branch information
micrum committed Mar 14, 2016
1 parent 0cae1b5 commit ac3272a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 18 deletions.
26 changes: 11 additions & 15 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
{
"name": "angular-material-admin",
"name": "angular-material-dashboard",
"description": "Material Design Angular Admin Dashboard",
"homepage": "https://github.com/micrum/angular-material-admin",
"license": "MIT",
"version": "1.2.0",
"dependencies": {
"jquery": "~2.1.1",
"angular-animate": "~1.3.4",
"angular-cookies": "~1.3.4",
"angular-touch": "~1.3.4",
"angular-sanitize": "~1.3.4",
"angular-ui-router": "~0.2.13",
"angular-material": "0.10.0",
"angular": "1.3.15",
"angular-nvd3": "1.0.0-rc.2"
"angular-animate": "^1.5.0",
"angular-cookies": "^1.5.0",
"angular-touch": "^1.5.0",
"angular-sanitize": "^1.5.0",
"angular-ui-router": "^0.2.18",
"angular": "^1.5.0",
"angular-nvd3": "1.0.0-rc.2",
"angular-material": "^1.0.6",
"angular-mocks": "^1.5.0"
},
"devDependencies": {
"angular-mocks": "~1.3.4"
},
"resolutions": {
"angular": "~1.3.4"
}
"devDependencies": {}
}
1 change: 1 addition & 0 deletions src/app/stylesheets/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ body {

&-toolbar {
box-shadow: none;
margin: 0;
}

&-tittle {
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/partials/memory.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<md-content ng-controller="MemoryController as vm" class="md-padding" layout="row" layout-align="center center">
<md-content ng-controller="MemoryController as vm" layout="row" layout-align="center center">
<nvd3 options="vm.chartOptions" data="vm.memoryChartData"></nvd3>
</md-content>
2 changes: 1 addition & 1 deletion src/app/views/partials/visitors.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<md-content ng-controller="VisitorsController as vm" class="md-padding" layout="row" layout-align="center center">
<md-content ng-controller="VisitorsController as vm" layout="row" layout-align="center center">
<nvd3 options="vm.chartOptions" data="vm.visitorsChartData"></nvd3>
</md-content>
2 changes: 1 addition & 1 deletion src/app/views/partials/warnings.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<md-content ng-controller="WarningsController as vm" class="md-padding" layout="row" layout-align="center center">
<md-content ng-controller="WarningsController as vm" layout="row" layout-align="center center">
<nvd3 options="vm.chartOptions" data="vm.warningsChartData"></nvd3>
</md-content>

0 comments on commit ac3272a

Please sign in to comment.