Skip to content

Commit ac3272a

Browse files
committed
angular upgraded to v1.5, angular material upgraded to v1.0, closes #33, closes #39
1 parent 0cae1b5 commit ac3272a

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

bower.json

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
{
2-
"name": "angular-material-admin",
2+
"name": "angular-material-dashboard",
33
"description": "Material Design Angular Admin Dashboard",
44
"homepage": "https://github.com/micrum/angular-material-admin",
55
"license": "MIT",
66
"version": "1.2.0",
77
"dependencies": {
88
"jquery": "~2.1.1",
9-
"angular-animate": "~1.3.4",
10-
"angular-cookies": "~1.3.4",
11-
"angular-touch": "~1.3.4",
12-
"angular-sanitize": "~1.3.4",
13-
"angular-ui-router": "~0.2.13",
14-
"angular-material": "0.10.0",
15-
"angular": "1.3.15",
16-
"angular-nvd3": "1.0.0-rc.2"
9+
"angular-animate": "^1.5.0",
10+
"angular-cookies": "^1.5.0",
11+
"angular-touch": "^1.5.0",
12+
"angular-sanitize": "^1.5.0",
13+
"angular-ui-router": "^0.2.18",
14+
"angular": "^1.5.0",
15+
"angular-nvd3": "1.0.0-rc.2",
16+
"angular-material": "^1.0.6",
17+
"angular-mocks": "^1.5.0"
1718
},
18-
"devDependencies": {
19-
"angular-mocks": "~1.3.4"
20-
},
21-
"resolutions": {
22-
"angular": "~1.3.4"
23-
}
19+
"devDependencies": {}
2420
}

src/app/stylesheets/_custom.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ body {
7676

7777
&-toolbar {
7878
box-shadow: none;
79+
margin: 0;
7980
}
8081

8182
&-tittle {

src/app/views/partials/memory.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<md-content ng-controller="MemoryController as vm" class="md-padding" layout="row" layout-align="center center">
1+
<md-content ng-controller="MemoryController as vm" layout="row" layout-align="center center">
22
<nvd3 options="vm.chartOptions" data="vm.memoryChartData"></nvd3>
33
</md-content>

src/app/views/partials/visitors.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<md-content ng-controller="VisitorsController as vm" class="md-padding" layout="row" layout-align="center center">
1+
<md-content ng-controller="VisitorsController as vm" layout="row" layout-align="center center">
22
<nvd3 options="vm.chartOptions" data="vm.visitorsChartData"></nvd3>
33
</md-content>

src/app/views/partials/warnings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<md-content ng-controller="WarningsController as vm" class="md-padding" layout="row" layout-align="center center">
1+
<md-content ng-controller="WarningsController as vm" layout="row" layout-align="center center">
22
<nvd3 options="vm.chartOptions" data="vm.warningsChartData"></nvd3>
33
</md-content>

0 commit comments

Comments
 (0)