Revert "Merge pull request #4865 from HSLdevcom/DT-6033"

This reverts commit 6ea65fb, reversing changes made to 24a88f7.
HSLdevcom · Oct 10, 2023 · 408e9d1 · 408e9d1
1 parent c224351
commit 408e9d1
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 167 deletions.
diff --git a/app/component/navigation.scss b/app/component/navigation.scss
@@ -89,7 +89,7 @@ $content-background-color: $background-color;
   }
 
   .logo {
-    height: $nav-logo-height;
+    height: 100%;
     min-height: 40px;
     min-width: 13em;
     background-size: contain;

diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js
@@ -781,7 +781,6 @@ export default {
     varely: '(seutuplus|varely)',
     kela: 'kelareitit',
     pori: 'pori',
-    raasepori: '(raasepori|bosse)',
   },
 
   minutesToDepartureLimit: 9,

diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js
@@ -91,7 +91,6 @@ export default {
     'Kajaani',
     'Salo',
     'Pori',
-    'Raasepori',
     'VARELY',
   ],
 
@@ -506,11 +505,6 @@ export default {
       sv: 'Björneborg',
       en: 'Pori',
     },
-    Raasepori: {
-      fi: 'Raasepori',
-      sv: 'Raseborg',
-      en: 'Raasepori',
-    },
     VARELY: {
       fi: 'Varsinais-Suomi',
       sv: 'Egentliga Finland',

diff --git a/app/configurations/config.raasepori.js b/app/configurations/config.raasepori.js
diff --git a/app/configurations/config.walttiOpas.js b/app/configurations/config.walttiOpas.js
@@ -62,7 +62,7 @@ export default configMerger(walttiConfig, {
   logo: 'walttiOpas/waltti-logo.png',
   favicon: './app/configurations/images/walttiOpas/favicon.png',
 
-  feedIds: ['Salo', 'Kajaani'],
+  feedIds: ['Salo', 'Kajaani', 'Raasepori'],
 
   defaultEndpoint: {
     address: 'Helsinki-Vantaan Lentoasema',
@@ -131,6 +131,11 @@ export default configMerger(walttiConfig, {
       fi: 'Salo',
       sv: 'Salo',
       en: 'Salo',
+    },
+    Raasepori: {
+      fi: 'Raasepori',
+      sv: 'Raseborg',
+      en: 'Raasepori',
     }
   },
 
@@ -146,9 +151,13 @@ export default configMerger(walttiConfig, {
     [29.2, 64.1],
     [28.7, 63.9],
     [28.1, 63.8],
-    // Salo:
+    // Salo + Raasepori:
     [23.1, 60.6],
-    [23.7, 60.2],
+    [23.898, 60.207],
+    [23.942, 60.129],
+    [23.836, 59.980],
+    [23.847, 59.892],
+    [23.581, 59.796],
     [22.8, 59.9],
     [22.7, 60.4],
     [23.1, 60.6],

diff --git a/app/configurations/images/raasepori/favicon.png b/app/configurations/images/raasepori/favicon.png
diff --git a/app/configurations/images/raasepori/raasepori_logo_musta.png b/app/configurations/images/raasepori/raasepori_logo_musta.png
diff --git a/app/configurations/images/raasepori/raasepori_logo_valkoinen.png b/app/configurations/images/raasepori/raasepori_logo_valkoinen.png
diff --git a/sass/themes/default/_theme.scss b/sass/themes/default/_theme.scss
@@ -118,6 +118,3 @@ $border-radius: 3px;
 $border-radius-bigger: 8px;
 
 $spinner-image: url('../default/default-spinner.png');
-
-/* Navbar dimensions */
-$nav-logo-height: 100%;
diff --git a/sass/themes/raasepori/_theme.scss b/sass/themes/raasepori/_theme.scss
diff --git a/sass/themes/raasepori/main.scss b/sass/themes/raasepori/main.scss