Some codestyle and css fix

camptocamp · Jul 24, 2018 · 65c5bee · 65c5bee
1 parent f34ed31
commit 65c5bee
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 64 deletions.
diff --git a/buildtools/webpack.gmfapps.js b/buildtools/webpack.gmfapps.js
@@ -1,14 +1,12 @@
 const path = require('path');
-const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlWebpackIncludeAssetsPlugin = require('html-webpack-include-assets-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const plugins = [];
 const entry = {};
 
 const filenamePrefix = process.env.DEV_SERVER ? 'contribs/gmf/apps/' : '';
-const name = process.env.APP
+const name = process.env.APP;
 
 const folder = `contribs/gmf/apps/${name}`;
 entry[name] = `./${folder}/Controller.js`;
@@ -17,7 +15,7 @@ plugins.push(
     template: `${folder}/index.html.ejs`,
     inject: false,
     chunksSortMode: 'manual',
-    filename: filenamePrefix + name + '.html',
+    filename: `${filenamePrefix}${name}.html`,
     chunks: ['commons', name]
   })
 );

diff --git a/buildtools/webpack.gmfexamples.js b/buildtools/webpack.gmfexamples.js
@@ -1,6 +1,5 @@
 const path = require('path');
 const ls = require('ls');
-const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const plugins = [];

diff --git a/buildtools/webpack.ngeoexamples.js b/buildtools/webpack.ngeoexamples.js
@@ -1,6 +1,5 @@
 const path = require('path');
 const ls = require('ls');
-const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
@@ -21,7 +20,7 @@ for (const filename of ls('examples/*.html')) {
     new HtmlWebpackPlugin({
       template: `examples/${name}.html`,
       chunksSortMode: 'manual',
-      filename: exampleFilenamePrefix + name + '.html',
+      filename: `${exampleFilenamePrefix}${name}.html`,
       chunks: ['commons', name],
     })
   );

diff --git a/buildtools/webpack.plugin.js b/buildtools/webpack.plugin.js
@@ -277,23 +277,22 @@ class SassPlugin {
             }
             try {
               const assetUrl = url.getValue();
-
-              if (assetUrl.startsWith('~')) {
-                let assetName = url.getValue().substr(1);
-                let queryString = '';
-                const questionMarkIndex = assetName.indexOf('?');
-                if (questionMarkIndex > 0) {
-                  queryString = assetName.substr(questionMarkIndex);
-                  assetName = assetName.substr(0, questionMarkIndex);
-                } else {
-                  const sharpIndex = assetName.indexOf('#');
-                  if (sharpIndex > 0) {
-                    queryString = assetName.substr(sharpIndex);
-                    assetName = assetName.substr(0, sharpIndex);
-                  }
+              let assetName = url.getValue().substr(1);
+              let queryString = '';
+              const questionMarkIndex = assetName.indexOf('?');
+              if (questionMarkIndex > 0) {
+                queryString = assetName.substr(questionMarkIndex);
+                assetName = assetName.substr(0, questionMarkIndex);
+              } else {
+                const sharpIndex = assetName.indexOf('#');
+                if (sharpIndex > 0) {
+                  queryString = assetName.substr(sharpIndex);
+                  assetName = assetName.substr(0, sharpIndex);
                 }
-                promises.push(new Promise((resolve, reject) => {
+              }
 
+              promises.push(new Promise((resolve, reject) => {
+                if (assetUrl.startsWith('~')) {
                   usedContext.resolve(usedContext.resourcePath, assetName, (err, resolvedFile) => {
                     if (err) {
                       console.log(err);
@@ -318,25 +317,26 @@ class SassPlugin {
                       });
                     }
                   });
-                }));
-              } else {
-                fs.readFile(assetName, 'utf8', (err, data) => {
-                  if (err) {
-                    console.log(err);
-                    reject(err);
-                  } else {
-                    usedContext.resourcePath = assetName;
-                    const name = loaderUtils.interpolateName(usedContext, pluginOptions.assetname, {
-                      content: data
-                    });
-                    compilation.assets[name] = {
-                      source: () => data,
-                      size: () => data.length
-                    };
-                    replacements[assetUrl] = name + queryString;
-                  }
-                });
-              }
+                } else {
+                  fs.readFile(assetName, 'utf8', (err, data) => {
+                    if (err) {
+                      console.log(err);
+                      reject(err);
+                    } else {
+                      usedContext.resourcePath = assetName;
+                      const name = loaderUtils.interpolateName(usedContext, pluginOptions.assetname, {
+                        content: data
+                      });
+                      compilation.assets[name] = {
+                        source: () => data,
+                        size: () => data.length
+                      };
+                      replacements[assetUrl] = name + queryString;
+                      resolve();
+                    }
+                  });
+                }
+              }));
             } catch (e) {
               console.error(e.stack || e);
             }

