fix: text

mokamv · Nov 30, 2024 · c4f805e · c4f805e
1 parent 7e0c836
commit c4f805e
Show file tree

Hide file tree

Showing 19 changed files with 346 additions and 201 deletions.
diff --git a/.firebase/hosting.cHVibGlj.cache b/.firebase/hosting.cHVibGlj.cache
@@ -1,23 +1,23 @@
-ourservices.html,1722955863654,0970553cb19b21dab5ff38807217147eecb2443960124fc315ed23467821ec34
-index.html,1719412408295,261ee6bdd53023298ca381e5813634cd7ab0329cff32b3a11ace12fa93fb442f
-directions.html,1722955224518,26f58b5e3275bfeae45b2e5ac0c75cb61b4736dbf71fb66dd68b8f0853d10a86
-contact.html,1724880322211,7590d51cdcd7458e842223bb408e1dd809bb389ac7d41d1b3414dbc7a95cfd47
-404.html,1715813689003,b6abfbdc894d37c260154e281499dc6415bb6ad76b32f01ef94dee93aa897ac4
-ourservices/sovnregistrering.html,1722955799045,75a4ee400ee0b06c0b9864a9053375cd4b934867d3d06a0c80008b6a27669c43
-ourservices/pustetester.html,1723568685111,29147478bb12c1f6d151f14031e036ea056089a6596e3d00e5f807570ef39dd7
-ourservices/hyposensibilisering.html,1724881444412,843df110978287806afbd2e8ff7fc1b284733448dcd84bd0747cad1d01ab603e
-ourservices/belastningstest.html,1723568437182,d8264711a8b6a3219384d3bceff6dc69d506f4c3ec9ea60235a538c05783b683
+index.html,1732552865537,681c62846a39f0cc4ead43a2ff36e0647f05d8cedd19044c164f9e33543e5599
+directions.html,1731937317944,c5675d5bec57666db30d993d4a9c97b24dde22548651abb4f02568a532f84ea2
+contact.html,1732555412821,798ed18fdd243330931a93b69bab03e433cede1c22130357c88f9de0c5542bed
+404.html,1731937307223,47f43e9b5cd6f4ec32539f385bfbc5d58039f2508d4bb3fc831a86bdd0838d10
 media/parkeringinngang.jpg,1716146294230,474ca4186c5206d3bd05a169664fc521f04b037046b12219d62ade47d567c44f
 media/lungelege-saeed-vahedi.webp,1714916879048,54dbbee4745c05ba5a481e08b778dd97a251aca36839fe24611936accdc26a63
 media/logo.png,1715281714069,960b70647aee6ba888cb8bfde3532bde3e87c75ccae0eda23d2c490baca0cd70
 media/forkl9.jpg,1716146515334,27da2b7e7866853011f0a13fb65e569d826cab9830e4c77950119b7b512003e0
 media/etterkl9.jpg,1716147000891,9a4f2c54dee84dd70c46f662f82643fcf94e69d978942fe208e70569aff9f0f0
