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

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

View File

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

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;
} }

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;
} }

View File

@ -1,19 +1,18 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.row {
.row { border-bottom: 1px solid gray('500');
border-bottom: 1px solid gray('500'); user-select: none;
user-select: none; }
}
.row:hover {
.row:hover { background-color: gray('100');
background-color: gray('100'); }
}
@media screen and (min-width: 44rem) {
@media screen and (min-width: 44rem) { .feature-list-container {
.feature-list-container { margin-top: 4rem;
margin-top: 4rem; }
} }
}

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 {

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 {

View File

@ -1,30 +1,29 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.card-title {
.card-title { font-size: 1rem;
font-size: 1rem; white-space: nowrap;
white-space: nowrap; overflow: hidden;
overflow: hidden; text-overflow: ellipsis;
text-overflow: ellipsis; }
}
.thumbnail > img {
.thumbnail > img { width: 100%;
width: 100%; height: auto;
height: auto; }
}
.thumbnail > div {
.thumbnail > div { width: 100%;
width: 100%; font-size: 2rem;
font-size: 2rem; text-align: center;
text-align: center; min-height: 3rem;
min-height: 3rem; color: white;
color: white; padding-top: 0.5rem;
padding-top: 0.5rem; }
}
.col {
.col { overflow: hidden;
overflow: hidden; }
}

View File

@ -1,30 +1,29 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.card-title {
.card-title { font-size: 1rem;
font-size: 1rem; white-space: nowrap;
white-space: nowrap; overflow: hidden;
overflow: hidden; text-overflow: ellipsis;
text-overflow: ellipsis; }
}
.thumbnail > img {
.thumbnail > img { width: 100%;
width: 100%; height: auto;
height: auto; }
}
.thumbnail > div {
.thumbnail > div { width: 100%;
width: 100%; font-size: 2rem;
font-size: 2rem; text-align: center;
text-align: center; min-height: 3rem;
min-height: 3rem; color: white;
color: white; padding-top: 0.5rem;
padding-top: 0.5rem; }
}
.col {
.col { overflow: hidden;
overflow: hidden; }
}

View File

@ -1,30 +1,29 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.card-title {
.card-title { font-size: 1rem;
font-size: 1rem; white-space: nowrap;
white-space: nowrap; overflow: hidden;
overflow: hidden; text-overflow: ellipsis;
text-overflow: ellipsis; }
}
.thumbnail > img {
.thumbnail > img { width: 100%;
width: 100%; height: auto;
height: auto; }
}
.thumbnail > div {
.thumbnail > div { width: 100%;
width: 100%; font-size: 2rem;
font-size: 2rem; text-align: center;
text-align: center; min-height: 3rem;
min-height: 3rem; color: white;
color: white; padding-top: 0.5rem;
padding-top: 0.5rem; }
}
.col {
.col { overflow: hidden;
overflow: hidden; }
}

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 {

View File

@ -1,27 +1,26 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.widget {
.widget { padding:0.8rem;
padding:0.8rem; height:100%;
height:100%; width:100%;
width:100%; color:#ffffff;
color:#ffffff; position:relative;
position:relative; }
}
.icon {
.icon { display:block;
display:block; font-size:6rem;
font-size:6rem; text-align:center;
text-align:center; }
} .title {
.title { display:block;
display:block; position:absolute;
position:absolute; width:calc(100% - 1.6rem );
width:calc(100% - 1.6rem ); padding-top:0.5rem;
padding-top:0.5rem; bottom:0.8rem;
bottom:0.8rem; height:2rem;
height:2rem; overflow:hidden;
overflow:hidden; white-space:nowrap;
white-space:nowrap; text-overflow:ellipsis;
text-overflow:ellipsis; }
}

View File

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

View File

@ -1,42 +1,41 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.widget-container {
.widget-container { overflow:auto;
overflow:auto; margin-bottom:1rem;
margin-bottom:1rem; }
}
.widget {
.widget { position:relative;
position:relative; border: 1px solid gray('500');
border: 1px solid gray('500'); user-select: none;
user-select: none; display:inline-block;
display:inline-block; width:50%;
width:50%; overflow:hidden;
overflow:hidden; float:left;
float:left; }
}
.widget:after {
.widget:after { content: "";
content: ""; display: block;
display: block; padding-bottom: 100%;
padding-bottom: 100%; }
}
.content {
.content { position:absolute;
position:absolute; width:100%;
width:100%; height:100%;
height:100%; }
}
.widget:hover {
.widget:hover { background-color: gray('100');
background-color: gray('100'); }
}
.widget-container {
.widget-container { padding:1rem;
padding:1rem; }
}
.item-container {
.item-container { display:block;
display:block; height:100%;
height:100%; }
}

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>

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 {

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%;}

View File

@ -1,14 +1,13 @@
@import "../../_theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.row {
.row { border-bottom: 1px solid gray('500');
border-bottom: 1px solid gray('500'); user-select: none;
user-select: none; }
}
.row:hover {
.row:hover { background-color: gray('100');
background-color: gray('100'); }
}

View File

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

View File

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

View File

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

View File

@ -1,14 +1,13 @@
@import "../../theme.scss"; @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss";
.big-icon {
.big-icon { width: 100%;
width: 100%; color: white;
color: white; font-size: 9rem;
font-size: 9rem; padding: 3rem;
padding: 3rem; text-align: center;
text-align: center; }
}
.card-title {
.card-title { font-size: 1rem;
font-size: 1rem; }
}

View File

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

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";

View File

@ -1,113 +1,111 @@
@import "../../theme.scss"; /* Import Bootstrap & Fonts */
/* Import Bootstrap & Fonts */ @import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/bootstrap.scss"; div.resumable-file-upload {
position: fixed;
div.resumable-file-upload { right: 0px;
position: fixed; bottom: 0px;
right: 0px; width: 300px;
bottom: 0px; max-height: 250px;
width: 300px; /*z-index:2000 !important;*/
max-height: 250px; }
/*z-index:2000 !important;*/
} div.minimized {
height: 0px;
div.minimized { }
height: 0px;
} div.closed {
height: 0px;
div.closed { }
height: 0px;
} div.card {
margin-bottom: 0px;
div.card { }
margin-bottom: 0px;
} div.card-block {
max-height: calc(250px - 41px);
div.card-block { overflow-y: auto;
max-height: calc(250px - 41px); }
overflow-y: auto;
} div.minimized div.card-block {
height: 0px;
div.minimized div.card-block { }
height: 0px;
} div.card-header span.fa {
padding-left: 5px;
div.card-header span.fa { }
padding-left: 5px;
} .upload-file {
padding-top: 3px;
.upload-file { }
padding-top: 3px;
} .upload-file .progress-container {
height: 3px;
.upload-file .progress-container { width: 100%;
height: 3px; margin-top:4px;
width: 100%; }
margin-top:4px;
} .upload-file .progress-container .progress-bar {
display: block;
.upload-file .progress-container .progress-bar { background-color: color("green");
display: block; width: 0%;
background-color: color("green"); height: 100%;
width: 0%; }
height: 100%;
} .upload-file.done .progress-container .progress-bar {
display: none;
.upload-file.done .progress-container .progress-bar { }
display: none;
} .upload-file > div > span.file-name {
display: inline-block;
.upload-file > div > span.file-name { width: calc(100% - 20px);
display: inline-block; overflow: hidden;
width: calc(100% - 20px); text-overflow: ellipsis;
overflow: hidden; white-space: nowrap;
text-overflow: ellipsis; vertical-align: middle;
white-space: nowrap; }
vertical-align: middle;
} .upload-file > div > a.file-name {
display: inline-block;
.upload-file > div > a.file-name { width: calc(100% - 20px);
display: inline-block; overflow: hidden;
width: calc(100% - 20px); text-overflow: ellipsis;
overflow: hidden; white-space: nowrap;
text-overflow: ellipsis; vertical-align: middle;
white-space: nowrap; }
vertical-align: middle;
} .upload-file.busy > div > span.fa-times {
color: theme-color("danger");
.upload-file.busy > div > span.fa-times { width: 20px;
color: theme-color("danger"); display: inline-block;
width: 20px; vertical-align: middle;
display: inline-block; }
vertical-align: middle;
} .upload-file.done > div > span.fa-times {
display: none;
.upload-file.done > div > span.fa-times { }
display: none;
} .upload-file.done > div > span.fa-check {
color: color("green");
.upload-file.done > div > span.fa-check { width: 20px;
color: color("green"); display: inline-block;
width: 20px; vertical-align: middle;
display: inline-block; }
vertical-align: middle;
} .upload-file > div.errormessage {
color: theme-color("danger");
.upload-file > div.errormessage { display: none;
color: theme-color("danger"); }
display: none;
} .upload-file.error > div.errormessage {
display: block;
.upload-file.error > div.errormessage { }
display: block;
} .upload-file.busy > div > span.fa-check {
display: none;
.upload-file.busy > div > span.fa-check { }
display: none;
} .resumable-file-upload ul {
padding:0px;
.resumable-file-upload ul { }
padding:0px;
}