From 4f48232507b0b77d2126715bbda25fb21af66ab4 Mon Sep 17 00:00:00 2001 From: Humberto Alfonso Díaz Date: Tue, 10 Dec 2019 14:37:55 +0100 Subject: FUNCT Replace icomoon with font-awesome --- package.json | 1 + src/config.json | 18 ++++----- src/index.html | 4 +- src/styles/app.scss | 3 +- src/styles/fonts/icomoon.eot | Bin 7340 -> 0 bytes src/styles/fonts/icomoon.svg | 30 --------------- src/styles/fonts/icomoon.ttf | Bin 7176 -> 0 bytes src/styles/fonts/icomoon.woff | Bin 7252 -> 0 bytes src/styles/main.scss | 2 +- src/styles/style.css | 87 ------------------------------------------ 10 files changed, 14 insertions(+), 131 deletions(-) delete mode 100755 src/styles/fonts/icomoon.eot delete mode 100755 src/styles/fonts/icomoon.svg delete mode 100755 src/styles/fonts/icomoon.ttf delete mode 100755 src/styles/fonts/icomoon.woff delete mode 100755 src/styles/style.css diff --git a/package.json b/package.json index 2c970a2..ac1f45d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "automotivegradelinux" ], "devDependencies": { + "@fortawesome/fontawesome-free": "^5.11.2", "clean-webpack-plugin": "^1.0.1", "copy-webpack-plugin": "^4.6.0", "css-loader": "^2.1.0", diff --git a/src/config.json b/src/config.json index 81e451e..5a53010 100644 --- a/src/config.json +++ b/src/config.json @@ -2,27 +2,27 @@ "apps": [ { "id": "webapps-mediaplayer", - "icon": "icon icon-music" + "icon": "fas fa-music" }, { "id": "webapps-hvac", - "icon": "icon icon-thermometer" + "icon": "fas fa-thermometer-half" }, { "id": "navigation", - "icon": "icon icon-location" + "icon": "fas fa-location-arrow" }, { "id": "webapps-html5-launcher", - "icon": "icon icon-home" + "icon": "fas fa-home" } ], "launch": "webapps-html5-launcher", "network": { - "bluetooth": "icon-bluetooth", - "ethernet": "icon-ethernet", - "wifi": "icon-wifi", - "p2p": "icon-p2p", - "cellular": "icon-signal" + "bluetooth": "fab fa-bluetooth-b", + "ethernet": "fas fa-network-wired", + "wifi": "fas fa-wifi", + "p2p": "fas fa-laptop", + "cellular": "fas fa-mobile-alt" } } \ No newline at end of file diff --git a/src/index.html b/src/index.html index 90b9b19..a2ab134 100644 --- a/src/index.html +++ b/src/index.html @@ -24,7 +24,7 @@
diff --git a/src/styles/app.scss b/src/styles/app.scss index 955a9b6..fa41373 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -36,5 +36,4 @@ $colors: ( @import "landscape.scss"; @import "1080.scss"; } - -@import "style.css"; \ No newline at end of file +@import "~@fortawesome/fontawesome-free/css/all.min.css"; diff --git a/src/styles/fonts/icomoon.eot b/src/styles/fonts/icomoon.eot deleted file mode 100755 index 7e69c11..0000000 Binary files a/src/styles/fonts/icomoon.eot and /dev/null differ diff --git a/src/styles/fonts/icomoon.svg b/src/styles/fonts/icomoon.svg deleted file mode 100755 index 2d33d65..0000000 --- a/src/styles/fonts/icomoon.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/styles/fonts/icomoon.ttf b/src/styles/fonts/icomoon.ttf deleted file mode 100755 index cb60c5f..0000000 Binary files a/src/styles/fonts/icomoon.ttf and /dev/null differ diff --git a/src/styles/fonts/icomoon.woff b/src/styles/fonts/icomoon.woff deleted file mode 100755 index f650b1f..0000000 Binary files a/src/styles/fonts/icomoon.woff and /dev/null differ diff --git a/src/styles/main.scss b/src/styles/main.scss index 8f90f1c..cab20c6 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -36,7 +36,7 @@ body { width: 100%; height: $header_size*0.70; line-height: $header_size*0.70; - font-size: 6em; + font-size: 5em; } .label { diff --git a/src/styles/style.css b/src/styles/style.css deleted file mode 100755 index d5e91a9..0000000 --- a/src/styles/style.css +++ /dev/null @@ -1,87 +0,0 @@ -@font-face { - font-family: 'icomoon'; - src: url('fonts/icomoon.eot?a4dqxr'); - src: url('fonts/icomoon.eot?a4dqxr#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?a4dqxr') format('truetype'), - url('fonts/icomoon.woff?a4dqxr') format('woff'), - url('fonts/icomoon.svg?a4dqxr#icomoon') format('svg'); - font-weight: normal; - font-style: normal; - font-display: block; -} - -[class^="icon-"], [class*=" icon-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-ethernet:before { - content: "\e903"; -} -.icon-sunrise:before { - content: "\e900"; -} -.icon-sun:before { - content: "\e901"; -} -.icon-moon:before { - content: "\e902"; -} -.icon-wind:before { - content: "\e905"; -} -.icon-cloudy:before { - content: "\e907"; -} -.icon-cloud:before { - content: "\e908"; -} -.icon-lightning:before { - content: "\e90e"; -} -.icon-rainy:before { - content: "\e911"; -} -.icon-snowy2:before { - content: "\e916"; -} -.icon-celsius:before { - content: "\e92d"; -} -.icon-fahrenheit:before { - content: "\e92e"; -} -.icon-music:before { - content: "\f001"; -} -.icon-signal:before { - content: "\f012"; -} -.icon-home:before { - content: "\f015"; -} -.icon-p2p:before { - content: "\f109"; -} -.icon-location:before { - content: "\f124"; -} -.icon-wifi:before { - content: "\f1eb"; -} -.icon-bluetooth:before { - content: "\f294"; -} -.icon-thermometer:before { - content: "\f2c7"; -} -- cgit 1.2.3-korg