diff --git a/public/img/locations/dining.png b/public/img/locations/dining.png index 9fa3961..cc31e64 100644 Binary files a/public/img/locations/dining.png and b/public/img/locations/dining.png differ diff --git a/public/img/locations/lab.png b/public/img/locations/lab.png index 4d55e27..1372b94 100644 Binary files a/public/img/locations/lab.png and b/public/img/locations/lab.png differ diff --git a/public/img/other/art.png b/public/img/other/art.png index 8fd4896..30ada92 100644 Binary files a/public/img/other/art.png and b/public/img/other/art.png differ diff --git a/public/img/other/bike-racks.png b/public/img/other/bike-racks.png index 267f634..e4e1741 100644 Binary files a/public/img/other/bike-racks.png and b/public/img/other/bike-racks.png differ diff --git a/public/img/outdoors/recreation.png b/public/img/outdoors/recreation.png index 64b8213..4b8cc80 100644 Binary files a/public/img/outdoors/recreation.png and b/public/img/outdoors/recreation.png differ diff --git a/public/img/outdoors/well-being.png b/public/img/outdoors/well-being.png index 6a372f7..b6fbbf4 100644 Binary files a/public/img/outdoors/well-being.png and b/public/img/outdoors/well-being.png differ diff --git a/src/App.tsx b/src/App.tsx index 800de19..3d548c3 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -355,6 +355,7 @@ function App() { layout: { ...defaultLayoutProps, "icon-image": 'dining', + "icon-size": 0.4, visibility: visibility.locations.dining! ? 'visible': 'none' }, }; @@ -375,6 +376,7 @@ function App() { layout: { ...defaultLayoutProps, "icon-image": 'lab', + "icon-size": 0.8, visibility: visibility.locations.labs! ? 'visible': 'none' }, }; @@ -436,6 +438,7 @@ function App() { layout: { ...defaultLayoutProps, "icon-image": 'recreation', + "icon-size" : .5, visibility: visibility.outdoors.recreation! ? 'visible': 'none' }, }; @@ -446,6 +449,7 @@ function App() { layout: { ...defaultLayoutProps, "icon-image": 'wellbeing', + "icon-size": 0.5, visibility: visibility.outdoors.wellBeing! ? 'visible': 'none' }, }; @@ -521,6 +525,7 @@ function App() { layout: { ...defaultLayoutProps, "icon-image": 'bike-rack', + "icon-size": 0.7, visibility: visibility.bikeRacks! ? 'visible': 'none' }, }; @@ -551,6 +556,7 @@ function App() { layout: { ...defaultLayoutProps, "icon-image": 'art', + "icon-size": 0.5, visibility: visibility.art! ? 'visible': 'none' }, }; @@ -579,16 +585,9 @@ function App() { return (
{
{campus.map((campusData, index) => ( - onclick(campusData)}>{campusData.shortName}{ index !== campus.length - 1 && | } + onclick(campusData)}>{campusData.shortName.toUpperCase()}{ index !== campus.length - 1 && | } ))}
diff --git a/src/components/MapMenu.tsx b/src/components/MapMenu.tsx index eb1a7f6..1dae4a0 100644 --- a/src/components/MapMenu.tsx +++ b/src/components/MapMenu.tsx @@ -9,9 +9,10 @@ interface MapMenuProps { export default function MapMenu(props: MapMenuProps) { return (
-
-
-
+
+
Campus Map
+ -
-
+
+
-
  • @@ -216,70 +271,18 @@ export default function MapMenu(props: MapMenuProps) {
props.setVisibility({ ...props.visibility, 'shuttleStops': !props.visibility['shuttleStops'] })} > - bus logo Shuttle + bus logo props.setVisibility({ ...props.visibility, 'emergencyPhones': !props.visibility['emergencyPhones'] })} > - emergency phones Emergency - - + emergency phones +
diff --git a/src/components/SearchResults.scss b/src/components/SearchResults.scss index 57b0132..68a18fb 100644 --- a/src/components/SearchResults.scss +++ b/src/components/SearchResults.scss @@ -5,13 +5,14 @@ .search-control-wrapper { background-color: black; height: 3.1rem; - left: 0; + left: 10px; padding: .35rem .25rem; position: absolute; - top: 0; + top: 60px; width: calc(100% - 1rem); @include media-breakpoint-up(sm) { + top: 0; width: 50%; }