Merge pull request #487 from jolevesq/486-gcgeo

fix(gcGeo) fix fgpa for gcGeo website
fgpv-vpgf · Oct 28, 2019 · 8e19dec · 8e19dec
2 parents 6da0994 + cea2365
commit 8e19dec
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/content/samples/frame-preview.tpl b/src/content/samples/frame-preview.tpl
@@ -14,13 +14,15 @@
         var styles = document.createElement('link');
         styles.rel = 'stylesheet';
         styles.type = 'text/css';
-        styles.href = 'https://s-bsc-geoappint.nrn.nrcan.gc.ca/fgpv/fgpv-x.x.x/rv-styles.css'.replace('x.x.x', version).replace('{env}', envar); // TODO: re enable when access 'https://{env}gcgeo.gc.ca/fgpv/fgpv-x.x.x/rv-styles.css'.replace('x.x.x', version).replace('{env}', envar);
+        styles.href = 'https://{env}gcgeo.gc.ca/fgpv/fgpv-x.x.x/rv-styles.css'.replace('x.x.x', version).replace('{env}', envar);
         document.getElementsByTagName('head')[0].appendChild(styles);
 
         // set plugins js and css
         var plugins = localStorage.getItem('configplugins').replace(/"/g, '').replace('[', '').replace(']', '').split(',');
+        if (plugins[0] === "") { plugins = []; }
         for (var i = 0; i < plugins.length; i++) {
-            var path = 'https://s-bsc-geoappint.nrn.nrcan.gc.ca/fgpv/fgpv-x.x.x/plugins/'.replace('x.x.x', version) + plugins[i] + '/' + plugins[i]; //TODO: re enable when access
+            var path = 'https://{env}gcgeo.gc.ca//fgpv/fgpv-x.x.x/plugins/'.replace('x.x.x', version).replace('{env}', envar)
+                + plugins[i] + '/' + plugins[i];
             var script = document.createElement('script')
             script.src = path + '.js';
             document.getElementsByTagName('head')[0].appendChild(script);
@@ -71,7 +73,7 @@
     var version = localStorage.getItem('viewerversion');
     var envar = localStorage.getItem('viewerenv');
     envar = (envar === 'dev') ? 'dev.' : '';
-    scriptTag.src = 'https://s-bsc-geoappint.nrn.nrcan.gc.ca/fgpv/fgpv-x.x.x/rv-main.js'.replace('x.x.x', version).replace('{env}', envar); // TODO: re enable when access 'https://{env}gcgeo.gc.ca/fgpv/fgpv-x.x.x/rv-main.js'.replace('x.x.x', version).replace('{env}', envar);
+    scriptTag.src = 'https://{env}gcgeo.gc.ca//fgpv/fgpv-x.x.x/rv-main.js'.replace('x.x.x', version).replace('{env}', envar);
     document.body.appendChild(scriptTag);
     localStorage.removeItem('configlangs');
     localStorage.removeItem('configpreview');

diff --git a/src/content/styles/base/_all.scss b/src/content/styles/base/_all.scss
@@ -11,7 +11,7 @@ h4, h5, h6 {
 }
 
 textarea {
-         resize:vertical;
+    resize: vertical;
 }
 
 %headings {
@@ -22,6 +22,7 @@ textarea {
 & {
     color: $primary-text-color;
     font-family: $font-family;
+    font-size: $font-size;
     background-color: #FFFFFF;
 }
 

diff --git a/src/content/styles/common/_all.scss b/src/content/styles/common/_all.scss
@@ -6,7 +6,7 @@ Things like mixin declarations, functions, and variables. */
 @import "_palette.scss";
 
 $font-family: Roboto, 'Helvetica Neue', sans-serif !default;
-$font-size:   rem(1.0);
+$font-size:   rem(1.4);
 
 $icon-button-width: 40px;
 $icon-button-height: 40px;

diff --git a/src/content/styles/modules/_dialog.scss b/src/content/styles/modules/_dialog.scss
@@ -27,8 +27,6 @@
     }
 }
 
-
-
 @mixin dialog {
     .av-hide {
         visibility: hidden !important;

diff --git a/src/content/styles/modules/_forms.scss b/src/content/styles/modules/_forms.scss
@@ -54,8 +54,6 @@
     }
 
     .av-legend-snippet {
-        display: flex;
-
         > div:not(:first-child) {
             padding-left: 20px;
         }

diff --git a/src/content/styles/vendor/_angularmaterial.scss b/src/content/styles/vendor/_angularmaterial.scss
@@ -25,4 +25,4 @@ md-input-container {
             display: none;
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,8 +27,6 @@ @@
         }
     }
     @mixin dialog {
         .av-hide {
             visibility: hidden !important;
@@ Expand Down @@