Skip to content

Commit 9f62452

Browse files
committed
upgrade angular-material to v0.10.0
- replace md-select to md-menu - refactoring
1 parent a890590 commit 9f62452

File tree

7 files changed

+41
-67
lines changed

7 files changed

+41
-67
lines changed

.editorconfig

Lines changed: 0 additions & 13 deletions
This file was deleted.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"angular-touch": "~1.3.4",
1212
"angular-sanitize": "~1.3.4",
1313
"angular-ui-router": "~0.2.13",
14-
"angular-material": "~0.8.3",
14+
"angular-material": "~0.10.0",
1515
"angular": "~1.3.4",
1616
"angular-google-chart": "~0.0.11"
1717
},

src/app/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,13 @@ angular.module('angularMaterialAdmin', ['ngAnimate', 'ngCookies', 'ngTouch',
5858
$mdThemingProvider.theme('red', 'default')
5959
.primaryPalette('red');
6060

61+
$mdThemingProvider.theme('custom', 'default')
62+
.primaryPalette('defaultPrimary', {
63+
'hue-1': '50'
64+
});
65+
6166
$mdThemingProvider.definePalette('defaultPrimary', {
62-
'50': '#E75753',
67+
'50': '#FFFFFF',
6368
'100': '#E75753',
6469
'200': '#E75753',
6570
'300': '#E75753',
@@ -72,12 +77,7 @@ angular.module('angularMaterialAdmin', ['ngAnimate', 'ngCookies', 'ngTouch',
7277
'A100': '#E75753',
7378
'A200': '#E75753',
7479
'A400': '#E75753',
75-
'A700': '#E75753',
76-
'contrastDefaultColor': 'light', // whether, by default, text (contrast)
77-
// on this palette should be dark or light
78-
'contrastDarkColors': ['50', '100', //hues which contrast should be 'dark' by default
79-
'200', '300', '400', 'A100'],
80-
'contrastLightColors': undefined // could also specify this if default was 'dark'
80+
'A700': '#E75753'
8181
});
8282

8383
$mdIconProvider

src/app/stylesheets/_custom.scss

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ $accent-color: #E75753;
2828

2929

3030
// VARIABLES
31-
$left-sidenav-width: 120px;
32-
33-
$font-weight-normal: 400;
31+
$left-sidenav-width: 110px;
3432

3533

3634
// PANEL-WIDGET
@@ -53,7 +51,7 @@ $font-weight-normal: 400;
5351
position: relative;
5452

5553
&-content {
56-
height: 500px;
54+
height: 80vh;
5755
}
5856
}
5957

@@ -79,17 +77,14 @@ body {
7977
color: $text-color;
8078
}
8179

82-
.sidenav-button {
83-
text-transform: none;
84-
}
85-
86-
h1 {
87-
color: $accent-color;
88-
font-weight: $font-weight-normal;
89-
}
90-
9180

9281
// CHARTS
9382
.donut-chart-title{
9483
text-align: center;
9584
}
85+
86+
87+
// UTILS
88+
.capitalize {
89+
text-transform: capitalize;
90+
}

src/app/views/dashboard.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ <h2 layout-padding>Memory load</h2>
3939
</md-grid-list>
4040

4141
<div layout-gt-md="row">
42-
<panel-widget flex title="Information Panel" template="app/views/partials/infoPanel.html" theme="white"></panel-widget>
43-
<panel-widget flex title="Usage Stats" template="app/views/partials/usage.html" theme="white"></panel-widget>
44-
<panel-widget flex title="Autocomplete Input" template="app/views/partials/autocomplete.html" options="true" theme="white"></panel-widget>
42+
<panel-widget flex title="Information Panel" template="app/views/partials/infoPanel.html"></panel-widget>
43+
<panel-widget flex title="Usage Stats" template="app/views/partials/usage.html"></panel-widget>
44+
<panel-widget flex title="Autocomplete Input" template="app/views/partials/autocomplete.html" options="true"></panel-widget>
4545
</div>
4646

4747
<div layout-gt-md="row">
48-
<panel-widget flex title="Performance" template="app/views/partials/progress.html" options="true" theme="white"></panel-widget>
49-
<panel-widget flex title="TODO list" template="app/views/partials/checkboxes.html" theme="white"></panel-widget>
48+
<panel-widget flex title="Performance" template="app/views/partials/progress.html" options="true"></panel-widget>
49+
<panel-widget flex title="TODO list" template="app/views/partials/checkboxes.html"></panel-widget>
5050
</div>

src/app/views/main.html

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
11
<md-sidenav md-is-locked-open="$mdMedia('gt-sm')" md-component-id="left"
22
class="md-whiteframe-z2 md-sidenav-left">
3-
<md-toolbar md-theme="white">
4-
<md-button layout="row" layout-align="center center" class="md-toolbar-tools" href="https://github.com/flatlogic/angular-material-dashboard">
3+
<md-toolbar md-theme="custom" class="md-hue-1 md-whiteframe-z2">
4+
<md-button layout="row" layout-align="center center" class="md-toolbar-tools md-accent"
5+
href="https://github.com/flatlogic/angular-material-dashboard">
56
<h1>AMD</h1>
67
</md-button>
78
</md-toolbar>
8-
<md-list>
9-
<md-item ng-repeat="item in vm.menuItems">
10-
<md-item-content layout="row">
11-
<md-button layout="column" layout-align="center center" flex ng-click="vm.selectItem(item)"
12-
ui-sref-active="md-accent" ui-sref="{{item.sref}}" class="sidenav-button">
9+
<md-button ng-repeat-start="item in vm.menuItems" layout="column" layout-align="center center"
10+
flex class="capitalize" ng-click="vm.selectItem(item)"
11+
ui-sref-active="md-accent" ui-sref="{{item.sref}}">
1312
<div hide-sm hide-md class="md-tile-content">
14-
<md-icon md-svg-icon="{{item.icon}}"></md-icon>
13+
<md-icon md-svg-icon="{{item.icon}}"></md-icon>
1514
</div>
1615
<div class="md-tile-content">
17-
{{item.name}}
16+
{{item.name}}
1817
</div>
19-
</md-button>
20-
</md-item-content>
21-
<md-divider></md-divider>
22-
</md-item>
23-
24-
<md-divider hide-gt-md></md-divider>
25-
<md-item hide-gt-md>
26-
<md-item-content>
27-
<md-button flex ng-click="vm.showActions($event)">
18+
</md-button>
19+
<md-divider ng-repeat-end></md-divider>
20+
<md-button hide-gt-md flex ng-click="vm.showActions($event)">
2821
<div layout="row" class="md-tile-content">
2922
Actions
3023
</div>
31-
</md-button>
32-
</md-item-content>
33-
</md-item>
34-
</md-list>
24+
</md-button>
3525
</md-sidenav>
3626

3727
<div layout="column" flex>
@@ -51,11 +41,13 @@ <h1>AMD</h1>
5141
<md-toolbar class="md-accent" layout="row">
5242
<!-- TODO: replace md-icon to ng-src and fix images paths in build -->
5343
<md-icon hide-sm hide-md md-svg-icon="user"></md-icon>
54-
55-
<md-select hide-sm hide-md placeholder="Admin" ng-model="admin">
56-
<md-option ui-sref="home.profile" value="1">Profile</md-option>
57-
<md-option ng-click="vm.showActions($event)" value="2">Actions</md-option>
58-
</md-select>
44+
<md-menu hide-sm hide-md>
45+
<md-button class="capitalize" ng-click="$mdOpenMenu()" aria-label="Open menu">Richard Feynman</md-button>
46+
<md-menu-content>
47+
<md-menu-item><md-button ui-sref="home.profile">Profile</md-button></md-menu-item>
48+
<md-menu-item><md-button ng-click="vm.showActions($event)">Actions</md-button></md-menu-item>
49+
</md-menu-content>
50+
</md-menu>
5951
</md-toolbar>
6052

6153
<section>

src/components/directives/panelWidget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ angular.module('app')
99
scope: { title: '@', template: '@', options: '@' },
1010
template: '' +
1111
'<section layout-margin class="md-whiteframe-z1">' +
12-
' <md-toolbar md-theme="white" class="panel-widget">' +
12+
' <md-toolbar md-theme="custom" class="md-hue-1 panel-widget">' +
1313
' <div class="md-toolbar-tools">' +
1414
' <h3>{{title}}</h3>' +
1515
' <span flex></span>' +

0 commit comments

Comments
 (0)