Merge pull request #5237 from HSLdevcom/svg-cleanup

SVG cleanup part 1
HSLdevcom · Jan 29, 2025 · 50b1ac8 · 50b1ac8
2 parents 320e142 + 8ffa3ad
commit 50b1ac8
Show file tree

Hide file tree

Showing 21 changed files with 4,247 additions and 4,927 deletions.
diff --git a/app/component/itinerary/BicycleLeg.js b/app/component/itinerary/BicycleLeg.js
@@ -278,7 +278,7 @@ export default function BicycleLeg(
                     {origin}
                     {leg.isViaPoint && (
                       <Icon
-                        img="icon-icon_mapMarker-via"
+                        img="icon-icon_mapMarker"
                         className="itinerary-mapmarker-icon"
                       />
                     )}

diff --git a/app/component/itinerary/BikeParkLeg.js b/app/component/itinerary/BikeParkLeg.js
@@ -58,7 +58,7 @@ const BikeParkLeg = (
               <FormattedMessage id="bike-park" />
               {leg.isViaPoint && (
                 <Icon
-                  img="icon-icon_mapMarker-via"
+                  img="icon-icon_mapMarker"
                   className="itinerary-mapmarker-icon"
                 />
               )}

diff --git a/app/component/itinerary/CarLeg.js b/app/component/itinerary/CarLeg.js
@@ -68,7 +68,7 @@ export default function CarLeg(props, { config, intl }) {
               {address}
               {props.leg.isViaPoint && (
                 <Icon
-                  img="icon-icon_mapMarker-via"
+                  img="icon-icon_mapMarker"
                   className="itinerary-mapmarker-icon"
                 />
               )}

diff --git a/app/component/itinerary/CarParkLeg.js b/app/component/itinerary/CarParkLeg.js
@@ -74,7 +74,7 @@ function CarParkLeg(props, { config, intl }) {
                 <FormattedMessage id="car_park" defaultMessage="Park & Ride" />
                 {props.leg.isViaPoint && (
                   <Icon
-                    img="icon-icon_mapMarker-via"
+                    img="icon-icon_mapMarker"
                     className="itinerary-mapmarker-icon"
                   />
                 )}

diff --git a/app/component/itinerary/EndLeg.js b/app/component/itinerary/EndLeg.js
@@ -38,10 +38,7 @@ function EndLeg(props, context) {
       <div className={`leg-before ${modeClassName}`} aria-hidden="true">
         <div className={`leg-before-circle circle ${modeClassName}`} />
         <div className="itinerary-icon-container">
-          <Icon
-            img="icon-icon_mapMarker-to"
-            className="itinerary-icon to to-it"
-          />
+          <Icon img="icon-icon_mapMarker" className="itinerary-icon to to-it" />
         </div>
       </div>
       <div className="small-9 columns itinerary-instruction-column to end">

diff --git a/app/component/itinerary/IntermediateLeg.js b/app/component/itinerary/IntermediateLeg.js
@@ -154,7 +154,7 @@ function IntermediateLeg(
             </div>
             {isViaPoint && (
               <Icon
-                img="icon-icon_mapMarker-via"
+                img="icon-icon_mapMarker"
                 className="itinerary-mapmarker-icon"
               />
             )}

diff --git a/app/component/itinerary/Itinerary.js b/app/component/itinerary/Itinerary.js
@@ -241,7 +241,7 @@ ModeLeg.contextTypes = {
 
 export const ViaLeg = () => (
   <div className="leg via">
-    <Icon img="icon-icon_mapMarker-via" className="itinerary-icon place" />
+    <Icon img="icon-icon_mapMarker" className="itinerary-icon place" />
   </div>
 );
 

diff --git a/app/component/itinerary/ItineraryCircleLine.js b/app/component/itinerary/ItineraryCircleLine.js
@@ -63,7 +63,7 @@ class ItineraryCircleLine extends React.Component {
         <>
           <div className="itinerary-icon-container start">
             <Icon
-              img="icon-icon_mapMarker-from"
+              img="icon-icon_mapMarker"
               className="itinerary-icon from from-it"
             />
           </div>
@@ -82,7 +82,7 @@ class ItineraryCircleLine extends React.Component {
       return (
         <div className="itinerary-icon-container">
           <Icon
-            img="icon-icon_mapMarker-via"
+            img="icon-icon_mapMarker"
             className="itinerary-icon via via-it"
           />
         </div>

diff --git a/app/component/itinerary/ItineraryCircleLineLong.js b/app/component/itinerary/ItineraryCircleLineLong.js
@@ -25,7 +25,7 @@ const ItineraryCircleLineLong = props => {
       return (
         <div className="itinerary-icon-container start">
           <Icon
-            img="icon-icon_mapMarker-from"
+            img="icon-icon_mapMarker"
             className="itinerary-icon from from-it"
           />
         </div>

diff --git a/app/component/itinerary/ItineraryCircleLineWithIcon.js b/app/component/itinerary/ItineraryCircleLineWithIcon.js
@@ -49,7 +49,7 @@ class ItineraryCircleLineWithIcon extends React.Component {
       return (
         <div className="itinerary-icon-container">
           <Icon
-            img="icon-icon_mapMarker-via"
+            img="icon-icon_mapMarker"
             className="itinerary-icon via via-it"
           />
         </div>
@@ -59,7 +59,7 @@ class ItineraryCircleLineWithIcon extends React.Component {
       return (
         <div className="itinerary-icon-container start">
           <Icon
-            img="icon-icon_mapMarker-from"
+            img="icon-icon_mapMarker"
             className="itinerary-icon from from-it"
           />
         </div>

diff --git a/app/component/itinerary/TransitLeg.js b/app/component/itinerary/TransitLeg.js
@@ -481,7 +481,7 @@ class TransitLeg extends React.Component {
                 {leg.from.name}
                 {leg.isViaPoint && (
                   <Icon
-                    img="icon-icon_mapMarker-via"
+                    img="icon-icon_mapMarker"
                     className="itinerary-mapmarker-icon"
                   />
                 )}

diff --git a/app/component/itinerary/WaitLeg.js b/app/component/itinerary/WaitLeg.js
@@ -52,7 +52,7 @@ function WaitLeg(
               {leg.to.name}
               {leg.isViaPoint && (
                 <Icon
-                  img="icon-icon_mapMarker-via"
+                  img="icon-icon_mapMarker"
                   className="itinerary-mapmarker-icon"
                 />
               )}

diff --git a/app/component/itinerary/WalkLeg.js b/app/component/itinerary/WalkLeg.js
@@ -152,7 +152,7 @@ function WalkLeg(
                   {returnNotice || leg[toOrFrom].name}
                   {leg.isViaPoint && (
                     <Icon
-                      img="icon-icon_mapMarker-via"
+                      img="icon-icon_mapMarker"
                       className="itinerary-mapmarker-icon"
                     />
                   )}

diff --git a/app/component/itinerary/navigator/NaviCardExtension.js b/app/component/itinerary/navigator/NaviCardExtension.js
@@ -34,7 +34,7 @@ const NaviCardExtension = ({ legType, leg, nextLeg, time }, { config }) => {
       config,
     );
   } else {
-    destination.iconId = 'icon-icon_mapMarker-to';
+    destination.iconId = 'icon-icon_mapMarker';
     destination.className = 'place';
     destination.name = place;
   }

diff --git a/app/component/map/LocationMarker.js b/app/component/map/LocationMarker.js
@@ -34,7 +34,7 @@ export default function LocationMarker({
         className: cx(validType, className),
         element: (
           <Icon
-            img={`icon-icon_mapMarker-${validType}-map`}
+            img="icon-icon_mapMarker-map"
             color={disabled ? '#bbbbbb' : null}
           />
         ),

diff --git a/app/component/routepage/ScheduleHeader.js b/app/component/routepage/ScheduleHeader.js
@@ -39,14 +39,14 @@ function ScheduleHeader({
   const stopHeadersForPrinting = (
     <div className="printable-stop-header">
       <div className="printable-stop-header_icon-from">
-        <Icon img="icon-icon_mapMarker-from" />
+        <Icon img="icon-icon_mapMarker" />
       </div>
       <div className="printable-stop-header_from">
         <span>{fromDisplayName}</span>
       </div>
       <div className="printable-stop-header_line" style={headerLineStyle} />
       <div className="printable-stop-header_icon-to">
-        <Icon img="icon-icon_mapMarker-to" />
+        <Icon img="icon-icon_mapMarker" />
       </div>
       <div className="printable-stop-header_to">
         <span>{toDisplayName}</span>

diff --git a/sass/themes/hsl/_icon.scss b/sass/themes/hsl/_icon.scss
diff --git a/sass/themes/hsl/main.scss b/sass/themes/hsl/main.scss
@@ -1,4 +1,3 @@
 /* Theme */
 @import 'theme';
 @import '../../main';
-@import 'icon';