Fix Roboto font, viewport meta tag, rr4j charts (#28)

Signed-off-by: Yannick Schaus <[email protected]>
openhab · Oct 2, 2016 · c869fc6 · c869fc6
1 parent bfbae48
commit c869fc6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/web/app/widgets/chart/chart.widget.js b/web/app/widgets/chart/chart.widget.js
@@ -38,7 +38,7 @@
                 var height = element[0].parentNode.parentNode.parentNode.style.height.replace('px', '');
                 if (scope.vm.widget.charttype === 'rrd4j') { // why?
                     scope.vm.width = sprintf("%d", width - 109);
-                    scope.vm.height = sprintf("%d", height - 78);
+                    scope.vm.height = sprintf("%d", height - 91);
                 } else if (scope.vm.widget.charttype === 'default') {
                     scope.vm.width = sprintf("%d", width - 20);
                     scope.vm.height = sprintf("%d", height - 20);

diff --git a/web/index.html b/web/index.html
@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<title>HABpanel</title>
 		<meta name="description" content="Dashboard user interface for openHAB" />
-		<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
 		<meta name="apple-mobile-web-app-capable" content="yes">
 
 		<link rel="stylesheet" href="vendor/vendor.min.css" />

diff --git a/web/vendor/vendor.min.css b/web/vendor/vendor.min.css
diff --git a/web/vendor/vendor.scss b/web/vendor/vendor.scss
@@ -1,13 +1,13 @@
 @font-face {
   font-family: Roboto;
-  src: url("fonts/roboto/Roboto-Regular.eot");
+  src: url("../fonts/roboto/Roboto-Regular.eot");
   src: local("Roboto Regular"),
        local("Roboto-Regular"),
-       url("fonts/roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"),
-       url("fonts/roboto/Roboto-Regular.woff2") format("woff2"),
-       url("fonts/roboto/Roboto-Regular.woff") format("woff"),
-       url("fonts/roboto/Roboto-Regular.ttf") format("truetype"),
-       url("fonts/roboto/Roboto-Regular.svg#Roboto") format("svg");
+       url("../fonts/roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"),
+       url("../fonts/roboto/Roboto-Regular.woff2") format("woff2"),
+       url("../fonts/roboto/Roboto-Regular.woff") format("woff"),
+       url("../fonts/roboto/Roboto-Regular.ttf") format("truetype"),
+       url("../fonts/roboto/Roboto-Regular.svg#Roboto") format("svg");
   font-weight: 400;
   font-style: normal;
 }