Remove old theming, use correct theme colors and a friendlier icon

2020-02-22 09:45:41 +01:00
parent 2b5bda2a44
commit a3e14a94cc
24 changed files with 324 additions and 350 deletions
--- a/projects/common-map/src/fm-map/_theme.scss
+++ b/projects/common-map/src/fm-map/_theme.scss
@@ -1,2 +0,0 @@
-//$theme-colors: ( "primary": #a7ce39, "secondary": #ffc800 );
-//$theme-colors: ( "primary": #a7ce39);
--- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss
+++ b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss
@@ -1,4 +1,3 @@
-@import "../../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";


@@ -11,25 +10,25 @@
 }

 .tolerance {
-  fill: theme-color();
+  fill: $primary;
  fill-opacity:0.4;
 }

 .border {
-  fill: white;
+  fill: $white;
 }

 .center {
-  fill: theme-color();
+  fill: $primary;
 }

 .stop1 {
-  stop-color: theme-color();
+  stop-color: $primary;
  stop-opacity:1;
 }

 .stop2 {
-  stop-color: theme-color();
+  stop-color:$primary;
  stop-opacity: 0;
 }

--- a/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss
+++ b/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss
@@ -1,4 +1,3 @@
-@import "../../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";


@@ -6,7 +5,7 @@
  display:block; 
  width:2.5em;
  height:2.5em;
-  background-color: white;
+  background-color: $body-bg;
  background-size: contain;
  margin-top:0.5em;
 }
@@ -16,13 +15,13 @@
 }

 .pan-to {
-  fill: #333333;
+  fill: $secondary;
 }

 .pan-to-centered {
-  fill: theme-color()
+  fill: $primary;
 }