-innkalling/sovnregistrering.html,1724881325499,3cf3344761561c559023f7ce99108ff23852390d37d945b27bc162ac598bb1ca
-innkalling/metakolin.html,1724880252091,8ab903a0f04dba69b85fe471248074a9014c016365c0ac6a34457283c07715bf
-innkalling/innkalling.css,1718212273916,231fe01501a6c0540a1629d1a73c83236625a20c013864b9d5b5ce36cb723e16
-innkalling/hyposensibilisering.html,1724880197155,87003a903192d4d6ae598e8859826df108391ccfd319a7c2d31c3720d0e023bc
-css/ourservices.css,1722955744911,d93e3aa44ecb5e2aaf437055fce11ec74072fe6463332298a95bf5eac8df67b5
-css/index.css,1719228942526,929558229e08a3ffa74a1722ed7c5c492aa0669687558acb6fcdffca586e8b62
-css/directions.css,1718100794564,b88a7b31e51ef5cc40a7576fb27286512dcd23e375650dae34ae05ce10ef1d47
-css/contact.css,1717778421256,c523eecb369b73514322d762f8e6ed6ec0414bf71de0439f739b36ab1a57014f
-ourservices/provokasjonstest.html,1724881957887,f91547e56c6d01c67bf9c817271c507e0e634b2847ae13d8a6469d513ce80084
+innkalling/innkalling.css,1732297637992,c1b5dd7cd375f242d35ebb38d6b21c1a5b67f7a22f14af3cdf5481efa5f1a8dc
+css/ourservices.css,1732298420248,077ed04776595b06585ec9285244fe733ec3cf68cc55fa2f80711da779c628d0
+css/index.css,1732553428778,bf9f7b3897f2c78fc93349669894f9f5796a5b83c9b4c561fe8b8c3309cdedda
+css/directions.css,1732298885514,f272cf3fd968d04274b079281c2d45e3c585ccc3822253f63b037eee59ace5c2
+css/contact.css,1732297419448,c523eecb369b73514322d762f8e6ed6ec0414bf71de0439f739b36ab1a57014f
+ourservices/sovnregistrering.html,1732975168653,fb7d0dcaff244e83d933e90f5e99774ee09be1033aa2b05727782b9c817e5d79
+ourservices.html,1732975180273,70a6eb5caea2e7ea906fd85b37dfd28f197223c487c162e2fb0210e65239d325
+ourservices/hyposensibilisering.html,1732975369229,af178e2d193e5e8dbb6fd5d910d1b0b431e2a54ae1889ade3eed1b4ae002a1e3
+ourservices/pustetester.html,1732975158346,e35eeab733ccac3afb17cff09d2e882afc3b0039141d70fa37d307cd5f8a063d
+ourservices/belastningstest.html,1732975134560,1ab0f65c22e3a188c5dc68787895f67a731e8a834c7b297b21bef7ce9c02f6e4
+innkalling/sovnregistrering.html,1732975463247,29466b230a3683cc31dd7f62b4b9313dc0d5b96ab4886a895c872b7760c0ba7f
+innkalling/hyposensibilisering.html,1732975437726,2a04b2e10c9417adfca083dfce01fe2a7e2526268fcf648e5288c8d6dac73b1a
+innkalling/metakolin.html,1732975450500,6d764dd976c6bb74263367526579a95d3f754ff752b09120e53887c1ef17c8e0
+ourservices/provokasjonstest.html,1732975141447,991cf93aeeca9bdf8c19516def23fb1f5f28dfb560acc99099fe03d7865501f0
diff --git a/firestore-debug.log b/firestore-debug.log
@@ -1,4 +1,4 @@
-Nov 18, 2024 2:22:40 PM com.google.cloud.datastore.emulator.firestore.websocket.WebSocketServer start
+Nov 22, 2024 7:17:45 PM com.google.cloud.datastore.emulator.firestore.websocket.WebSocketServer start
 INFO: Started WebSocket server on ws://127.0.0.1:9150
 API endpoint: http://127.0.0.1:8080
 If you are using a library that supports the FIRESTORE_EMULATOR_HOST environment variable, run:
@@ -12,13 +12,11 @@ If you are running a Firestore in Datastore Mode project, run:
 Note: Support for Datastore Mode is in preview. If you encounter any bugs please file at https://github.com/firebase/firebase-tools/issues.
 Dev App Server is now running.
 
-Nov 18, 2024 2:22:56 PM io.gapi.emulators.netty.HttpVersionRoutingHandler channelRead
+Nov 25, 2024 4:30:30 PM io.gapi.emulators.netty.HttpVersionRoutingHandler channelRead
 INFO: Detected non-HTTP/2 connection.
-Nov 18, 2024 2:22:57 PM io.gapi.emulators.netty.NotFoundHandler handleRequest
+Nov 25, 2024 4:30:30 PM io.gapi.emulators.netty.NotFoundHandler handleRequest
 INFO: Unknown request URI: /favicon.ico
-Nov 18, 2024 2:23:11 PM com.google.cloud.datastore.emulator.firestore.websocket.WebSocketChannelHandler initChannel
-INFO: Connected to new websocket client
-Nov 18, 2024 2:23:26 PM io.netty.channel.DefaultChannelPipeline onUnhandledInboundException
+Nov 25, 2024 4:30:59 PM io.netty.channel.DefaultChannelPipeline onUnhandledInboundException
 WARNING: An exceptionCaught() event was fired, and it reached at the tail of the pipeline. It usually means the last handler in the pipeline did not handle the exception.
 java.io.IOException: Connection reset by peer
 	at java.base/sun.nio.ch.FileDispatcherImpl.read0(Native Method)
@@ -40,5 +38,3 @@ java.io.IOException: Connection reset by peer
 	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30)
 	at java.base/java.lang.Thread.run(Thread.java:834)
 
