[BasicUI] Upgrade to last version of Material icons

Fixes openhab#2011 Fixes openhab#2015 Signed-off-by: Laurent Garnier <lg.hc@free.fr>
lolodomo · Aug 10, 2023 · 038056d · 038056d
1 parent 0d34818
commit 038056d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 27 deletions.
diff --git a/bundles/org.openhab.ui.basic/gulpfile.js b/bundles/org.openhab.ui.basic/gulpfile.js
@@ -16,8 +16,7 @@
 
 	var paths = {
 	        FontLibs: [
-			'./node_modules/material-design-icons/iconfont/MaterialIcons-Regular.woff*',
-			'./node_modules/material-design-icons/iconfont/MaterialIcons-Regular.ttf'
+			'./node_modules/material-icons/iconfont/material-icons.woff*'
 	        ]
 	    };
 

diff --git a/bundles/org.openhab.ui.basic/package-lock.json b/bundles/org.openhab.ui.basic/package-lock.json
diff --git a/bundles/org.openhab.ui.basic/package.json b/bundles/org.openhab.ui.basic/package.json
@@ -10,7 +10,7 @@
     "gulp-eslint": "^6.0.0",
     "gulp-sass": "^5.0.0",
     "gulp-uglify": "^3.0.2",
-    "material-design-icons": "^3.0.1",
+    "material-icons": "^1.13.9",
     "node-sass": "^8.0.0"
   }
 }
diff --git a/bundles/org.openhab.ui.basic/src/main/resources/snippets/icon_material.html b/bundles/org.openhab.ui.basic/src/main/resources/snippets/icon_material.html
@@ -1 +1 @@
-<spam class="material-icons md-oh">%icon_name%</spam>
+<spam class="material-icons">%icon_name%</spam>
diff --git a/bundles/org.openhab.ui.basic/src/main/resources/web/material-icons.css b/bundles/org.openhab.ui.basic/src/main/resources/web/material-icons.css
@@ -4,9 +4,8 @@
   font-weight: 400;
   src: local('Material Icons'),
        local('MaterialIcons-Regular'),
-       url(fonts/MaterialIcons-Regular.woff2) format('woff2'),
-       url(fonts/MaterialIcons-Regular.woff) format('woff'),
-       url(fonts/MaterialIcons-Regular.ttf) format('truetype');
+       url(fonts/material-icons.woff2) format('woff2'),
+       url(fonts/material-icons.woff) format('woff');
 }
 
 .material-icons {
@@ -33,14 +32,3 @@
   /* Support for IE. */
   font-feature-settings: 'liga';
 }
-
-.material-icons.md-oh {
-	font-size: 32px;
-	vertical-align: middle;
-	html:not(.ui-icons-enabled) & {
-		display: none;
-	}
-	html.ui-layout-condensed & {
-		font-size: 28px;
-	}
-}
diff --git a/bundles/org.openhab.ui.basic/web-src/_layout.scss b/bundles/org.openhab.ui.basic/web-src/_layout.scss
@@ -167,6 +167,16 @@
 				font-size: 28px;
 			}
 		}
+		.material-icons {
+			font-size: 32px;
+			vertical-align: middle;
+			html:not(.ui-icons-enabled) & {
+				display: none;
+			}
+			html.ui-layout-condensed & {
+				font-size: 28px;
+			}
+		}
 	}
 	&__label {
 		@media screen and (max-width: $layout-tablet-size-threshold) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<spam class="material-icons md-oh">%icon_name%</spam>
		<spam class="material-icons">%icon_name%</spam>