FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove old theming, use correct theme colors and a friendlier icon
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2020-02-22 09:45:41 +01:00
parent 2b5bda2a44
commit a3e14a94cc
24 changed files with 324 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/common-map/src/fm-map/_theme.scss
View File

@ -1,2 +0,0 @@
//$theme-colors: ( "primary": #a7ce39, "secondary": #ffc800 );
//$theme-colors: ( "primary": #a7ce39);

11
projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss
View File

@ -1,4 +1,3 @@
@import "../../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
@ -11,25 +10,25 @@
} }
.tolerance { .tolerance {
fill: theme-color(); fill: $primary;
fill-opacity:0.4; fill-opacity:0.4;
} }
.border { .border {
fill: white; fill: $white;
} }
.center { .center {
fill: theme-color(); fill: $primary;
} }
.stop1 { .stop1 {
stop-color: theme-color(); stop-color: $primary;
stop-opacity:1; stop-opacity:1;
} }
.stop2 { .stop2 {
stop-color: theme-color(); stop-color:$primary;
stop-opacity: 0; stop-opacity: 0;
} }

11
projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss
View File

@ -1,4 +1,3 @@
@import "../../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
@ -6,7 +5,7 @@
display:block; display:block;
width:2.5em; width:2.5em;
height:2.5em; height:2.5em;
background-color: white; background-color: $body-bg;
background-size: contain; background-size: contain;
margin-top:0.5em; margin-top:0.5em;
} }
@ -16,13 +15,13 @@
} }
.pan-to { .pan-to {
fill: #333333; fill: $secondary;
} }
.pan-to-centered { .pan-to-centered {
fill: theme-color() fill: $primary;
} }
.pan-to-disabled { .pan-to-centered.pan-to-disabled {
fill: #808080; fill: $gray-300;
} }

1
projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";

1
projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container { fm-map-feature-list-feature-container {

1
projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container { fm-map-feature-list-feature-container {

1
projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";

1
projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";

1
projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";

1
projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container { fm-map-feature-list-feature-container {

1
projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.widget { .widget {

1
projects/common-map/src/fm-map/components/item-list/item-list.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.widget-container { .widget-container {

1
projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.widget-container { .widget-container {

6
projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html
View File

@ -1,5 +1,5 @@
<div class="rounded-circle layer-switcher" (click)="handleClick($event)"> <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="layers hidden" [ngClass]="{'hidden':!(showLayerSwitcher|async)}" (click)="$event.stopPropagation();">
<div class="card layers-card m-1"> <div class="card layers-card m-1">
<div class="card-header" i18n> <div class="card-header" i18n>
@ -8,13 +8,13 @@
</div> </div>
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item py-0"> <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"> <div class="mb-4">
<fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list> <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
</div> </div>
</li> </li>
<li class="nav-item py-0"> <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"> <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> <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> </div>

4
projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
@ -6,11 +5,12 @@
display:block; display:block;
width:2.5em; width:2.5em;
height:2.5em; height:2.5em;
background-color: white; background-color: $body-bg;
background-size: contain; background-size: contain;
margin-top:0.5em; margin-top:0.5em;
text-align: center; text-align: center;
line-height: 2.5em; line-height: 2.5em;
color: $secondary;
} }
.layers { .layers {

1
projects/common-map/src/fm-map/components/map/map.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
aol-map { position:absolute;width:100%;height:100%;} aol-map { position:absolute;width:100%;height:100%;}

1
projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";

1
projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {

1
projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {

1
projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss
View File

@ -1,4 +1,3 @@
@import "../../_theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {

1
projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss
View File

@ -1,4 +1,3 @@
@import "../../theme.scss";
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {

2
projects/common/src/fm/_theme.scss
View File

@ -1,2 +0,0 @@
//$theme-colors: ( "primary": #a7ce39, "secondary": #ffc800 );
//$theme-colors: ( "primary": #a7ce39);

2
projects/common/src/fm/components/app/app.component.scss
View File

@ -1,5 +1,3 @@
//@import "theme.scss";
/* Import Bootstrap & Fonts */ /* Import Bootstrap & Fonts */
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";

2
projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
View File

@ -1,5 +1,3 @@
@import "../../theme.scss";
/* Import Bootstrap & Fonts */ /* Import Bootstrap & Fonts */
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";