diff --git a/contribs/gmf/src/contextualdata/contextualdata.scss b/contribs/gmf/src/contextualdata/contextualdata.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 .popover.gmf-contextualdata {
   width: 25rem;

diff --git a/contribs/gmf/src/controllers/desktop.scss b/contribs/gmf/src/controllers/desktop.scss
@@ -17,6 +17,10 @@ $search-results-max-height: calc(100vh - $topbar-height + $map-tools-size + (2 *
 
 $border-color: darken($brand-primary, $standard-variation) !default;
 
+@import "~bootstrap/scss/_functions.scss";
+@import "~bootstrap/scss/_variables.scss";
+@import "~font-awesome/scss/_variables.scss";
+
 @import '~gmf/sass/font.scss';
 @import '~gmf/sass/base.scss';
 @import '~gmf/sass/map.scss';
@@ -93,7 +97,7 @@ $footer-height: $input-height-base + 2 * $padding-base-vertical;
     bottom:  -$footer-height;
     // prevent footer to be displayed on 2 lines when screen width is small
     max-height: $footer-height;
-    background-color: fade($main-bg-color, 90%);
+    background-color: rgba($main-bg-color, .9);
     width: 100%;
     /* cancel default navbar bottom margin */
     margin-bottom: 0;
@@ -112,9 +116,11 @@ $footer-height: $input-height-base + 2 * $padding-base-vertical;
       position: absolute;
       /* button is supposed to be .btn-sm */
       bottom: $footer-height - 1;
-      background-color: fade($main-bg-color, 80%);
+      border-top-left-radius: $border-radius-base;
+      border-top-right-radius: $border-radius-base;
       border-bottom-left-radius: 0;
       border-bottom-right-radius: 0;
+      background-color: rgba($main-bg-color, .8);
       padding: 0;
       left: 50%;
       $width: 2.50rem;

diff --git a/contribs/gmf/src/controllers/mobile-nav.scss b/contribs/gmf/src/controllers/mobile-nav.scss
@@ -40,7 +40,7 @@ main {
     top: 0;
     left: 0;
     cursor: pointer;
-    background-color: fade($color, 40%);
+    background-color: rgba($color, .4);
     visibility: hidden;
     opacity: 0;
 

diff --git a/contribs/gmf/src/controllers/mobile.scss b/contribs/gmf/src/controllers/mobile.scss
@@ -1,6 +1,16 @@
 /**
  * Entry point for all styles required for the mobile application.
  */
+
+$search-width: 6 * $map-tools-size !default;
+$border-color: black !default;
+
+@import '~gmf/sass/vars.scss';
+
+@import "~bootstrap/scss/_functions.scss";
+@import "~bootstrap/scss/_variables.scss";
+@import "~font-awesome/scss/_variables.scss";
+
 @import '~gmf/sass/font.scss';
 @import '~gmf/sass/base.scss';
 @import '~gmf/sass/map.scss';

diff --git a/contribs/gmf/src/import/import.scss b/contribs/gmf/src/import/import.scss
@@ -1,6 +1,5 @@
 @import "~font-awesome/scss/_variables.scss";
 @import "~gmf/sass/typeahead.scss";
-@import "~gmf/sass/vars.scss";
 
 gmf-importdatasource {
   input[type=file] {

diff --git a/contribs/gmf/src/layertree/common.scss b/contribs/gmf/src/layertree/common.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 .gmf-layertree-root-tools {
   text-align: right;

diff --git a/contribs/gmf/src/layertree/timeslider.scss b/contribs/gmf/src/layertree/timeslider.scss
@@ -1,5 +1,4 @@
 @import '~gmf/sass/input-range.scss';
-@import '~gmf/sass/vars.scss';
 
 .gmf-time-slider {
 

diff --git a/contribs/gmf/src/lidarprofile/lidarprofile.scss b/contribs/gmf/src/lidarprofile/lidarprofile.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 $lidarprofile-height: 21.88rem;
 $profile-legend-width: 9.38rem;

diff --git a/contribs/gmf/src/profile/profile.scss b/contribs/gmf/src/profile/profile.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 $profile-height: 12.50rem;
 .panel.gmf-profile-container {

diff --git a/contribs/gmf/src/query/grid.scss b/contribs/gmf/src/query/grid.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 $grid-height: 15.62rem;
 $table-height: $grid-height - $app-margin - 2 * $map-tools-size;

diff --git a/contribs/gmf/src/query/window.scss b/contribs/gmf/src/query/window.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 $displayquerywindow-tablet-width: 8 * $map-tools-size;
 $displayquerywindow-detailed-header-height: 3.12rem;

diff --git a/contribs/gmf/src/sass/base.scss b/contribs/gmf/src/sass/base.scss
@@ -5,7 +5,6 @@
 @import '~gmf/css/reset.css';
 @import '~bootstrap/scss/bootstrap.scss';
 
-@import '~gmf/sass/vars.scss';
 
 html, body {
   height: 100%;

diff --git a/contribs/gmf/src/sass/input-range.scss b/contribs/gmf/src/sass/input-range.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 $gmf-input-range-track-box-shadow : 0.06rem 0.06rem 0.06rem rgba(0, 0, 0, 0), 0 0 0.06rem rgba(13, 13, 13, 0);
 $gmf-input-range-track-height: 0.31rem;

diff --git a/contribs/gmf/src/sass/typeahead.scss b/contribs/gmf/src/sass/typeahead.scss
@@ -1,4 +1,3 @@
-@import "~gmf/sass/vars.scss";
 
 .twitter-typeahead {
   width: 100%;

diff --git a/contribs/gmf/src/sass/vars.scss b/contribs/gmf/src/sass/vars.scss
@@ -19,7 +19,6 @@ $map-tools-size: 2.50rem !default;
 $onhover-color: darken($nav-bg, $standard-variation) !default;
 $main-bg-color: #e2e3df !default; // grey light
 
-$search-width: 6 * $map-tools-size;
 
 // Z-indexes
 $below-content-index: 1;
@@ -34,9 +33,8 @@ $above-all: 9999;
 
 $nav-width: 20rem !default;
 
-$border-radius-base: 0 !default;
-$border-radius-small: 0 !default;
-$border-color: black !default;
+$border-radius-base: 2px !default;
+$border-radius-small: 1px !default;
 $input-border-focus: darken($brand-primary, $standard-variation) !default;
 
 // Bootstrap 3 compatibility layer
@@ -47,7 +45,3 @@ $padding-small-horizontal: 0.72rem !default;
 $input-height-base: 1.5rem !default;
 $btn-default-border: #ccc !default;
 $text-color: $gray-dark !default;
-
-@import "~bootstrap/scss/_functions.scss";
-@import "~bootstrap/scss/_variables.scss";
-@import "~font-awesome/scss/_variables.scss";
diff --git a/contribs/gmf/src/search/search.scss b/contribs/gmf/src/search/search.scss
@@ -1,12 +1,13 @@
 @import "~font-awesome/scss/_variables.scss";
-@import "~gmf/sass/vars.scss";
 @import "~gmf/sass/typeahead.scss";
 
 $search-results-max-height: calc(100vh - 6 * $app-margin);
 
 gmf-search {
   top: $app-margin;
   z-index: $content-index;
+  border-color: $border-color;
+  border-radius: $border-radius-base;
 
   & > * {
     display: inline-block;