v2.1.3

Sanji-IO · Mar 21, 2016 · 4ac44ed · 4ac44ed
2 parents 590f07b + dede97d
commit 4ac44ed
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 26 deletions.
diff --git a/app/app.js b/app/app.js
@@ -3,7 +3,6 @@ import 'angular-material-icons.css';
 import 'angular-busy.css';
 import './app.scss';
 
-import 'svg-morpheus';
 import angular from 'angular';
 import 'angular-material';
 import './sanji-window';

diff --git a/app/sanji-window/sanji-window.scss b/app/sanji-window/sanji-window.scss
@@ -3,20 +3,6 @@ $card-header-btn-height: 42px;
 $card-header-btn-width: 42px;
 $card-header-color: #5e5e5e;
 
-.sj-header-color {
-  color: $card-header-color;
-  fill: currentColor;
-}
-
-.sj-menu-icon {
-  background-repeat: no-repeat no-repeat;
-  display: inline-block;
-  vertical-align: middle;
-  height: 24px;
-  width: 24px;
-  margin: auto 3px auto 0;
-}
-
 .sj-window {
   position: relative;
 

diff --git a/app/sanji-window/sanji-window.tpl.html b/app/sanji-window/sanji-window.tpl.html
@@ -5,19 +5,19 @@
         <h3 flex>{{vm.windowName}}</h3>
         <div flex class="sj-window-btn-group">
           <md-button ng-if="undefined!==vm.showLoadingBtn" type="button" aria-label="Refresh" class="md-icon-button" ng-click="vm.refresh()">
-            <ng-md-icon class="sj-header-color" icon="refresh"></ng-md-icon>
+            <ng-md-icon icon="refresh"></ng-md-icon>
           </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 class="sj-header-color" md-menu-origin icon="apps"></ng-md-icon>
+              <ng-md-icon 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 class="sj-menu-icon sj-header-color" ng-if="undefined!==state.icon"
+                    <ng-md-icon ng-if="undefined!==state.icon"
                       md-menu-origin icon="{{::state.icon}}"></ng-md-icon>
                   </div>
                 </md-button>

diff --git a/dist/angular-sanji-window.css b/dist/angular-sanji-window.css
diff --git a/dist/angular-sanji-window.js b/dist/angular-sanji-window.js
diff --git a/dist/angular-sanji-window.js.map b/dist/angular-sanji-window.js.map
diff --git a/package.json b/package.json
@@ -82,8 +82,7 @@
     "angular": "~1.5.0",
     "angular-busy": "cgross/angular-busy#v4.1.3",
     "angular-material": "~1.0.5",
-    "angular-material-icons": "~0.6.0",
-    "svg-morpheus": "alexk111/SVG-Morpheus#v0.1.8"
+    "angular-material-icons": "~0.6.0"
   },
-  "version": "2.1.2"
+  "version": "2.1.3"
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -20,8 +20,7 @@ var config = {
       'angular-material.css': nodeRoot + '/angular-material/angular-material.css',
       'angular-material-icons.css': nodeRoot + '/angular-material-icons/angular-material-icons.css',
       'angular-busy.css': nodeRoot + '/angular-busy/dist/angular-busy.css',
-      'angular-busy': nodeRoot + '/angular-busy/dist/angular-busy.js',
-      'svg-morpheus': nodeRoot + '/svg-morpheus/compile/unminified/svg-morpheus.js'
+      'angular-busy': nodeRoot + '/angular-busy/dist/angular-busy.js'
     },
     extensions: ['', '.js', '.json', 'html', 'scss', 'css']
   },