diff --git a/bundles/org.openhab.ui.basic/gulpfile.js b/bundles/org.openhab.ui.basic/gulpfile.js
index 19909d3833..3700117a2b 100644
--- 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
index 1427da5adb..d426d42037 100644
--- a/bundles/org.openhab.ui.basic/package-lock.json
+++ b/bundles/org.openhab.ui.basic/package-lock.json
@@ -12,7 +12,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"
}
},
@@ -3612,10 +3612,10 @@
"node": ">=0.10.0"
}
},
- "node_modules/material-design-icons": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
- "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78="
+ "node_modules/material-icons": {
+ "version": "1.13.9",
+ "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.13.9.tgz",
+ "integrity": "sha512-dwuf2C8LR07FcrjRDx0vWnDEcHiDuamXOmtAck8bdONUv5Fi6wR/ubQwPfG1NbcqgPg+y0fHN8Unj5DO+5fV4w=="
},
"node_modules/meow": {
"version": "9.0.0",
@@ -9445,10 +9445,10 @@
}
}
},
- "material-design-icons": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
- "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78="
+ "material-icons": {
+ "version": "1.13.9",
+ "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.13.9.tgz",
+ "integrity": "sha512-dwuf2C8LR07FcrjRDx0vWnDEcHiDuamXOmtAck8bdONUv5Fi6wR/ubQwPfG1NbcqgPg+y0fHN8Unj5DO+5fV4w=="
},
"meow": {
"version": "9.0.0",
diff --git a/bundles/org.openhab.ui.basic/package.json b/bundles/org.openhab.ui.basic/package.json
index 1014b4e55b..ff45e13a4f 100644
--- 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
index 7ba8b87657..6fd08fb3f0 100644
--- 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 @@
-%icon_name%
\ No newline at end of file
+%icon_name%
\ No newline at end of file
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
index 71b9859b62..7192d2f651 100644
--- 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 {
@@ -15,12 +14,12 @@
font-style: normal;
font-size: 24px; /* Preferred icon size */
display: inline-block;
- width: 1em;
- height: 1em;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
+ white-space: nowrap;
+ direction: ltr;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
@@ -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
index 2431a97b01..cf9b823387 100644
--- 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) {