diff --git a/package-lock.json b/package-lock.json
index 3421508..e78e918 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,6 +100,30 @@
"loader-utils": "1.1.0"
}
},
+ "@fortawesome/fontawesome": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.0.tgz",
+ "integrity": "sha512-HitzVVotHB70QGYaoKvkvaGqKL2P/xdpeg1KK1ESEyI5qBcZdRTWpH9W5XVB72Ev02V4Qo/Ldxjf4UL+kakWdw==",
+ "dev": true
+ },
+ "@fortawesome/fontawesome-free-brands": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.2.tgz",
+ "integrity": "sha512-J7SyvuBFxx3/4VcuSkVlsWxDLCj34Pc1zkOkxQkBDIvmbv6uXC3IUqkhZjyV7AHSM9iDoDeI9CczLk0sJwW25g==",
+ "dev": true
+ },
+ "@fortawesome/fontawesome-free-regular": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.2.tgz",
+ "integrity": "sha512-E4mG2ab0SH9+uEuPvPoDWnIshBGMD3LKih73pR2Kn+qPHujJw/UQXy1D2ousaSD7oLPBO1g0c3dx3laX2i/Neg==",
+ "dev": true
+ },
+ "@fortawesome/fontawesome-free-solid": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.2.tgz",
+ "integrity": "sha512-By7V/yO2XyMonzTmo6KxPcw0OLqycozNDJaASAcky+YZkIL7p1hJ8Ki5OlF4X2z1fMQfpXbbBVfeU6atr1rlUQ==",
+ "dev": true
+ },
"@ng-bootstrap/ng-bootstrap": {
"version": "1.0.0-beta.7",
"resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-beta.7.tgz",
diff --git a/package.json b/package.json
index bcc7d46..5935e30 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,10 @@
"@angular/router": "^5.0.0",
"@angularclass/hmr": "^2.1.0",
"@angularclass/hmr-loader": "^3.0.2",
+ "@fortawesome/fontawesome": "^1.1.0",
+ "@fortawesome/fontawesome-free-brands": "^5.0.2",
+ "@fortawesome/fontawesome-free-regular": "^5.0.2",
+ "@fortawesome/fontawesome-free-solid": "^5.0.2",
"@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.7",
"@types/jquery": "^3.2.16",
"angular2-template-loader": "^0.6.2",
diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
index bb687d8..af713df 100644
--- a/web/app/configs/widget/custom/custom.widget.component.html
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -20,7 +20,10 @@
-
+
+
+ Add {{ defaultName }}
+
-
+
+
+ {{ widget.name || widget.url || defaultName }}
+
diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index 482aa26..6d6dd30 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -1,6 +1,10 @@
-
-
{{ title }}
+
+
+ {{ title }}
+
+
diff --git a/web/app/elements/ibox/ibox.component.scss b/web/app/elements/ibox/ibox.component.scss
index 43a9c84..aa16a24 100644
--- a/web/app/elements/ibox/ibox.component.scss
+++ b/web/app/elements/ibox/ibox.component.scss
@@ -1,32 +1 @@
-.ibox {
- background-color: #fff;
- padding: 0;
- margin-bottom: 30px;
-}
-
-.ibox .ibox-title {
- padding: 5px;
- border-bottom: 1px solid #e7eaec;
- border-top: 2px solid #e7eaec;
-}
-
-.ibox .ibox-title h5 {
- display: inline;
- font-size: 1.1em;
- padding: 5px;
- margin: 0;
-}
-
-.ibox .ibox-content {
- padding: 15px;
-}
-
-.ibox .ibox-title .ibox-icon {
- float: right;
- margin-top: 4px;
- cursor: pointer;
-}
-
-.ibox .ibox-title.ibox-title-collapsible {
- cursor: pointer;
-}
\ No newline at end of file
+// The styles for iboxes are applied at an app level
\ No newline at end of file
diff --git a/web/app/riot/scalar-close/scalar-close.component.html b/web/app/riot/scalar-close/scalar-close.component.html
index f9ee58b..a6d4d5c 100644
--- a/web/app/riot/scalar-close/scalar-close.component.html
+++ b/web/app/riot/scalar-close/scalar-close.component.html
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/web/public/index.html b/web/public/index.html
index 566bbec..2ec6d7d 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -9,7 +9,6 @@
-
diff --git a/web/style/app.scss b/web/style/app.scss
index 50db95e..159ce79 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -1,6 +1,7 @@
// styles in src/style directory are applied to the whole page
@import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
@import '../../node_modules/angular2-toaster/toaster';
+@import "components/ibox";
@import "riot";
body {
@@ -8,7 +9,7 @@ body {
margin: 0;
padding: 0;
color: #333;
- font-family: 'Open Sans', sans-serif;
+ font-family: 'Open Sans', sans-serif !important;
}
// HACK: Work around dialog not showing up
diff --git a/web/style/components/ibox.scss b/web/style/components/ibox.scss
new file mode 100644
index 0000000..43a9c84
--- /dev/null
+++ b/web/style/components/ibox.scss
@@ -0,0 +1,32 @@
+.ibox {
+ background-color: #fff;
+ padding: 0;
+ margin-bottom: 30px;
+}
+
+.ibox .ibox-title {
+ padding: 5px;
+ border-bottom: 1px solid #e7eaec;
+ border-top: 2px solid #e7eaec;
+}
+
+.ibox .ibox-title h5 {
+ display: inline;
+ font-size: 1.1em;
+ padding: 5px;
+ margin: 0;
+}
+
+.ibox .ibox-content {
+ padding: 15px;
+}
+
+.ibox .ibox-title .ibox-icon {
+ float: right;
+ margin-top: 4px;
+ cursor: pointer;
+}
+
+.ibox .ibox-title.ibox-title-collapsible {
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/web/vendor.ts b/web/vendor.ts
index caab141..73f44c5 100644
--- a/web/vendor.ts
+++ b/web/vendor.ts
@@ -5,4 +5,10 @@ import "@angular/common";
import "@angular/http";
import "@angular/router";
import "rxjs";
-import "@angularclass/hmr";
\ No newline at end of file
+import "@angularclass/hmr";
+import fontawesome from '@fortawesome/fontawesome';
+import solid from '@fortawesome/fontawesome-free-solid';
+import regular from '@fortawesome/fontawesome-free-regular';
+import brands from '@fortawesome/fontawesome-free-brands';
+
+fontawesome.library.add(regular, solid, brands);
\ No newline at end of file