Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Dependency Updates 10-18-24 (#5517)

christof-wittreich30882cc647a8
diff --git a/package-lock.json b/package-lock.json
index a346f420f..f7ba99a9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -128,7 +128,7 @@
"react-test-renderer": "^18.3.0",
"redux-mock-store": "^1.5.4",
"run-script-os": "^1.1.6",
- "sass": "^1.79.5",
+ "sass": "^1.80.2",
"sass-loader": "^16.0.2",
"shelljs": "^0.8.5",
"showdown": "^2.1.0",
@@ -15526,9 +15526,9 @@
"license": "MIT"
},
"node_modules/sass": {
- "version": "1.79.5",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.5.tgz",
- "integrity": "sha512-W1h5kp6bdhqFh2tk3DsI771MoEJjvrSY/2ihJRJS4pjIyfJCw0nTsxqhnrUzaLMOJjFchj8rOvraI/YUVjtx5g==",
+ "version": "1.80.2",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.2.tgz",
+ "integrity": "sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==",
"dev": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 0cca7e95d..ff479b202 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
"react-test-renderer": "^18.3.0",
"redux-mock-store": "^1.5.4",
"run-script-os": "^1.1.6",
- "sass": "^1.79.5",
+ "sass": "^1.80.2",
"sass-loader": "^16.0.2",
"shelljs": "^0.8.5",
"showdown": "^2.1.0",
diff --git a/web/scss/components/alert.scss b/web/scss/components/alert.scss
index 20d2969bd..adce34fcd 100644
--- a/web/scss/components/alert.scss
+++ b/web/scss/components/alert.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-alert-dropdown {
position: absolute;
top: 60px;
@@ -114,7 +116,7 @@
margin-top: 10px;
}
-@media (max-width: $mobile-max-width) {
+@media (max-width: variables.$mobile-max-width) {
.wv-alert {
min-height: 50px;
font-size: 12px;
diff --git a/web/scss/components/button.scss b/web/scss/components/button.scss
index d9b9c6df1..4b8f44f96 100644
--- a/web/scss/components/button.scss
+++ b/web/scss/components/button.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
/*
* WV Button Widget
*/
@@ -9,7 +11,7 @@
border-color: #666;
font-size: 1em;
background-image: linear-gradient(#555, #666);
- font-family: $wv-bold-font;
+ font-family: variables.$wv-bold-font;
padding: 0;
}
diff --git a/web/scss/components/dateselector.scss b/web/scss/components/dateselector.scss
index df1fe3d9f..26386def8 100644
--- a/web/scss/components/dateselector.scss
+++ b/web/scss/components/dateselector.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-date-selector-widget .input-wrapper,
.date-arrow-wrapper {
background: transparent;
@@ -48,7 +50,7 @@
color: #fff;
background: transparent;
border: 0;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
vertical-align: middle;
box-sizing: border-box;
padding: 0;
@@ -237,7 +239,7 @@
}
.input-time-divider {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 15px;
vertical-align: middle;
width: 5px;
@@ -245,7 +247,7 @@
}
.input-time-zmark {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 15px;
vertical-align: middle;
margin-top: 2px;
diff --git a/web/scss/components/modal.scss b/web/scss/components/modal.scss
index 854e1136d..59512136b 100644
--- a/web/scss/components/modal.scss
+++ b/web/scss/components/modal.scss
@@ -1,6 +1,8 @@
+@use "variables";
+
/* universal/default modal styles */
.modal-dialog {
- @include wv-modal-dialog;
+ @include variables.wv-modal-dialog;
h1 {
font-size: 22px;
@@ -48,7 +50,7 @@
.modal-body {
background-color: #222;
- border-radius: $wv-menu-border-radius;
+ border-radius: variables.$wv-menu-border-radius;
& .modal-footer {
padding-bottom: 0;
@@ -115,7 +117,7 @@
background: #282828;
color: #eee;
- @include wv-modal-content;
+ @include variables.wv-modal-content;
}
.modal-body pre {
diff --git a/web/scss/components/range.scss b/web/scss/components/range.scss
index 14937a0ba..e47dda7eb 100644
--- a/web/scss/components/range.scss
+++ b/web/scss/components/range.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.form-range {
&::-moz-range-track {
height: 6px;
@@ -52,7 +54,7 @@
&:not(.double-range)::-moz-range-progress {
height: 4px;
- background-color: $wv-dark-blue;
+ background-color: variables.$wv-dark-blue;
}
}
@@ -128,8 +130,8 @@
to right,
#ccc 0%,
#ccc var(--min-range-percent),
- $wv-dark-blue var(--min-range-percent),
- $wv-dark-blue 100%
+ variables.$wv-dark-blue var(--min-range-percent),
+ variables.$wv-dark-blue 100%
);
}
@@ -154,8 +156,8 @@
border-bottom-left-radius: 0;
background: linear-gradient(
to right,
- $wv-dark-blue 0%,
- $wv-dark-blue var(--max-range-percent),
+ variables.$wv-dark-blue 0%,
+ variables.$wv-dark-blue var(--max-range-percent),
#ccc var(--max-range-percent),
#ccc 100%
);
diff --git a/web/scss/components/tooltip.scss b/web/scss/components/tooltip.scss
index 1eab78964..bd95119c4 100644
--- a/web/scss/components/tooltip.scss
+++ b/web/scss/components/tooltip.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
/* Bootstrap override */
.tooltip {
z-index: 1050;
@@ -73,7 +75,7 @@
color: #fff;
border: thin solid #666;
font-size: 17px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
border-radius: 5px;
height: 25px;
line-height: 23px;
@@ -95,7 +97,7 @@
position: relative;
bottom: 1px;
font-size: 14px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-weight: 300;
}
@@ -104,13 +106,13 @@
position: relative;
font-weight: 500;
font-size: 16px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
background: #000;
border-radius: 4px;
color: #fff;
padding: 5px 8px;
white-space: nowrap;
- box-shadow: $wv-tooltip-shadow;
+ box-shadow: variables.$wv-tooltip-shadow;
border: 1px solid rgb(255 255 255 / 50%);
&.tooltip-active {
@@ -232,7 +234,7 @@
top: 10px;
}
-@media (max-width: $mobile-max-width) {
+@media (max-width: variables.$mobile-max-width) {
.tooltip-custom-black {
&.tooltip-coordinates-container {
max-width: 320px;
diff --git a/web/scss/features/about.scss b/web/scss/features/about.scss
index 4158b3455..1a1c0948b 100644
--- a/web/scss/features/about.scss
+++ b/web/scss/features/about.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.about-page {
background-color: #282828;
padding: 10px 15px 0 10px;
@@ -141,7 +143,7 @@
}
/* Keyboard shortcuts section */
-@media (min-width: $tablet-min-width) {
+@media (min-width: variables.$tablet-min-width) {
.about-page .keyboard-shortcuts-section {
display: block;
}
diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scss
index cc008eacf..8b4c3075a 100644
--- a/web/scss/features/anim-widget.scss
+++ b/web/scss/features/anim-widget.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-animation-widget-wrapper {
position: absolute;
z-index: 100;
@@ -48,7 +50,7 @@
left: 495px;
}
-@media (min-width: $tablet-min-width) {
+@media (min-width: variables.$tablet-min-width) {
.wv-animation-widget-wrapper {
bottom: 88px;
@@ -128,7 +130,7 @@
&.minimized {
height: 52px;
width: 80px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
cursor: move;
}
@@ -174,7 +176,7 @@
display: inline-block;
height: 35px;
width: 42px;
- background: $wv-dark-blue;
+ background: variables.$wv-dark-blue;
position: relative;
border-radius: 5px;
@@ -245,7 +247,7 @@
}
/* No hover styles on mobile */
- @media (min-width: $tablet-min-width) {
+ @media (min-width: variables.$tablet-min-width) {
&:hover {
color: #999;
cursor: pointer;
@@ -266,7 +268,7 @@ a .wv-animation-widget-icon {
left: 50%;
top: 50%;
- @media (min-width: $tablet-min-width) {
+ @media (min-width: variables.$tablet-min-width) {
&:hover {
color: #fff;
opacity: 0.5;
@@ -423,12 +425,12 @@ a .wv-animation-widget-icon {
height: 100%;
box-sizing: border-box;
bottom: 0;
- background-color: $wv-solid-black;
+ background-color: variables.$wv-solid-black;
& .mobile-animation-header {
padding: 10px;
background-color: #333;
- border-bottom: $wv-dark-menu-border;
+ border-bottom: variables.$wv-dark-menu-border;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
display: flex;
@@ -456,7 +458,7 @@ a .wv-animation-widget-icon {
width: 100%;
margin: auto;
text-align: center;
- background: $wv-solid-black;
+ background: variables.$wv-solid-black;
min-height: 30px;
& span {
@@ -479,7 +481,7 @@ a .wv-animation-widget-icon {
margin: 0;
width: 100%;
height: 100%;
- background: $wv-solid-black;
+ background: variables.$wv-solid-black;
border-radius: 0;
margin-top: 0;
padding: 0;
@@ -529,7 +531,7 @@ a .wv-animation-widget-icon {
& .mobile-date-picker-select-btn {
position: relative;
- background-color: $wv-dark-blue;
+ background-color: variables.$wv-dark-blue;
bottom: -10%;
width: 95%;
display: flex;
@@ -569,7 +571,7 @@ a .wv-animation-widget-icon {
& .mobile-date-picker-select-btn {
position: relative;
- background-color: $wv-dark-blue;
+ background-color: variables.$wv-dark-blue;
& span {
margin: 20px;
@@ -640,7 +642,7 @@ a .wv-animation-widget-icon {
.mobile-timescale-dropdown {
& .dropdown-toggle {
font-size: 18px;
- background-color: $wv-dark-blue;
+ background-color: variables.$wv-dark-blue;
height: 3em;
width: 103px;
border-top-left-radius: 0;
@@ -648,7 +650,7 @@ a .wv-animation-widget-icon {
}
& .dropdown-menu {
- background-color: $wv-solid-black;
+ background-color: variables.$wv-solid-black;
border: solid 1px white;
}
@@ -690,7 +692,7 @@ a .wv-animation-widget-icon {
border-radius: 4px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
- background-color: $wv-dark-gray;
+ background-color: variables.$wv-dark-gray;
}
& .mobile-timescale-dropdown {
@@ -711,9 +713,9 @@ a .wv-animation-widget-icon {
}
.wv-kiosk-animation-widget {
- border: $wv-dark-menu-border;
- background: $wv-transparent-black;
- border-radius: $wv-menu-border-radius;
+ border: variables.$wv-dark-menu-border;
+ background: variables.$wv-transparent-black;
+ border-radius: variables.$wv-menu-border-radius;
color: #fff;
display: flex;
flex-flow: row nowrap;
diff --git a/web/scss/features/compare.scss b/web/scss/features/compare.scss
index 02f55ed78..ab272f8e7 100644
--- a/web/scss/features/compare.scss
+++ b/web/scss/features/compare.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.ab-swipe-line {
height: 100%;
padding: 0 2px;
@@ -61,7 +63,7 @@
}
.ab-slider-case {
- @include wv-date-chip;
+ @include variables.wv-date-chip;
position: absolute;
margin-left: auto;
@@ -113,9 +115,9 @@
}
.ab-swipe-line .ab-swipe-span {
- @include wv-date-chip;
+ @include variables.wv-date-chip;
- font-family: $wv-base-font;
+ font-family: variables.$wv-base-font;
position: absolute;
bottom: 195px;
padding: 2px 4px;
@@ -126,9 +128,9 @@
}
.ab-spy-span {
- @include wv-date-chip;
+ @include variables.wv-date-chip;
- font-family: $wv-base-font;
+ font-family: variables.$wv-base-font;
position: absolute;
display: block;
white-space: nowrap;
@@ -191,7 +193,7 @@
border-radius: 5px;
height: 44px;
border: thin solid #333;
- background-color: $wv-transparent-black;
+ background-color: variables.$wv-transparent-black;
position: absolute;
bottom: 75px;
left: 10px;
diff --git a/web/scss/features/context-menu.scss b/web/scss/features/context-menu.scss
index af818acb2..bdf093ede 100644
--- a/web/scss/features/context-menu.scss
+++ b/web/scss/features/context-menu.scss
@@ -1,6 +1,8 @@
+@use "variables";
+
.react-contextmenu {
- @include wv-modal-dialog;
- @include wv-modal-content;
+ @include variables.wv-modal-dialog;
+ @include variables.wv-modal-content;
margin: 2px 0 0;
min-width: 160px;
diff --git a/web/scss/features/customize-bands.scss b/web/scss/features/customize-bands.scss
index 7d72f6f82..7f08754a3 100644
--- a/web/scss/features/customize-bands.scss
+++ b/web/scss/features/customize-bands.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.customize-bands-parent-info {
margin-bottom: 12px;
@@ -91,9 +93,9 @@
display: flex;
flex-direction: row;
height: 75px;
- background-color: $wv-transparent-black;
- color: $wv-white-font;
- border: 2px solid $wv-dark-menu-border;
+ background-color: variables.$wv-transparent-black;
+ color: variables.$wv-white-font;
+ border: 2px solid variables.$wv-dark-menu-border;
.band-selection-preset-image {
width: 73px;
@@ -108,8 +110,8 @@
}
.selected-preset {
- background-color: $wv-dark-blue;
- border: 2px solid $wv-orange;
+ background-color: variables.$wv-dark-blue;
+ border: 2px solid variables.$wv-orange;
}
}
}
\ No newline at end of file
diff --git a/web/scss/features/embed.scss b/web/scss/features/embed.scss
index 6d0b39a1a..70b003a5d 100644
--- a/web/scss/features/embed.scss
+++ b/web/scss/features/embed.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
#embed-mode-wrapper {
position: fixed;
inset: 0;
@@ -26,7 +28,7 @@
left: 50%;
margin-top: -50px;
margin-left: -110px;
- background-color: $wv-transparent-black;
+ background-color: variables.$wv-transparent-black;
border-radius: 5px;
border: 3px solid;
border-color: #fff;
diff --git a/web/scss/features/event-filter.scss b/web/scss/features/event-filter.scss
index 71abff306..e28e978f6 100644
--- a/web/scss/features/event-filter.scss
+++ b/web/scss/features/event-filter.scss
@@ -1,10 +1,12 @@
+@use "variables";
+
.filter-controls {
display: flex;
background: #333;
padding: 5px;
max-width: 290px;
margin: 0 auto;
- height: $wv-sidebar-event-filter-height;
+ height: variables.$wv-sidebar-event-filter-height;
.filter-dates-icons {
display: inline-block;
@@ -14,7 +16,7 @@
.filter-dates {
color: #fff;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
text-align: center;
padding: 3px 5px 6px;
font-size: 14px;
@@ -114,7 +116,7 @@
padding: 10px 0;
width: 100%;
margin: 0 auto;
- min-height: $wv-sidebar-event-footer-height;
+ min-height: variables.$wv-sidebar-event-footer-height;
font-size: 15px;
svg {
diff --git a/web/scss/features/events.scss b/web/scss/features/events.scss
index 75ee56247..542c9ee1d 100644
--- a/web/scss/features/events.scss
+++ b/web/scss/features/events.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-eventslist {
position: relative;
}
@@ -19,7 +21,7 @@
margin: 15px auto;
}
- @media (max-width: $mobile-max-width) {
+ @media (max-width: variables.$mobile-max-width) {
height: calc(var(--vh, 1vh) * 100 - 85px);
}
@@ -29,8 +31,8 @@
background: #222;
min-height: 260px;
- @media (max-width: $mobile-max-width) {
- min-height: calc(var(--vh, 1vh) * 100 - $wv-mobile-event-list-offset);
+ @media (max-width: variables.$mobile-max-width) {
+ min-height: calc(var(--vh, 1vh) * 100 - variables.$wv-mobile-event-list-offset);
}
}
}
@@ -63,7 +65,7 @@
padding: 0 3px;
margin-left: 40px;
- @media (max-width: $mobile-max-width) {
+ @media (max-width: variables.$mobile-max-width) {
font-size: 1em;
}
}
@@ -126,14 +128,14 @@
a {
font-size: 14px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
cursor: pointer;
text-decoration: none;
}
.active {
font-size: 14px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-weight: 500;
color: #666;
}
@@ -257,10 +259,10 @@
top: -30px;
left: -40px;
padding: 4px;
- background-color: $wv-transparent-black;
+ background-color: variables.$wv-transparent-black;
border-radius: 3px;
text-align: center;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 12px;
color: #ccc;
z-index: 900;
diff --git a/web/scss/features/layer-categories.scss b/web/scss/features/layer-categories.scss
index 78da70b45..d306d8ac1 100644
--- a/web/scss/features/layer-categories.scss
+++ b/web/scss/features/layer-categories.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
/* Categories view */
.recent-layers-mobile-header {
.recent-tooltip-icon {
@@ -146,7 +148,7 @@
line-height: 20px;
padding: 10px;
color: #fff;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
text-decoration: none;
}
diff --git a/web/scss/features/layer-coverage-panel.scss b/web/scss/features/layer-coverage-panel.scss
index 3f1ff233c..9535090e9 100644
--- a/web/scss/features/layer-coverage-panel.scss
+++ b/web/scss/features/layer-coverage-panel.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.timeline-layer-coverage-container {
position: absolute;
background: rgb(40 40 40);
@@ -169,7 +171,7 @@
& section {
background: #222;
border: 1px solid #333;
- box-shadow: $wv-modal-shadow;
+ box-shadow: variables.$wv-modal-shadow;
padding: 5px;
margin: 3px;
}
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index 23eeaba4c..a55112e1e 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.layer-modal-content {
& div,
& h1,
@@ -358,7 +360,7 @@
.layer-date-start .monospace,
.layer-date-end .monospace {
- @include wv-date-chip;
+ @include variables.wv-date-chip;
font-size: 14px;
font-weight: 500;
@@ -379,7 +381,7 @@
.source-metadata .layer-description .layer-date-start .monospace,
.source-metadata .layer-description .layer-date-end .monospace {
- @include wv-date-chip;
+ @include variables.wv-date-chip;
border-color: #555;
background-color: #777;
@@ -387,7 +389,7 @@
}
.layers-all-layer .source-metadata .layer-description .layer-date-ranges span.monospace {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 14px;
}
@@ -693,7 +695,7 @@
& .filter-tooltip {
& .display-date {
font-size: 14px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
margin: 5px;
}
}
@@ -770,7 +772,7 @@
}
}
-@media (min-width: $desktop-min-width) {
+@media (min-width: variables.$desktop-min-width) {
.search-layers-container {
& div.layer-list-detail-container {
flex-direction: row;
@@ -791,7 +793,7 @@
}
/* Need at least 1024px to fit three category boxes inline */
-@media (max-width: $tablet-max-width) {
+@media (max-width: variables.$tablet-max-width) {
.custom-layer-dialog.category-width {
width: 658px;
@@ -815,7 +817,7 @@
}
}
-@media (min-width: $tablet-min-width) {
+@media (min-width: variables.$tablet-min-width) {
.category-width .layer-modal-content {
height: calc(var(--vh, 1vh) * 100 - 135px);
}
@@ -833,7 +835,7 @@
}
}
-@media (max-width: $mobile-max-width) {
+@media (max-width: variables.$mobile-max-width) {
.category-width .layer-modal-content {
padding: 0;
height: calc(var(--vh, 1vh) * 100 - 40px);
@@ -925,13 +927,13 @@
}
}
-@media (max-width: $mobile-max-width) {
+@media (max-width: variables.$mobile-max-width) {
.layer-category {
width: 100%;
}
}
-@media (max-width: $desktop-min-width) and (min-width: $mobile-max-width) {
+@media (max-width: variables.$desktop-min-width) and (min-width: variables.$mobile-max-width) {
.layer-category {
width: 48%;
}
@@ -1074,8 +1076,8 @@ a[rel="noreferrer"]:hover {
text-decoration: underline;
}
-@media screen and (max-width: $desktop-min-width) and (max-height: $mobile-max-width) and (orientation: landscape),
- (max-width: $mobile-max-width) {
+@media screen and (max-width: variables.$desktop-min-width) and (max-height: variables.$mobile-max-width) and (orientation: landscape),
+ (max-width: variables.$mobile-max-width) {
.instrument-collection {
h6 {
margin-right: 20px;
diff --git a/web/scss/features/location-search.scss b/web/scss/features/location-search.scss
index dd9ff1bd8..828470ffe 100644
--- a/web/scss/features/location-search.scss
+++ b/web/scss/features/location-search.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
/* Autocomplete Input */
.location-search-input-group {
flex-wrap: nowrap;
@@ -118,7 +120,7 @@
top: 10px;
width: 350px;
margin-right: 1px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border-radius: 5px;
z-index: 1;
}
@@ -142,7 +144,7 @@
/* Location Search Component Minimize Button */
.location-search-minimize-button {
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
width: 21px;
margin-right: 2px;
border: none;
@@ -160,7 +162,7 @@
}
&.disabled:hover {
- background-color: $wv-transparent-black;
+ background-color: variables.$wv-transparent-black;
color: #eee;
}
}
@@ -194,7 +196,7 @@
}
/* Mobile Styling */
-@media only screen and (max-width: $mobile-max-width) {
+@media only screen and (max-width: variables.$mobile-max-width) {
// .location-search-expanded {
// position: static;
// width: 100%;
diff --git a/web/scss/features/map.scss b/web/scss/features/map.scss
index 70caf242b..c6e2647c7 100644
--- a/web/scss/features/map.scss
+++ b/web/scss/features/map.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-map {
position: absolute;
margin: 0;
@@ -10,7 +12,7 @@
position: absolute;
right: 0;
z-index: 1;
- background: none $wv-transparent-black;
+ background: none variables.$wv-transparent-black;
border: 1px solid #333;
margin-right: 0;
border-radius: 0;
@@ -156,8 +158,8 @@
z-index: 10;
right: 58px;
color: #fff;
- background-color: $wv-transparent-black;
- text-shadow: $wv-map-text-shadow;
+ background-color: variables.$wv-transparent-black;
+ text-shadow: variables.$wv-map-text-shadow;
padding: 2px;
border-left: 2px solid #fff;
}
@@ -190,7 +192,7 @@
white-space: pre;
outline: none;
color: #fff;
- text-shadow: $wv-map-text-shadow;
+ text-shadow: variables.$wv-map-text-shadow;
font-size: 100%;
border: none;
border-radius: 0;
@@ -201,7 +203,7 @@
}
.wv-coords-map:hover {
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
}
.wv-coords-map:hover div.coord-btn {
@@ -230,7 +232,7 @@
position: relative;
width: 20px;
height: 35px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border: 1px solid transparent;
display: inline-block;
margin-left: 5px;
@@ -288,6 +290,6 @@
fill: #eee;
text-shadow: 1px 1px 0 #111;
font-size: 14px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
}
}
diff --git a/web/scss/features/palettes.scss b/web/scss/features/palettes.scss
index 4c44931e7..9d64a8781 100644
--- a/web/scss/features/palettes.scss
+++ b/web/scss/features/palettes.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-palette-selector {
width: 280px;
height: 220px;
@@ -176,7 +178,7 @@
margin-left: 0;
}
-@media (max-width: $mobile-max-width) {
+@media (max-width: variables.$mobile-max-width) {
.wv-palettes-colorbar {
width: 100%;
max-width: 100%;
diff --git a/web/scss/features/recent-layers.scss b/web/scss/features/recent-layers.scss
index 9a79dc12d..0742dc060 100644
--- a/web/scss/features/recent-layers.scss
+++ b/web/scss/features/recent-layers.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
li.recent-tab.nav-item {
margin-left: 10px;
background: transparent;
@@ -53,7 +55,7 @@ button.recent-layer-delete {
top: 8px;
}
-@media (min-width: $desktop-min-width) {
+@media (min-width: variables.$desktop-min-width) {
.recent-layers-header {
width: 50%;
}
diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scss
index 828094d7f..fca20a369 100644
--- a/web/scss/features/sidebar-panel.scss
+++ b/web/scss/features/sidebar-panel.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.sidebar-expand {
position: relative;
@@ -8,7 +10,7 @@
top: 77px;
height: 30px;
padding-top: 8px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border-radius: 0;
box-sizing: border-box;
width: 286px;
@@ -620,8 +622,8 @@ li.item.productsitem.inmotion,
color: #c5c5c8;
}
-@media screen and (max-width: $desktop-min-width) and (max-height: $mobile-max-width) and (orientation: landscape),
- (max-width: $mobile-max-width) {
+@media screen and (max-width: variables.$desktop-min-width) and (max-height: variables.$mobile-max-width) and (orientation: landscape),
+ (max-width: variables.$mobile-max-width) {
.toggleIconHolder {
height: 50px;
width: 50px;
diff --git a/web/scss/features/sidebar.scss b/web/scss/features/sidebar.scss
index cb0226ee3..0e15394ce 100644
--- a/web/scss/features/sidebar.scss
+++ b/web/scss/features/sidebar.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
#wv-sidebar {
position: absolute;
z-index: 3;
@@ -24,7 +26,7 @@
}
.main-nav {
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border-right: 1px solid #333;
border-left: 1px solid #333;
@@ -92,7 +94,7 @@
}
> .tab-content {
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border: 1px solid #333;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
@@ -277,8 +279,8 @@ div#group-overlays-checkbox-case {
max-width: 232px;
line-height: 15px;
- @media screen and (max-width: $desktop-min-width) and (max-height: $mobile-max-width) and (orientation: landscape),
- (max-width: $mobile-max-width) {
+ @media screen and (max-width: variables.$desktop-min-width) and (max-height: variables.$mobile-max-width) and (orientation: landscape),
+ (max-width: variables.$mobile-max-width) {
font-size: 16px;
}
}
@@ -360,7 +362,7 @@ div#group-overlays-checkbox-case {
font-size: 14px;
padding: 6px 12px;
- @media (max-width: $mobile-max-width) {
+ @media (max-width: variables.$mobile-max-width) {
font-size: 18px;
padding: 12px 14px;
}
@@ -378,7 +380,7 @@ div#group-overlays-checkbox-case {
}
}
-@media (max-width: $mobile-max-width) {
+@media (max-width: variables.$mobile-max-width) {
.layer-group-case .layer-group-header {
min-height: 32px;
margin-top: 10px;
@@ -760,7 +762,7 @@ p.recharts-tooltip-label {
position: absolute;
max-width: 100vw;
- @media (max-width: $mobile-max-width) {
+ @media (max-width: variables.$mobile-max-width) {
left: 0;
width: 100%;
height: calc(var(--vh, 1vh) * 100);
@@ -815,7 +817,7 @@ p.recharts-tooltip-label {
max-height: calc(100vh - 200px);
}
- @media (max-width: $mobile-max-width) {
+ @media (max-width: variables.$mobile-max-width) {
width: 100%;
.modal-body {
@@ -828,7 +830,7 @@ p.recharts-tooltip-label {
.layer-settings-modal {
width: 300px;
- @media (max-width: $mobile-max-width) {
+ @media (max-width: variables.$mobile-max-width) {
width: 100%;
}
diff --git a/web/scss/features/smart-handoff.scss b/web/scss/features/smart-handoff.scss
index 0ff1f61c6..7dee59571 100644
--- a/web/scss/features/smart-handoff.scss
+++ b/web/scss/features/smart-handoff.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
/* Smart handoff side panel */
.smart-handoff-side-panel {
margin: 5px;
@@ -306,7 +308,7 @@ a.help-link {
}
.handoff-modal-date {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 16px;
text-align: left;
}
diff --git a/web/scss/features/timeline.scss b/web/scss/features/timeline.scss
index 75df99ffa..978b0ee3a 100644
--- a/web/scss/features/timeline.scss
+++ b/web/scss/features/timeline.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
*:focus,
button:focus {
outline: 0;
@@ -49,9 +51,9 @@ button:focus {
.timeline-inner {
height: 67px;
position: absolute;
- border: $wv-dark-menu-border;
- background: $wv-transparent-black;
- border-radius: $wv-menu-border-radius;
+ border: variables.$wv-dark-menu-border;
+ background: variables.$wv-transparent-black;
+ border-radius: variables.$wv-menu-border-radius;
display: flex;
flex-flow: row nowrap;
margin-left: 10px;
@@ -61,7 +63,7 @@ button:focus {
#distraction-free-timeline {
position: absolute;
- border: $wv-dark-menu-border;
+ border: variables.$wv-dark-menu-border;
background: rgba(35 31 32 / 60%);
display: flex;
flex-flow: row nowrap;
@@ -145,7 +147,7 @@ button:focus {
font-size: 24px;
background: transparent;
border: 0;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
line-height: 1.2em;
vertical-align: baseline;
box-sizing: border-box;
@@ -190,7 +192,7 @@ button:focus {
}
& .input-time-divider {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
color: #fff;
font-size: 24px;
width: 13px;
@@ -198,7 +200,7 @@ button:focus {
}
& .input-time-divider-kiosk {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
color: #fff;
font-size: 24px;
width: 13px;
@@ -206,14 +208,14 @@ button:focus {
}
& .input-time-zmark {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
color: #fff;
font-size: 24px;
margin-top: 25px;
}
& .input-time-zmark-kiosk {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
color: #fff;
font-size: 24px;
margin-top: 15px;
@@ -419,7 +421,7 @@ button:focus {
.axis-grid-text {
font-size: 18px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
pointer-events: none;
user-select: none;
}
@@ -443,7 +445,7 @@ button:focus {
.zoom-level-display-text {
color: #fff;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
text-align: center;
font-size: 12px;
line-height: 1.2em;
@@ -473,7 +475,7 @@ button:focus {
width: 225px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
position: absolute;
top: -54px;
left: 85px;
@@ -510,7 +512,7 @@ button:focus {
opacity: 1;
font-size: 16px;
background: transparent;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
line-height: 1.2em;
vertical-align: baseline;
box-sizing: border-box;
@@ -526,7 +528,7 @@ button:focus {
font-size: 16px;
background: transparent;
border: 0;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
line-height: 1.2em;
vertical-align: baseline;
box-sizing: border-box;
@@ -560,7 +562,7 @@ button:focus {
margin-left: auto;
margin-right: auto;
padding: 4px;
- background-color: $wv-transparent-black;
+ background-color: variables.$wv-transparent-black;
border-radius: 3px;
}
@@ -608,7 +610,7 @@ button:focus {
cursor: pointer;
text-transform: uppercase;
text-align: center;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
margin-top: -2px;
}
@@ -631,7 +633,7 @@ button:focus {
cursor: pointer;
text-transform: uppercase;
text-align: center;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 14px;
line-height: 16px;
color: #ccc;
@@ -651,9 +653,9 @@ button:focus {
height: 64px;
width: 20px;
cursor: pointer;
- border-left: $wv-dark-menu-border;
- border-top-right-radius: $wv-menu-border-radius;
- border-bottom-right-radius: $wv-menu-border-radius;
+ border-left: variables.$wv-dark-menu-border;
+ border-top-right-radius: variables.$wv-menu-border-radius;
+ border-bottom-right-radius: variables.$wv-menu-border-radius;
}
#timeline-hide:hover,
@@ -699,7 +701,7 @@ button:focus {
cursor: pointer;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
- background-color: $wv-transparent-black;
+ background-color: variables.$wv-transparent-black;
border: thin solid #fff;
border-bottom: none;
overflow: hidden;
@@ -803,7 +805,7 @@ button:focus {
position: absolute;
left: 10px;
bottom: 20px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
color: #fff;
border: thin solid #333;
border-radius: 5px;
@@ -812,7 +814,7 @@ button:focus {
& .mobile-date-picker-select-btn-text {
height: 44px;
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
font-size: 23px;
padding: 14px 8px;
}
@@ -821,7 +823,7 @@ button:focus {
.datepicker-modal {
& div,
li {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
}
& .datepicker-header,
@@ -845,7 +847,7 @@ button:focus {
position: absolute;
left: 120px;
bottom: 20px;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border: thin solid #333;
border-radius: 5px;
cursor: pointer;
@@ -919,7 +921,7 @@ button:focus {
.mobile-animate-button {
position: absolute;
- background: $wv-transparent-black;
+ background: variables.$wv-transparent-black;
border: thin solid #333;
height: 44px;
width: 60px;
diff --git a/web/scss/features/toolbar.scss b/web/scss/features/toolbar.scss
index 76aa8077f..bcff207af 100644
--- a/web/scss/features/toolbar.scss
+++ b/web/scss/features/toolbar.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.wv-toolbar {
position: absolute;
right: 10px;
@@ -8,7 +10,7 @@
.wv-toolbar-button,
[data-whatintent="mouse"] .wv-toolbar-button:focus {
- @include wv-map-button;
+ @include variables.wv-map-button;
}
[data-whatintent="keyboard"] .wv-toolbar-button:focus {
@@ -161,7 +163,7 @@
}
}
-@media (min-width: $tablet-min-width) {
+@media (min-width: variables.$tablet-min-width) {
.wv-toolbar-button,
[data-whatintent="mouse"] .wv-toolbar-button:focus {
font-size: 20px;
diff --git a/web/scss/features/tour.scss b/web/scss/features/tour.scss
index 00e17713c..1b2e2b9d5 100644
--- a/web/scss/features/tour.scss
+++ b/web/scss/features/tour.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.tour {
a {
color: #00457b;
@@ -848,7 +850,7 @@
}
}
-@media (min-width: $tablet-min-width) {
+@media (min-width: variables.$tablet-min-width) {
.tour {
display: block;
}
@@ -892,7 +894,7 @@
right: 55px;
.modal-dialog {
- box-shadow: $wv-modal-shadow;
+ box-shadow: variables.$wv-modal-shadow;
.modal-content {
border-radius: 8px;
diff --git a/web/scss/globals.scss b/web/scss/globals.scss
index 92b0f2735..1de502be7 100644
--- a/web/scss/globals.scss
+++ b/web/scss/globals.scss
@@ -1,7 +1,9 @@
+@use "variables";
+
* {
font-synthesis-weight: none;
}
.red-font {
- color: $wv-orange;
+ color: variables.$wv-orange;
}
diff --git a/web/scss/index.scss b/web/scss/index.scss
index f313c0b67..244b8fa87 100644
--- a/web/scss/index.scss
+++ b/web/scss/index.scss
@@ -1,60 +1,60 @@
-@import 'variables';
-@import 'fonts';
-@import 'reset';
-@import 'util';
-@import 'mobile';
-@import 'globals';
+@use 'variables';
+@use 'fonts';
+@use 'reset';
+@use 'util';
+@use 'mobile';
+@use 'globals';
/* Reusable Components */
-@import 'components/alert';
-@import 'components/button';
-@import 'components/checkbox';
-@import 'components/dateselector';
-@import 'components/facets';
-@import 'components/image';
-@import 'components/list';
-@import 'components/modal';
-@import 'components/notifications';
-@import 'components/switch';
-@import 'components/tooltip';
-@import 'components/range';
+@use 'components/alert';
+@use 'components/button';
+@use 'components/checkbox';
+@use 'components/dateselector';
+@use 'components/facets';
+@use 'components/image';
+@use 'components/list';
+@use 'components/modal';
+@use 'components/notifications';
+@use 'components/switch';
+@use 'components/tooltip';
+@use 'components/range';
/* Features */
-@import 'features/about';
-@import 'features/anim-widget';
-@import 'features/compare';
-@import 'features/context-menu';
-@import 'features/customize-bands';
-@import 'features/eic';
-@import 'features/embed';
-@import 'features/events';
-@import 'features/event-filter';
-@import 'features/layer-categories';
-@import 'features/layer-coverage-panel';
-@import 'features/layers';
-@import 'features/location-search';
-@import 'features/map';
-@import 'features/measure';
-@import 'features/orbitTracks';
-@import 'features/palettes';
-@import 'features/products';
-@import 'features/projection';
-@import 'features/recent-layers';
-@import 'features/settings';
-@import 'features/share';
-@import 'features/sidebar';
-@import 'features/sidebar-panel';
-@import 'features/smart-handoff';
-@import 'features/timeline';
-@import 'features/toolbar';
-@import 'features/tour';
-@import 'features/vectorMeta';
+@use 'features/about';
+@use 'features/anim-widget';
+@use 'features/compare';
+@use 'features/context-menu';
+@use 'features/customize-bands';
+@use 'features/eic';
+@use 'features/embed';
+@use 'features/events';
+@use 'features/event-filter';
+@use 'features/layer-categories';
+@use 'features/layer-coverage-panel';
+@use 'features/layers';
+@use 'features/location-search';
+@use 'features/map';
+@use 'features/measure';
+@use 'features/orbitTracks';
+@use 'features/palettes';
+@use 'features/products';
+@use 'features/projection';
+@use 'features/recent-layers';
+@use 'features/settings';
+@use 'features/share';
+@use 'features/sidebar';
+@use 'features/sidebar-panel';
+@use 'features/smart-handoff';
+@use 'features/timeline';
+@use 'features/toolbar';
+@use 'features/tour';
+@use 'features/vectorMeta';
/* Library Files */
-@import 'lib/react-swipe-to-delete';
+@use 'lib/react-swipe-to-delete';
/* Dependency Overrides */
-@import 'overrides/react-joyride';
-@import 'overrides/react-search-ui';
-@import 'overrides/react-simplebar';
-@import 'overrides/react-swipe-to-delete';
+@use 'overrides/react-joyride';
+@use 'overrides/react-search-ui';
+@use 'overrides/react-simplebar';
+@use 'overrides/react-swipe-to-delete' as react-swipe-to-delete2;
diff --git a/web/scss/mobile.scss b/web/scss/mobile.scss
index 8f0908ba9..ad32bc57f 100644
--- a/web/scss/mobile.scss
+++ b/web/scss/mobile.scss
@@ -1,4 +1,6 @@
-@media only screen and (max-width: $mobile-max-width) {
+@use "variables";
+
+@media only screen and (max-width: variables.$mobile-max-width) {
div.olControlScaleLineCustom {
bottom: 10px;
}
diff --git a/web/scss/overrides/react-search-ui.scss b/web/scss/overrides/react-search-ui.scss
index 5914612a4..357d27f3b 100644
--- a/web/scss/overrides/react-search-ui.scss
+++ b/web/scss/overrides/react-search-ui.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
.sui-facet + .sui-facet {
margin-top: 16px;
@@ -79,8 +81,8 @@
}
}
-@media screen and (max-width: $desktop-min-width) and (max-height: $mobile-max-width) and (orientation: landscape),
- (max-width: $mobile-max-width) {
+@media screen and (max-width: variables.$desktop-min-width) and (max-height: variables.$mobile-max-width) and (orientation: landscape),
+ (max-width: variables.$mobile-max-width) {
.facet-container .inner-container {
div.no-matches {
font-size: 20px;
diff --git a/web/scss/util.scss b/web/scss/util.scss
index f6509edbb..a4d110148 100644
--- a/web/scss/util.scss
+++ b/web/scss/util.scss
@@ -1,3 +1,5 @@
+@use "variables";
+
/* https://stackoverflow.com/a/4407335 */
.noselect {
-webkit-touch-callout: none; /* iOS Safari */
@@ -33,5 +35,5 @@
span.monospace,
div.monospace {
- font-family: $wv-monospace-font;
+ font-family: variables.$wv-monospace-font;
}
diff --git a/webpack.config.js b/webpack.config.js
index 6e45bdca9..438bfc46e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -160,7 +160,8 @@ module.exports = {
},
fallback: {
fs: false
- }
+ },
+ modules: ['node_modules', path.resolve(__dirname, 'web/scss')]
},
stats: {
// reduce output text on build - remove for more verbose