Skip to content

Commit

Permalink
revert angular-material-icons change
Browse files Browse the repository at this point in the history
to close issue #552
  • Loading branch information
Dave Conway-Jones committed Dec 4, 2019
1 parent d2168f0 commit f415637
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### 2.19.2: Maintenance Release

**Fixes**

- Revert dropping of angular material icons with animation. Issue #552

### 2.19.1: Maintenance Release

**Enhancements**
Expand Down
4 changes: 2 additions & 2 deletions dist/dashboard.appcache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Tue Dec 03 2019 22:27:57 GMT+0000 (Greenwich Mean Time)
# Time: Wed Dec 04 2019 20:47:56 GMT+0000 (Greenwich Mean Time)

CACHE:
i18n.js
Expand All @@ -26,4 +26,4 @@ fonts/weather-icons-lite.woff2
NETWORK:
*

# hash: d3b203b0341fae238af94ece4fa195d940487c62fa9f1f10ffb2a4ebfd3e2792
# hash: 012a79f2846b6164722544e7d432b9b9bad32b79693cd12d070d8ad4267e97c0
4 changes: 2 additions & 2 deletions dist/js/app.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-red-dashboard",
"version": "2.19.1",
"version": "2.19.2",
"description": "A set of dashboard nodes for Node-RED",
"keywords": [
"node-red"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui-icon/ui-icon.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ng-md-icon ng-if="iconType==='angular-material'" icon="{{icon}}"></ng-md-icon>
<div ng-if="iconType==='fa'" style="display:inline-block; margin:auto; line-height:initial;"><i class="fa fa-fw" ng-class="icon"></i></div>
<div ng-if="iconType==='wi'" style="display:inline-block; margin:auto; line-height:initial;"><i class="wi wi-fw" ng-class="icon"></i></div>
<div ng-if="iconType==='mi'" style="display:inline-block; margin:auto; line-height:initial;"><i class="material-icons" ng-class="icon">{{icon.substr(3)}}</i></div>
<div ng-if="iconType==='ma'" style="display:inline-block; margin:auto; line-height:initial;"><i class="material-icons">{{icon}}</i></div>
<div ng-if="iconType==='icofont'" style="display:inline-block; margin:auto; line-height:initial;"><i class="icofont icofont-fw" ng-class="icon"></i></div>
<img ng-if="iconType==='image'" ng-src="{{url}}" style="width:24px; display:block; margin:auto; line-height:initial;"></img>
2 changes: 1 addition & 1 deletion src/components/ui-icon/ui-icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ angular.module('ui').directive('uiIcon',
else if (wi.test(newValue)) { scope.iconType = 'wi'; }
else if (mi.test(newValue)) { scope.iconType = 'mi'; }
else if (ic.test(newValue)) { scope.iconType = 'icofont'; }
else { scope.iconType = 'ma'; }
else { scope.iconType = 'angular-material'; }
});
}
};
Expand Down

0 comments on commit f415637

Please sign in to comment.