post rebase webpack5 fixes

TerriaJS · Feb 12, 2025 · 8490771 · 8490771
1 parent 7efa168
commit 8490771
Show file tree

Hide file tree

Showing 25 changed files with 117 additions and 77 deletions.
diff --git a/lib/ReactViews/BottomDock/Timeline/timeline.scss b/lib/ReactViews/BottomDock/Timeline/timeline.scss
@@ -36,7 +36,7 @@
   padding-right: variables.$padding-small;
 
   @media (max-width: variables.$mobile),
-  (min-width: variables.$sm) and (max-width: variables.$lg) {
+    (min-width: variables.$sm) and (max-width: variables.$lg) {
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
@@ -53,4 +53,4 @@
 
 .controlsRow {
   display: table-row;
-}
+}
diff --git a/lib/ReactViews/Custom/Chart/chart-panel.scss b/lib/ReactViews/Custom/Chart/chart-panel.scss
@@ -106,4 +106,4 @@
       fill: variables.$color-primary;
     }
   }
-}
+}
diff --git a/lib/ReactViews/DataCatalog/data-catalog-group.scss b/lib/ReactViews/DataCatalog/data-catalog-group.scss
@@ -114,7 +114,7 @@
 .catalog-group {
   composes: list-reset from "../../Sass/common/_base.scss";
   padding-left: variables.$padding;
-  padding-top: calc($padding / 2);
+  padding-top: calc(variables.$padding / 2);
 
   &--lower-level {
     margin-left: 20px;
@@ -150,4 +150,4 @@
     margin: 3px;
     fill: variables.$grey;
   }
-}
+}
diff --git a/lib/ReactViews/ExplorerWindow/Tabs/MyDataTab/my-data-tab.scss b/lib/ReactViews/ExplorerWindow/Tabs/MyDataTab/my-data-tab.scss
@@ -174,4 +174,4 @@
 .h3 {
   composes: h3 from "../../../../Sass/common/_base.scss";
   font-size: variables.$font-size-mid-large;
-}
+}
diff --git a/lib/ReactViews/ExplorerWindow/explorer-window.scss b/lib/ReactViews/ExplorerWindow/explorer-window.scss
@@ -6,8 +6,16 @@
   z-index: variables.$front-component-z-index - 1;
   padding-left: variables.$padding * 2;
   padding-right: 80px;
