Skip to content

Commit a068cee

Browse files
committed
rework layout, minor refactoring
1 parent 10a7b18 commit a068cee

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed

src/app/stylesheets/_custom.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ $green: #269f19;
2424
}
2525

2626

27+
// VARIABLES
28+
$left-sidenav-width: 150px;
29+
30+
2731
// panel-widget options animation
2832
.options {
2933
-webkit-transition:all linear 0.5s;
@@ -40,7 +44,7 @@ $green: #269f19;
4044
position: relative;
4145

4246
&-content {
43-
height: 600px;
47+
height: 500px;
4448
}
4549
}
4650

@@ -53,3 +57,9 @@ md-radio-group {
5357
md-icon {
5458
height: auto;
5559
}
60+
61+
md-sidenav.md-locked-open.md-sidenav-left {
62+
width: $left-sidenav-width;
63+
min-width: $left-sidenav-width;
64+
max-width: $left-sidenav-width;
65+
}

src/app/views/dashboard.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ <h2 layout-padding>Memory load</h2>
4444
</div>
4545

4646
<div layout-gt-md="row">
47-
<panel-widget flex-gt-md="60" title="Messages" template="app/views/partials/messages.html"></panel-widget>
48-
<div layout="column" flex>
49-
<panel-widget title="Performance" template="app/views/partials/progress.html" options="true"></panel-widget>
50-
<panel-widget flex title="TODO list" template="app/views/partials/checkboxes.html"></panel-widget>
51-
</div>
47+
<panel-widget flex-gt-md="50" title="Performance" template="app/views/partials/progress.html" options="true"></panel-widget>
48+
<panel-widget flex title="TODO list" template="app/views/partials/checkboxes.html"></panel-widget>
5249
</div>

src/app/views/main.html

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<md-sidenav md-is-locked-open="$mdMedia('gt-sm')" md-component-id="left"
22
class="md-whiteframe-z2 md-sidenav-left">
33
<md-toolbar class="md-accent">
4-
<h1 class="md-toolbar-tools">Angular Material Dashboard</h1>
4+
<h1 class="md-toolbar-tools">AMD</h1>
55
</md-toolbar>
66
<md-list>
77
<md-item ng-repeat="item in vm.menuItems">
88
<md-item-content layout="row">
9-
<md-button layout="row" flex ng-click="vm.selectItem(item)"
9+
<md-button layout="column" layout-align="center center" flex ng-click="vm.selectItem(item)"
1010
ui-sref-active="md-accent" ui-sref="{{item.sref}}">
11-
<div hide-sm hide-md flex="20" class="md-tile-content">
11+
<div hide-sm hide-md class="md-tile-content">
1212
<md-icon md-svg-icon="{{item.icon}}"></md-icon>
1313
</div>
14-
<div layout="row" class="md-tile-content">
14+
<div class="md-tile-content">
1515
{{item.name}}
1616
</div>
1717
</md-button>
@@ -38,17 +38,24 @@ <h1 class="md-toolbar-tools">Angular Material Dashboard</h1>
3838
</md-button>
3939

4040
<h2 class="md-toolbar-tools">{{vm.title}}</h2>
41-
42-
<md-select hide-sm hide-md layout-fill flex="10" layout="row" placeholder="Admin" ng-model="admin">
43-
<md-option ui-sref="home.profile" value="1">Profile</md-option>
44-
<md-option ng-click="vm.showActions($event)" value="2">Actions</md-option>
45-
</md-select>
46-
47-
<!-- TODO: replace md-icon to ng-src and fix images paths in build -->
48-
<md-icon hide-sm hide-md flex="10" md-svg-icon="user"></md-icon>
4941
</md-toolbar>
5042

5143
<md-content flex class="md-padding">
5244
<div ui-view></div>
5345
</md-content>
5446
</div>
47+
48+
<md-sidenav md-is-locked-open="$mdMedia('gt-sm')" md-component-id="right"
49+
class="md-whiteframe-z2 md-sidenav-right">
50+
<md-toolbar class="md-accent" layout="row">
51+
<!-- TODO: replace md-icon to ng-src and fix images paths in build -->
52+
<md-icon hide-sm hide-md md-svg-icon="user"></md-icon>
53+
54+
<md-select hide-sm hide-md placeholder="Admin" ng-model="admin">
55+
<md-option ui-sref="home.profile" value="1">Profile</md-option>
56+
<md-option ng-click="vm.showActions($event)" value="2">Actions</md-option>
57+
</md-select>
58+
</md-toolbar>
59+
60+
<panel-widget flex-gt-md="60" title="Messages" template="app/views/partials/messages.html"></panel-widget>
61+
</md-sidenav>

src/app/views/partials/messages.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<md-item ng-repeat="message in vm.messages">
99
<md-divider></md-divider>
1010
<md-item-content>
11-
<md-icon flex-gt-md="10" flex="20" md-svg-icon="user"></md-icon>
11+
<md-icon flex="20" md-svg-icon="user"></md-icon>
1212
<div class="md-tile-content">
1313
<h3>{{message.subject}}</h3>
1414
<h4>{{message.userName}}</h4>
@@ -25,7 +25,7 @@ <h4>{{message.userName}}</h4>
2525
<md-item ng-repeat="message in vm.messages">
2626
<md-divider></md-divider>
2727
<md-item-content>
28-
<md-icon flex-gt-md="10" flex="20" md-svg-icon="user"></md-icon>
28+
<md-icon flex="20" md-svg-icon="user"></md-icon>
2929
<div class="md-tile-content">
3030
<h3>{{message.subject}}</h3>
3131
<h4>{{message.userName}}</h4>
@@ -42,7 +42,7 @@ <h4>{{message.userName}}</h4>
4242
<md-item ng-repeat="message in vm.messages">
4343
<md-divider></md-divider>
4444
<md-item-content>
45-
<md-icon flex-gt-md="10" flex="20" md-svg-icon="user"></md-icon>
45+
<md-icon flex="20" md-svg-icon="user"></md-icon>
4646
<div class="md-tile-content">
4747
<h3>{{message.subject}}</h3>
4848
<h4>{{message.userName}}</h4>
@@ -59,7 +59,7 @@ <h4>{{message.userName}}</h4>
5959
<md-item ng-repeat="message in vm.messages">
6060
<md-divider></md-divider>
6161
<md-item-content>
62-
<md-icon flex-gt-md="10" flex="20" md-svg-icon="user"></md-icon>
62+
<md-icon flex="20" md-svg-icon="user"></md-icon>
6363
<div class="md-tile-content">
6464
<h3>{{message.subject}}</h3>
6565
<h4>{{message.userName}}</h4>

0 commit comments

Comments
 (0)