-Nov 18, 2024 2:23:26 PM com.google.cloud.datastore.emulator.firestore.websocket.WebSocketChannelHandler channelClosed
-INFO: Websocket client disconnected
diff --git a/public/404.html b/public/404.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel="icon" type="image/png" href="media/logo.png">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Page Not Found</title>

diff --git a/public/contact.html b/public/contact.html
@@ -6,6 +6,7 @@
     <title>Directions</title>
 
     <link rel="stylesheet" href="css/contact.css">
+    <link rel="icon" type="image/png" href="media/logo.png">
 
     <!-- update the version number as needed -->
     <script defer src="/__/firebase/10.11.1/firebase-app-compat.js"></script>
@@ -54,14 +55,16 @@
     <div class="content">
       <div class="left">
         <h1 class="uk-text">Kontakt</h1>
-        <h2 class="uk-text">Tlf: 67 79 99 11 <br> Mail: [email protected]</h3>
+        <h2 class="uk-text">Tlf: 67 79 99 11 <br> Mail: [email protected]</h2>
+        <h2 class="uk-text">Telefontid: Mandag til torsdag fra kl. 8 - 11.30</h2>
         <h1 class="uk-text">Besøk</h1>
         <h2 class="uk-text">Sandvika storsenter, Servicebygget 4-etg. <br>Brodtkorbsgate 7<br>1338 Sandvika</h3>
         <br>
       </div>
       <div class="right">
         <h1 class="uk-text">Åpningstider</h1>
-        <h3 class="uk-text">Ferieavvikling fra og med 8. juni til 4. august 2024. <br> Vennligst ta kontakt på mail eller telefon for informasjon om timebestilling og ledige timer.</h3>
+        <h2 class="uk-text">Mandag til fredag fra kl. 08.00 - 16.00</h2><br>
+        <h3 class="uk-text">Ferieavvikling fra og med 21. desember 2024 til 1. januar 2025. <br> Vennligst ta kontakt på mail eller telefon for informasjon om timebestilling og ledige timer.</h3>
     <br>
     <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2001.5419157362112!2d10.517964777700934!3d59.8899540660193!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46411366d5994497%3A0x38de2b09ba03de0b!2sBrodtkorbsgate%207%2C%201338%20Sandvika!5e0!3m2!1sno!2sno!4v1716147749349!5m2!1sno!2sno" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
     </div>

