Merge pull request #9464 from camptocamp/GSNGEO-11-clean-css-import

Clean CSS import

contribs/gmf/examples/backgroundlayerselector.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['gmfThemes'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,8 +19,7 @@ MainController.$inject = ['gmfThemes'];
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './backgroundlayerselector.css';
+import './backgroundlayerselector.scss';
 
 import angular from 'angular';
 import gmfBackgroundlayerselectorModule from 'gmf/backgroundlayerselector/module';
@@ -45,6 +43,8 @@ const myModule = angular.module('gmfapp', [
   ngeoMapModule.name,
 ]);
 
+MainController.$inject = ['gmfThemes'];
+
 /**
  * @param {import('gmf/theme/Themes').ThemesService} gmfThemes Themes service.
  * @class

contribs/gmf/examples/backgroundlayerselector.css → contribs/gmf/examples/backgroundlayerselector.scss

@@ -1,3 +1,5 @@
+@import './common_styles.scss';
+
 gmf-map {
   width: 50rem;
   height: 30rem;

contribs/gmf/examples/contextualdata.js

@@ -19,9 +19,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import 'ngeo/contextualdata/contextualdata.scss';
-import './contextualdata.css';
+import './contextualdata.scss';
 
 import angular from 'angular';
 import gmfContextualdataModule from 'gmf/contextualdata/module';

contribs/gmf/examples/contextualdata.css → contribs/gmf/examples/contextualdata.scss

@@ -1,3 +1,6 @@
+@import './common_styles.scss';
+@import 'ngeo/contextualdata/contextualdata.scss';
+
 gmf-map {
   width: 600px;
   height: 400px;

contribs/gmf/examples/datepicker.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['ngeoWMSTime'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,8 +19,7 @@ MainController.$inject = ['ngeoWMSTime'];
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './datepicker.css';
-import './common_styles.scss';
+import './datepicker.scss';
 
 import angular from 'angular';
 import ngeoMiscDatepickerComponent from 'ngeo/misc/datepickerComponent';
@@ -39,6 +37,8 @@ const myModule = angular.module('gmfapp', [
   ngeoMiscWMSTime.name,
 ]);
 
+MainController.$inject = ['ngeoWMSTime'];
+
 /**
  * @class
  * @param {import('ngeo/misc/WMSTime').WMSTime} ngeoWMSTime wmstime service.

examples/datepicker.css → contribs/gmf/examples/datepicker.scss

@@ -1,3 +1,5 @@
+@import './common_styles.scss';
+
 li {
   margin: 20px;
   list-style: none;

contribs/gmf/examples/displayquerygrid.js

@@ -1,5 +1,3 @@
-MainController.$inject = ['gmfThemes', 'gmfDataSourcesManager', 'gmfThemeManager', 'defaultTheme'];
-QueryresultController.$inject = ['ngeoQueryResult'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -21,9 +19,7 @@ QueryresultController.$inject = ['ngeoQueryResult'];
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './displayquerygrid.css';
-import './gmf-hidden.inc.css';
+import './displayquerygrid.scss';
 
 import angular from 'angular';
 import gmfDatasourceManager from 'gmf/datasource/Manager';
@@ -77,6 +73,8 @@ const queryresultComponent = {
 };
 myModule.component('gmfappQueryresult', queryresultComponent);
 
+QueryresultController.$inject = ['ngeoQueryResult'];
+
 /**
  * Demo, NOT USED.
  *
@@ -91,6 +89,8 @@ function QueryresultController(ngeoQueryResult) {
 }
 myModule.controller('gmfappQueryresultController', QueryresultController);
 
+MainController.$inject = ['gmfThemes', 'gmfDataSourcesManager', 'gmfThemeManager', 'defaultTheme'];
+
 /**
  * @class
  * @param {import('gmf/theme/Themes').ThemesService} gmfThemes The gmf themes service.

contribs/gmf/examples/displayquerygrid.css → contribs/gmf/examples/displayquerygrid.scss

@@ -1,3 +1,6 @@
+@import './common_styles.scss';
+@import './gmf-hidden.inc.css';
+
 gmf-map,
 #tree-container {
   float: left;

contribs/gmf/examples/displayquerywindow.js

@@ -1,5 +1,3 @@
-MainController.$inject = ['gmfThemes', 'gmfDataSourcesManager', 'gmfThemeManager', 'defaultTheme'];
-QueryresultController.$inject = ['ngeoQueryResult'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -21,9 +19,7 @@ QueryresultController.$inject = ['ngeoQueryResult'];
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './displayquerywindow.css';
-import './gmf-hidden.inc.css';
+import './displayquerywindow.scss';
 
 import angular from 'angular';
 import gmfDatasourceManager from 'gmf/datasource/Manager';
@@ -75,6 +71,8 @@ const queryresultComponent = {
 };
 myModule.component('appQueryresult', queryresultComponent);
 
+QueryresultController.$inject = ['ngeoQueryResult'];
+
 /**
  * Demo, NOT USED.
  *
@@ -89,6 +87,8 @@ function QueryresultController(ngeoQueryResult) {
 }
 myModule.controller('AppQueryresultController', QueryresultController);
 
+MainController.$inject = ['gmfThemes', 'gmfDataSourcesManager', 'gmfThemeManager', 'defaultTheme'];
+
 /**
  * @class
  * @param {import('gmf/theme/Themes').ThemesService} gmfThemes The gmf themes service.

contribs/gmf/examples/displayquerywindow.css → contribs/gmf/examples/displayquerywindow.scss

@@ -1,3 +1,6 @@
+@import './common_styles.scss';
+@import './gmf-hidden.inc.css';
+
 gmf-map,
 #tree-container {
   float: left;

contribs/gmf/examples/drawfeature.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['$scope', 'ngeoFeatureHelper', 'ngeoFeatures', 'ngeoToolActivateMgr'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,8 +19,7 @@ MainController.$inject = ['$scope', 'ngeoFeatureHelper', 'ngeoFeatures', 'ngeoTo
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './drawfeature.css';
+import './drawfeature.scss';
 
 import angular from 'angular';
 import 'bootstrap/js/src/tooltip';
@@ -53,6 +51,8 @@ const myModule = angular.module('gmfapp', [
   ngeoMiscToolActivateMgr.name,
 ]);
 
+MainController.$inject = ['$scope', 'ngeoFeatureHelper', 'ngeoFeatures', 'ngeoToolActivateMgr'];
+
 /**
  * @param {angular.IScope} $scope Angular scope.
  * @param {import('ngeo/misc/FeatureHelper').FeatureHelper} ngeoFeatureHelper Gmf feature helper service.

contribs/gmf/examples/drawfeature.css → contribs/gmf/examples/drawfeature.scss

@@ -1,3 +1,5 @@
+@import './common_styles.scss';
+
 gmf-map {
   width: 600px;
   height: 400px;
@@ -146,7 +148,6 @@ gmf-featurestyle input[type='range'] {
   left: -10px;
   border: 2px solid #fff;
   -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 0;
-  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 0;
   box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 0;
   z-index: 11;
 }

contribs/gmf/examples/elevation.js

@@ -19,8 +19,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './elevation.css';
+import './elevation.scss';
 
 import angular from 'angular';
 import gmfMapComponent from 'gmf/map/component';

contribs/gmf/examples/elevation.css → contribs/gmf/examples/elevation.scss

@@ -1,3 +1,5 @@
+@import './common_styles.scss';
+
 gmf-map {
   width: 600px;
   height: 400px;

contribs/gmf/examples/featurestyle.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['$scope', 'ngeoFeatureHelper'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,8 +19,7 @@ MainController.$inject = ['$scope', 'ngeoFeatureHelper'];
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './featurestyle.css';
+import './featurestyle.scss';
 
 import angular from 'angular';
 import gmfDrawingFeatureStyleComponent from 'gmf/drawing/featureStyleComponent';
@@ -57,6 +55,8 @@ const myModule = angular.module('gmfapp', [
   ngeoMapModule.name,
 ]);
 
+MainController.$inject = ['$scope', 'ngeoFeatureHelper'];
+
 /**
  * @class
  * @param {angular.IScope} $scope Angular scope.

contribs/gmf/examples/featurestyle.css → contribs/gmf/examples/featurestyle.scss

@@ -1,3 +1,5 @@
+@import './common_styles.scss';
+
 gmf-map {
   width: 600px;
   height: 400px;
@@ -57,7 +59,6 @@ gmf-featurestyle input[type='range'] {
   left: -10px;
   border: 2px solid #fff;
   -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 0;
-  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 0;
   box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 0;
   z-index: 11;
 }

contribs/gmf/examples/importdatasource.js

@@ -19,10 +19,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import 'ngeo/layertree/common.scss';
-import 'ngeo/layertree/timeslider.scss';
-import './common_styles.scss';
-import './importdatasource.css';
+import './importdatasource.scss';
 
 // Todo - use the 'Filter' theme instead if the 'Edit' theme
 import angular from 'angular';

contribs/gmf/examples/importdatasource.css → contribs/gmf/examples/importdatasource.scss

@@ -1,3 +1,7 @@
+@import './common_styles.scss';
+@import 'ngeo/layertree/common.scss';
+@import 'ngeo/layertree/timeslider.scss';
+
 /* CSS stolen from https://github.com/bassjobsen/typeahead.js-bootstrap-css/ */
 span.twitter-typeahead .tt-menu {
   position: absolute;
@@ -67,17 +71,15 @@ body {
 .panel {
   display: block;
   width: 60rem;
+  float: left;
+  margin: 0.5rem;
 }
 gmf-map {
   width: 71rem;
   height: 40rem;
   display: block;
   margin: 0.5rem;
 }
-.panel {
-  float: left;
-  margin: 0.5rem;
-}
 gmf-filterselector {
   display: block;
   width: 30rem;
@@ -264,13 +266,6 @@ a.gmf-wmscapabilitylayertreenode-expand-node.fa[aria-expanded='true']::before {
 }
 
 .gmf-wmscapabilitylayertreenode-description-toggle {
-  /* display: none; */
   display: block;
   text-align: right;
 }
-
-/*
-.gmf-wmscapabilitylayertreenode-description:hover .gmf-wmscapabilitylayertreenode-description-toggle {
-  display: block;
-}
-*/

contribs/gmf/examples/layertree.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['gmfTreeManager', 'gmfThemes', 'gmfThemeManager', 'ngeoLocation'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,10 +19,7 @@ MainController.$inject = ['gmfTreeManager', 'gmfThemes', 'gmfThemeManager', 'nge
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import 'ngeo/layertree/common.scss';
-import 'ngeo/layertree/timeslider.scss';
-import './common_styles.scss';
-import './layertree.css';
+import './layertree.scss';
 
 import angular from 'angular';
 import gmfDisclaimerModule from 'gmf/disclaimer/module';
@@ -59,6 +55,8 @@ const myModule = angular.module('gmfapp', [
   gmfDisclaimerModule.name,
 ]);
 
+MainController.$inject = ['gmfTreeManager', 'gmfThemes', 'gmfThemeManager', 'ngeoLocation'];
+
 /**
  * @class
  * @param {import('gmf/layertree/TreeManager').LayertreeTreeManager} gmfTreeManager gmf Tree Manager

contribs/gmf/examples/layertree.css → contribs/gmf/examples/layertree.scss

@@ -1,3 +1,7 @@
+@import './common_styles.scss';
+@import 'ngeo/layertree/common.scss';
+@import 'ngeo/layertree/timeslider.scss';
+
 gmf-map {
   width: 600px;
   height: 400px;

contribs/gmf/examples/layertreeadd.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['gmfTreeManager', 'gmfThemes', 'gmfThemeManager', 'ngeoLocation'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,10 +19,7 @@ MainController.$inject = ['gmfTreeManager', 'gmfThemes', 'gmfThemeManager', 'nge
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import 'ngeo/layertree/common.scss';
-import 'ngeo/layertree/timeslider.scss';
-import './common_styles.scss';
-import './layertreeadd.css';
+import './layertreeadd.scss';
 
 import angular from 'angular';
 import gmfDisclaimerModule from 'gmf/disclaimer/module';
@@ -57,6 +53,8 @@ const myModule = angular.module('gmfapp', [
   ngeoMapModule.name,
 ]);
 
+MainController.$inject = ['gmfTreeManager', 'gmfThemes', 'gmfThemeManager', 'ngeoLocation'];
+
 /**
  * @class
  * @param {import('gmf/layertree/TreeManager').LayertreeTreeManager} gmfTreeManager gmf Tree Manager

contribs/gmf/examples/layertreeadd.css → contribs/gmf/examples/layertreeadd.scss

@@ -1,3 +1,7 @@
+@import './common_styles.scss';
+@import 'ngeo/layertree/common.scss';
+@import 'ngeo/layertree/timeslider.scss';
+
 gmf-map {
   width: 600px;
   height: 400px;

contribs/gmf/examples/mobilemeasure.js

@@ -1,4 +1,3 @@
-MainController.$inject = ['gmfPermalink'];
 // The MIT License (MIT)
 //
 // Copyright (c) 2016-2024 Camptocamp SA
@@ -20,8 +19,7 @@ MainController.$inject = ['gmfPermalink'];
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import './common_styles.scss';
-import './mobilemeasure.css';
+import './mobilemeasure.scss';
 
 import angular from 'angular';
 import gmfMapComponent from 'gmf/map/component';
@@ -54,6 +52,8 @@ const myModule = angular.module('gmfapp', [
   ngeoMapModule.name,
 ]);
 
+MainController.$inject = ['gmfPermalink'];
+
 /**
  * @param {import('gmf/permalink/Permalink').PermalinkService} gmfPermalink The gmf permalink service.
  * @class