Skip to content

Commit

Permalink
v2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zack9433 committed Mar 21, 2016
2 parents cc5b09b + 010a2df commit 03935f8
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 7 deletions.
14 changes: 14 additions & 0 deletions app/sanji-window/sanji-window.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ $card-header-btn-height: 42px;
$card-header-btn-width: 42px;
$card-header-color: #5e5e5e;

.sj-header-color {
color: $card-header-color;
}

.sj-window {
position: relative;

Expand All @@ -15,6 +19,16 @@ $card-header-color: #5e5e5e;
.sj-window-btn-group {
text-align: right;
}

.sj-menu-icon {
background-repeat: no-repeat no-repeat;
display: inline-block;
vertical-align: middle;
fill: currentColor;
height: 24px;
width: 24px;
margin: auto 3px auto 0;
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/sanji-window/sanji-window.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ <h3 flex>{{vm.windowName}}</h3>
</md-button>
<md-menu ng-if="1 < vm.sanjiWindowMgr.links.length" md-position-mode="target-right target">
<md-button type="button" aria-label="Open menu" class="md-icon-button" ng-click="$mdOpenMenu($event)">
<ng-md-icon md-menu-origin icon="apps" ng-attr-style="fill: #5e5e5e"></ng-md-icon>
<ng-md-icon class="sj-header-color" md-menu-origin icon="apps"></ng-md-icon>
</md-button>
<md-menu-content width="4">
<md-menu-item ng-repeat="state in vm.sanjiWindowMgr.links track by $index">
<md-button type="button" aria-label="{{::state.linkName}}"
ng-click="vm.sanjiWindowMgr.navigateTo(state.name)">
<div layout>
<p flex ng-bind="::state.linkName"></p>
<ng-md-icon ng-if="undefined!==state.icon"
md-menu-origin icon="{{::state.icon}}" ng-attr-style="fill: #5e5e5e"></ng-md-icon>
<ng-md-icon class="sj-menu-icon sj-header-color" ng-if="undefined!==state.icon"
md-menu-origin icon="{{::state.icon}}"></ng-md-icon>
</div>
</md-button>
</md-menu-item>
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-sanji-window.css

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

Loading

0 comments on commit 03935f8

Please sign in to comment.