-.pan-to-disabled {
-  fill: #808080;
+.pan-to-centered.pan-to-disabled {
+  fill: $gray-300;
 }
--- a/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss
@@ -1,19 +1,18 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.row {
-  border-bottom: 1px solid gray('500');
-  user-select: none;
-}
-
-.row:hover {
-  background-color: gray('100');
-}
-
-@media screen and (min-width: 44rem)  {
-  .feature-list-container {
-    margin-top: 4rem;
-  }
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.row {
+  border-bottom: 1px solid gray('500');
+  user-select: none;
+}
+
+.row:hover {
+  background-color: gray('100');
+}
+
+@media screen and (min-width: 44rem)  {
+  .feature-list-container {
+    margin-top: 4rem;
+  }
+}
--- a/projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 fm-map-feature-list-feature-container {
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 fm-map-feature-list-feature-container {
--- a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss
@@ -1,30 +1,29 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.thumbnail > img {
-  width: 100%;
-  height: auto;
-}
-
-.thumbnail > div {
-  width: 100%;
-  font-size: 2rem;
-  text-align: center;
-  min-height: 3rem;
-  color: white;
-  padding-top: 0.5rem;
-}
-
-.col {
-  overflow: hidden;
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.thumbnail > img {
+  width: 100%;
+  height: auto;
+}
+
+.thumbnail > div {
+  width: 100%;
+  font-size: 2rem;
+  text-align: center;
+  min-height: 3rem;
+  color: white;
+  padding-top: 0.5rem;
+}
+
+.col {
+  overflow: hidden;
+}
+
--- a/projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss
@@ -1,30 +1,29 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.thumbnail > img {
-  width: 100%;
-  height: auto;
-}
-
-.thumbnail > div {
-  width: 100%;
-  font-size: 2rem;
-  text-align: center;
-  min-height: 3rem;
-  color: white;
-  padding-top: 0.5rem;
-}
-
-.col {
-  overflow: hidden;
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.thumbnail > img {
+  width: 100%;
+  height: auto;
+}
+
+.thumbnail > div {
+  width: 100%;
+  font-size: 2rem;
+  text-align: center;
+  min-height: 3rem;
+  color: white;
+  padding-top: 0.5rem;
+}
+
+.col {
+  overflow: hidden;
+}
+
--- a/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss
@@ -1,30 +1,29 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.thumbnail > img {
-  width: 100%;
-  height: auto;
-}
-
-.thumbnail > div {
-  width: 100%;
-  font-size: 2rem;
-  text-align: center;
-  min-height: 3rem;
-  color: white;
-  padding-top: 0.5rem;
-}
-
-.col {
-  overflow: hidden;
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.thumbnail > img {
+  width: 100%;
+  height: auto;
+}
+
+.thumbnail > div {
+  width: 100%;
+  font-size: 2rem;
+  text-align: center;
+  min-height: 3rem;
+  color: white;
+  padding-top: 0.5rem;
+}
+
+.col {
+  overflow: hidden;
+}
+
--- a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 fm-map-feature-list-feature-container {
--- a/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss
+++ b/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss
@@ -1,27 +1,26 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-.widget {
-  padding:0.8rem;
-  height:100%;
-  width:100%;
-  color:#ffffff;
-  position:relative;
-}
-
-.icon {
-  display:block;
-   font-size:6rem;
-   text-align:center;
-}
-.title {
-  display:block;
-  position:absolute;
-  width:calc(100% - 1.6rem );
-  padding-top:0.5rem;
-  bottom:0.8rem;
-  height:2rem;
-  overflow:hidden;
-  white-space:nowrap;
-  text-overflow:ellipsis;
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+.widget {
+  padding:0.8rem;
+  height:100%;
+  width:100%;
+  color:#ffffff;
+  position:relative;
+}
+
+.icon {
+  display:block;
+   font-size:6rem;
+   text-align:center;
+}
+.title {
+  display:block;
+  position:absolute;
+  width:calc(100% - 1.6rem );
+  padding-top:0.5rem;
+  bottom:0.8rem;
+  height:2rem;
+  overflow:hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+}
--- a/projects/common-map/src/fm-map/components/item-list/item-list.component.scss
+++ b/projects/common-map/src/fm-map/components/item-list/item-list.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 .widget-container {
--- a/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss
+++ b/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss
@@ -1,42 +1,41 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-.widget-container {
-  overflow:auto;
-  margin-bottom:1rem;
-}
-
-.widget {
-  position:relative;
-  border: 1px solid gray('500');
-  user-select: none;
-  display:inline-block;
-  width:50%;
-  overflow:hidden;
-  float:left;
-}
-
-.widget:after {
-  content: "";
-  display: block;
-  padding-bottom: 100%;
-}
-
-.content {
-  position:absolute;
-  width:100%;
-  height:100%;
-}
-
-.widget:hover {
-  background-color: gray('100');
-}
-
-.widget-container {
-  padding:1rem;
-}
-
-.item-container {
-  display:block;
-  height:100%;
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+.widget-container {
+  overflow:auto;
+  margin-bottom:1rem;
+}
+
+.widget {
+  position:relative;
+  border: 1px solid gray('500');
+  user-select: none;
+  display:inline-block;
+  width:50%;
+  overflow:hidden;
+  float:left;
+}
+
+.widget:after {
+  content: "";
+  display: block;
+  padding-bottom: 100%;
+}
+
+.content {
+  position:absolute;
+  width:100%;
+  height:100%;
+}
+
+.widget:hover {
+  background-color: gray('100');
+}
+
+.widget-container {
+  padding:1rem;
+}
+
+.item-container {
+  display:block;
+  height:100%;
+}
--- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html
+++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html
@@ -1,5 +1,5 @@
 <div class="rounded-circle layer-switcher" (click)="handleClick($event)">
-  <i class="fa fa-map"></i>  
+  <i class="fa fa-map-o"></i>  
  <div class="layers hidden" [ngClass]="{'hidden':!(showLayerSwitcher|async)}" (click)="$event.stopPropagation();">
    <div class="card layers-card m-1">
      <div class="card-header" i18n>
@@ -8,13 +8,13 @@
      </div>
      <ul class="navbar-nav">
        <li class="nav-item py-0">
-          <span i18n><i class="fa fa-map" aria-hidden="true"></i> Base maps</span>
+          <span i18n><i class="fa fa-map-o" aria-hidden="true"></i> Base maps</span>
          <div  class="mb-4">
            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
          </div>
        </li>
        <li class="nav-item py-0">
-          <span i18n><i class="fa fa-map" aria-hidden="true"></i> Overlays</span>
+          <span i18n><i class="fa fa-map-o" aria-hidden="true"></i> Overlays</span>
          <div class="mb-4">
            <fm-map-layer-list [itemLayers]="overlayLayers|async" [selectedLayer]="selectedOverlayLayer|async" (onDelete)="handleOnDelete($event)" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
          </div>
--- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss
+++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";


@@ -6,11 +5,12 @@
  display:block; 
  width:2.5em;
  height:2.5em;
-  background-color: white;
+  background-color: $body-bg;
  background-size: contain;
  margin-top:0.5em;
  text-align: center;
  line-height: 2.5em; 
+  color: $secondary;
 }

 .layers {
--- a/projects/common-map/src/fm-map/components/map/map.component.scss
+++ b/projects/common-map/src/fm-map/components/map/map.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 aol-map { position:absolute;width:100%;height:100%;}
--- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss
@@ -1,14 +1,13 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.row {
-  border-bottom: 1px solid gray('500');
-  user-select: none;
-}
-
-.row:hover {
-  background-color: gray('100');
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.row {
+  border-bottom: 1px solid gray('500');
+  user-select: none;
+}
+
+.row:hover {
+  background-color: gray('100');
+}
+
--- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 .big-icon {
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 .big-icon {
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss
@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss";

 .big-icon {
--- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss
@@ -1,14 +1,13 @@
-@import "../../theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-.big-icon {
-  width: 100%;
-  color: white;
-  font-size: 9rem;
-  padding: 3rem;
-  text-align: center;
-}
-
-.card-title {
-  font-size: 1rem;
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+.big-icon {
+  width: 100%;
+  color: white;
+  font-size: 9rem;
+  padding: 3rem;
+  text-align: center;
+}
+
+.card-title {
+  font-size: 1rem;
+}