diff --git a/public/css/directions.css b/public/css/directions.css
@@ -21,6 +21,10 @@ body {
     .nav-links {
         display: none;
     }
+    img{
+        width: 400px;
+        height: auto;
+    }
 }
 
 @media screen and not (max-width: 740px) {

diff --git a/public/css/index.css b/public/css/index.css
@@ -1,22 +1,22 @@
 html, body {
   margin: 0;
   padding: 0;
+  height: 100%;
 }
 
 body {
   background-color: #f7f7f7;
 }
 
-.topnav {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #ffffff;
-  overflow: hidden;
-  height: 140px;
-  padding-right: 50px;
+.content {
+  display: grid;
+  grid-template-columns: 2fr 1fr; /* Two columns: left (2 parts), right (1 part) */
+  grid-template-rows: auto;
+  width: 100%;
+  margin-top: 0px;
 }
 
+
 @media screen and (max-width: 740px) {
     .nav-links {
       display: none;
@@ -29,6 +29,16 @@ body {
   }
 }
 
+.topnav {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #ffffff;
+  overflow: hidden;
+  height: 140px;
+  padding-right: 50px;
+}
+
 .topnav a {
   color: #3c3c3c;
   text-align: center;
@@ -44,14 +54,11 @@ body {
   margin-left: auto;
 }
 
-
-/* Change the color of links on hover */
 .topnav a:hover {
   background-color: #ddd;
   color: black;
 }
-
-  /* Add a color to the active/current link */
+
 .topnav a.active {
   /* background: linear-gradient(to right, rgb(103, 143, 105), #375940); */
   background-color: rgb(76,113,112);
@@ -60,12 +67,12 @@ body {
 }
 
 .logo {
-  width: 120px; /* Adjust this value as needed */
-  height:120px; /* Adjust this value as needed */
+  width: 120px; 
+  height:120px;
   border-radius: 50%;
   margin-top: 5px;
   margin-left: 50px;
-  transform: scale(1); /* Increase the size of the image */
+  transform: scale(1);
   object-fit: cover;
   margin-top: 10px;
   margin-bottom: 10px;
@@ -80,7 +87,7 @@ body {
   font-size: 20px;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-weight: 300;
-  margin: 20px;
+  margin: 0;
   background-color: rgb(255, 255, 255);
   color: rgb(0, 0, 0);
   border-radius: 5px;
@@ -97,7 +104,6 @@ body {
   z-index: 1;
 }
 
-/* Links inside the dropdown */
 .dropdown-content a {
   float: none;
   color: black;
@@ -107,69 +113,72 @@ body {
   text-align: left;
 }
 
-/* Add a grey background color to dropdown links on hover */
 .dropdown-content a:hover {
   background-color: #ddd;
 }
 
-/* Show the dropdown menu on hover */
 .dropdown:hover .dropdown-content {
   display: block;
 }
 
-.content {
-  display: grid;
-  grid-template-columns: 4fr 1fr;
-  grid-template-rows: auto;
-  margin-top: 0px;
-  padding-top: 0px;
-  height: 750px;
-}
-
-@media  screen and (max-width: 740px) {
-  .content {
-    grid-template-columns: 90vw 1fr;
-    grid-template-rows: 1fr auto;
-  }
-  .left {
-    grid-column: 1/2;
-    grid-row: 1/2;
-  }
-  .right {
-    grid-column: 1/3;
-    grid-row: 2/3;
-  }
-}
-
 .left {
-  display: flex;
-  flex-direction: column;
-  flex-basis: 30%;
-  margin: 50px;
-  position: relative;
+  grid-column: 1; /* Ensures it's in the first column */
+  grid-row: 1; /* Ensures it's in the first row */
+  padding: 50px;
 }
 
 .right {
-  display: flex;
-  flex-direction: column;
-  flex-basis: 50%;
-  margin-right: 0px;
+  grid-column: 2; /* Ensures it's in the second column */
+  grid-row: 1; /* Ensures it's in the first row */
+  margin:0;
+  padding: 0;
+  max-width: 100%;
+  height: auto;
+  object-fit: cover;
 }
 
-.right img {
-  width: 750px;
+.right-img {
+  width: 100%;
   height: auto;
   object-fit: cover;
   margin-right: 0px;
 }
 
+@media screen and (max-width: 740px) {
+  .content {
+    display: grid;
+    grid-template-columns: 1fr; /* Single column for stacking */
+    grid-template-rows: auto auto; /* Two rows: left first, right second */
+    gap: 20px; /* Optional space between rows */
+  }
+  .left {
+    grid-column: 1; /* Full width */
+    grid-row: 1; /* First row */
+  }
+  .right {
+    grid-column: 1; /* Full width */
+    grid-row: 2; /* Second row */
+  }
+  .right-img {
+    display: none; /* Hide the image on small screens */
+  }
+  .topnav {
+    padding-right: 0px !important; /* Fixes top navigation padding */
+  }
+}
+
+
 .uk-text {
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-weight: 300;
   color: #2d2e33;
   font-size: 40px, 40px, 20px;
 }
 
+.uk-text h3 {
+  font-size: 10px;
+}
+
 .find-us {
   top: 30%;
   left: 70px;
@@ -250,4 +259,29 @@ body {
   position: absolute;
   top: 50%;
   left: 375px;
+}
+
+footer {
+  background-color: rgb(76,113,112); /* Added footer styles */
+  color: white;
+  text-align: left;
+  padding: 5px;
+  padding-left: 30px;
+  width: auto;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 20px;
+  position: relative;
+}
+
+.email-link {
+  color: white;
+  text-decoration: none;
+}
+
+.email-link:hover {
+  text-decoration: underline;
+}
+
+h3.small-text {
+  font-size: 25px; /* Use the correct desired size */
 }
diff --git a/public/css/ourservices.css b/public/css/ourservices.css
@@ -42,8 +42,8 @@ body {
   }
   .right {
     margin-left: 0px;
-    margin-right: 150px;
-    margin-top: 140px;
+    margin-right: 50px;
+    margin-top: 45px;
   }
 }
 

diff --git a/public/directions.html b/public/directions.html
@@ -6,6 +6,7 @@
     <title>Directions</title>
 
     <link rel="stylesheet" href="css/directions.css">
+    <link rel="icon" type="image/png" href="media/logo.png">
 
     <!-- update the version number as needed -->
     <script defer src="/__/firebase/10.11.1/firebase-app-compat.js"></script>