Merge remote-tracking branch 'origin/1.10' into 1.10

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.10.0-beta.2
+## 06/17/2019
+
+1. [](#bugfix)
+    * Fixed issue with charts in dashboard where label would cut off [#1700](https://github.com/getgrav/grav-plugin-admin/issues/1700)
+
+
 # v1.10.0-beta.1
 ## 06/14/2019
 

languages/en.yaml

@@ -823,3 +823,6 @@ PLUGIN_ADMIN:
   DEBUGGER_PROVIDER_HELP: "Default is PHP Debug Bar, but Clockwork browser extension provides for a less intrusive approach"
   DEBUGGER_DEBUGBAR: "PHP Debug Bar"
   DEBUGGER_CLOCKWORK: "Clockwork Browser Extension"
+  PAGE_ROUTE_NOT_FOUND: "Page route not found"
+  PAGE_ROUTE_FOUND: "Page route found"
+  NO_ROUTE_PROVIDED: "No route provided"

themes/grav/app/dashboard/chart.js

@@ -4,7 +4,7 @@ import { translations } from 'grav-config';
 import { Instance as gpm } from '../utils/gpm';
 import { Instance as updates } from '../updates';
 
-let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+// let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
 
 export const defaults = {
     data: {
@@ -23,7 +23,7 @@ export const defaults = {
         },
         Bar: {
             height: 164,
-            chartPadding: !isFirefox ? 5 : 10, // workaround for older versions of firefox
+            chartPadding: 20, // workaround for older versions of firefox
 
             axisX: {
                 showGrid: false,
@@ -40,7 +40,7 @@ export const defaults = {
                     x: 5,
                     y: 5
                 },
-                scaleMinSpace: !isFirefox ? 20 : 10
+                scaleMinSpace: 25
             }
         }
     }