-  padding-top: calc((100vh - #{variables.$modal-content-height} - #{variables.$modal-header-height}) / 2);
-  padding-bottom: calc((100vh - #{variables.$modal-content-height} - #{variables.$modal-header-height}) / 2);
+  padding-top: calc(
+    (
+        100vh - #{variables.$modal-content-height} - #{variables.$modal-header-height}
+      ) / 2
+  );
+  padding-bottom: calc(
+    (
+        100vh - #{variables.$modal-content-height} - #{variables.$modal-header-height}
+      ) / 2
+  );
   top: 0;
   bottom: 0;
   right: 0;
@@ -75,4 +83,4 @@
     border: 2px solid rgba(#ffffff, 0.7);
     border-radius: 3px;
   }
-}
+}
diff --git a/lib/ReactViews/ExplorerWindow/tabs.scss b/lib/ReactViews/ExplorerWindow/tabs.scss
@@ -33,8 +33,8 @@
   border-top: 1px solid variables.$grey-lighter;
   height: 100%;
   overflow: hidden;
-  border-bottom-left-radius: $radius-xlarge;
-  border-bottom-right-radius: $radius-xlarge;
+  border-bottom-left-radius: variables.$radius-xlarge;
+  border-bottom-right-radius: variables.$radius-xlarge;
 }
 
 .tab-left-col {
@@ -54,7 +54,6 @@
 }
 
 :global {
-
   .data-explorer,
   .my-data {
     @media (min-width: variables.$sm) {
@@ -78,26 +77,20 @@
 
   &:hover,
   &:focus {
-
     // background: $text-light;
     @if meta.variable-exists(modal-selected) {
       // color: $modal-selected;
-    }
-
-    @else {
+    } @else {
       // color: $color-primary;
     }
   }
 }
 
 .btn--selected {
-
   // background: $text-light;
   @if meta.variable-exists(modal-selected) {
     // color: $modal-selected;
-  }
-
-  @else {
+  } @else {
     // color: $color-primary;
   }
-}
+}
diff --git a/lib/ReactViews/FeatureInfo/feature-info-download.scss b/lib/ReactViews/FeatureInfo/feature-info-download.scss
@@ -16,6 +16,7 @@
 .icon--download {
   // the default icon styling for a dropdown is for a btn--primary, so we have to make some adjustments
   padding-right: 10px;
+
   svg {
     position: absolute;
     top: 6px;
@@ -29,24 +30,27 @@
 .dropdown__list {
   display: flex;
   flex-direction: column;
+
   li a {
     // this makes sure the hover highlight fills the full width of the item
     display: block;
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
+
     @if meta.variable-exists(text-link) {
-      color: $text-link;
+      color: variables.$text-link;
     }
+
     // Outside of a dropdown menu, links are normally shown with the same color on hover.
     // So, to provide some highlighting on hover in a dropdown menu, use the visited link color,
     // if it exists and is different from the unvisited link color.
     &:hover {
       @if meta.variable-exists(text-visited-link) and
         meta.variable-exists(text-link) and
-        ($text-visited-link != $text-link)
+        ($text-visited-link !=$text-link)
       {
-        color: $text-visited-link;
+        color: variables.$text-visited-link;
         text-decoration: variables.$link-text-decoration;
       }
     }

diff --git a/lib/ReactViews/FeatureInfo/feature-info-panel.scss b/lib/ReactViews/FeatureInfo/feature-info-panel.scss
@@ -90,7 +90,9 @@
 
   overflow-y: auto;
   overflow-x: auto;
-  max-height: calc(80vh - #{variables.$padding * 2 + variables.$btn-default-line-height});
+  max-height: calc(
+    80vh - #{variables.$padding * 2 + variables.$btn-default-line-height}
+  );
   font-size: variables.$font-size-feature-info;
 }
 
@@ -132,4 +134,4 @@
   composes: btn-primary from "../../Sass/common/_buttons.scss";
   margin: 8px;
   width: calc(100% - 16px);
-}
+}
diff --git a/lib/ReactViews/Map/MapNavigation/Items/Compass/Compass.tsx b/lib/ReactViews/Map/MapNavigation/Items/Compass/Compass.tsx
@@ -397,9 +397,9 @@ class Compass extends React.PureComponent<PropTypes, IStateTypes> {
           // focus it anyway..
           tabIndex={0}
           onFocus={() => this.setState({ active: true })}
-        // Gotta keep menu open if blurred, and close it with the close button
-        // instead. otherwise it'll never focus on the help buttons
-        // onBlur={() => this.setState({ active: false })}
+          // Gotta keep menu open if blurred, and close it with the close button
+          // instead. otherwise it'll never focus on the help buttons
+          // onBlur={() => this.setState({ active: false })}
         >
           <div style={rotationMarkerStyle}>
             <StyledIcon

diff --git a/lib/ReactViews/Map/MenuBar/menu-bar.scss b/lib/ReactViews/Map/MenuBar/menu-bar.scss
@@ -28,7 +28,8 @@
   composes: clearfix from "../../../Sass/common/_base.scss";
   composes: sm-show from "../../../Sass/common/_base.scss";
 
-  margin: 0 variables.$padding-small variables.$padding-small variables.$padding-small;
+  margin: 0 variables.$padding-small variables.$padding-small
+    variables.$padding-small;
 
   /* Align About button with compass */
   // margin-right: 7px;
@@ -55,25 +56,29 @@
   // TODO(?)
   // These selectors are here so that we can support the various implementations of
   // menu item, a prop calculated with javascript would be a better option for later
-  &:first-child>div>button,
-  &:first-child>div>a,
-  &:first-child>button,
-  &:first-child>a {
-    border-radius: variables.$map-button-border-radius 0 0 variables.$map-button-border-radius;
+  &:first-child > div > button,
+  &:first-child > div > a,
+  &:first-child > button,
+  &:first-child > a {
+    border-radius: variables.$map-button-border-radius 0 0
+      variables.$map-button-border-radius;
   }
 
-  &:last-child>div>button,
-  &:last-child>div>a,
-  &:last-child>button,
-  &:last-child>a {
-    border-radius: 0 variables.$map-button-border-radius variables.$map-button-border-radius 0;
+  &:last-child > div > button,
+  &:last-child > div > a,
+  &:last-child > button,
+  &:last-child > a {
+    border-radius: 0 variables.$map-button-border-radius
+      variables.$map-button-border-radius 0;
   }
 
-  &:only-child>div>button,
-  &:only-child>div>a,
-  &:only-child>button,
-  &:only-child>a {
-    border-radius: variables.$map-button-border-radius variables.$map-button-border-radius variables.$map-button-border-radius variables.$map-button-border-radius;
+  &:only-child > div > button,
+  &:only-child > div > a,
+  &:only-child > button,
+  &:only-child > a {
+    border-radius: variables.$map-button-border-radius
+      variables.$map-button-border-radius variables.$map-button-border-radius
+      variables.$map-button-border-radius;
   }
 }
 
@@ -85,4 +90,4 @@
   composes: btn from "../../../Sass/common/_buttons.scss";
   composes: btn--map from "../../../Sass/common/_buttons.scss";
   text-transform: uppercase;
-}
+}
diff --git a/lib/ReactViews/Notification/notification-window.scss b/lib/ReactViews/Notification/notification-window.scss
@@ -45,13 +45,13 @@
     }
 
     &::-webkit-scrollbar-track {
-      background: $scrollbar-track-color;
-      border-radius: $radius-large;
+      background: variables.$scrollbar-track-color;
+      border-radius: variables.$radius-large;
     }
 
     &::-webkit-scrollbar-thumb {
-      background: $scrollbar-color;
-      border-radius: $radius-large;
+      background: variables.$scrollbar-color;
+      border-radius: variables.$radius-large;
     }
   }
 }
@@ -83,4 +83,4 @@
 
 .body {
   font-size: 14px;
-}
+}
diff --git a/lib/ReactViews/Notification/notification-window.scss.d.ts b/lib/ReactViews/Notification/notification-window.scss.d.ts
@@ -1,7 +1,6 @@
 declare namespace NotificationWindowScssNamespace {
   export interface INotificationWindowScss {
     body: string;
-    btn: string;
     footer: string;
     inner: string;
     notification: string;

diff --git a/lib/ReactViews/SidePanel/full_screen_button.scss b/lib/ReactViews/SidePanel/full_screen_button.scss
@@ -15,10 +15,10 @@
   flex-direction: column;
   align-items: center;
   align-content: space-around;
-  background-color: $transparent-dark;
-  backdrop-filter: $blur;
-  width: $work-bench-width;
-  border-radius: $radius-xlarge;
+  background-color: variables.$transparent-dark;
+  backdrop-filter: variables.$blur;
+  width: variables.$work-bench-width;
+  border-radius: variables.$radius-xlarge;
   overflow: hidden;
 }
 
@@ -48,7 +48,6 @@
 }
 
 .minified {
-
   &,
   &:hover,
   &:focus {
@@ -72,4 +71,4 @@
   &:before {
     font-size: 1.6rem;
   }
-}
+}
diff --git a/lib/ReactViews/SidePanel/full_screen_button.scss.d.ts b/lib/ReactViews/SidePanel/full_screen_button.scss.d.ts
@@ -5,6 +5,7 @@ declare namespace FullScreenButtonScssNamespace {
     exit: string;
     "full-screen": string;
     fullScreen: string;
+    fullScreenWrapper: string;
     isActive: string;
     minified: string;
     minifiedFullscreenBtnWrapper: string;

diff --git a/lib/ReactViews/Story/StoryBuilder.tsx b/lib/ReactViews/Story/StoryBuilder.tsx
@@ -526,7 +526,7 @@ type PanelProps = React.ComponentPropsWithoutRef<typeof Box> & {
   isHidden?: boolean;
 };
 
-const Panel = styled(Box) <PanelProps>`
+const Panel = styled(Box)<PanelProps>`
   transition: all 0.25s;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
   width: 320px;

diff --git a/lib/ReactViews/Story/story-builder.scss b/lib/ReactViews/Story/story-builder.scss
@@ -58,7 +58,8 @@
   // color: $text-light;
   font-size: variables.$font-size-mid-small;
   text-transform: uppercase;
-  padding: variables.$padding variables.$padding variables.$padding 5 * variables.$padding;
+  padding: variables.$padding variables.$padding variables.$padding 5 *
+    variables.$padding;
   border: 0;
 
   svg {
@@ -274,7 +275,7 @@
 .VideoGuideWrapper--closing {
   @include mixins.animation("story-fade-out 0.3s");
 
-  &>div {
+  & > div {
     @include mixins.animation("story-slide-down 0.3s");
   }
 }
@@ -322,4 +323,4 @@
   left: 0;
   width: 100%;
   height: 100%;
-}
+}
diff --git a/lib/ReactViews/Story/story-editor.scss b/lib/ReactViews/Story/story-editor.scss
@@ -71,8 +71,8 @@
 
 .cancelBtn {
   composes: btn from "../../Sass/common/_buttons.scss";
-  composes: btn--transparent from "../../Sass/common/_buttons.scss";
+  composes: btn-transparent from "../../Sass/common/_buttons.scss";
   border: none;
   background: variables.$dark-mid;
   padding: 15px;
-}
+}
diff --git a/lib/ReactViews/Story/story-panel.scss b/lib/ReactViews/Story/story-panel.scss
@@ -49,4 +49,4 @@
       text-align: center;
     }
   }
-}
+}
diff --git a/lib/ReactViews/Workbench/Controls/legend.scss b/lib/ReactViews/Workbench/Controls/legend.scss
@@ -108,4 +108,4 @@
 
 .legendSpacer {
   height: variables.$legend-spacer-height;
-}
+}
diff --git a/lib/ReactViews/Workbench/Controls/timer-section.scss b/lib/ReactViews/Workbench/Controls/timer-section.scss
@@ -14,4 +14,4 @@
 
 .timer-container {
   padding-right: 10px;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,4 +106,4 @@ @@
           fill: variables.$color-primary;
         }
       }
-    }
+    }