From 921eea39b2224c2947efb30c31038551cd77f5af Mon Sep 17 00:00:00 2001
From: mathith <mathith@stud.ntnu.no>
Date: Wed, 12 Feb 2020 13:17:08 +0100
Subject: [PATCH 1/4] Fix general heading. Change background

---
 src/Bus/bus.css                              |  4 ++--
 src/Events/PromotedEvents/index.js           | 24 ++++++++------------
 src/Events/UpcomingEvents/UpcomingEvents.css |  1 -
 src/Main.css                                 |  4 ++--
 src/Main.js                                  |  5 ++--
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/Bus/bus.css b/src/Bus/bus.css
index a4e5645..7be3ab2 100644
--- a/src/Bus/bus.css
+++ b/src/Bus/bus.css
@@ -12,14 +12,14 @@
 }
 
 .bus-list {
-  background-color: #262938;
+  background-color: white;
   border-radius: 10px;
   flex-grow: 3;
 }
 
 .list-item {
   height: 8vh;
-  color: white;
+  color: black;
   display: flex;
   align-items: center;
   justify-content: space-between;
diff --git a/src/Events/PromotedEvents/index.js b/src/Events/PromotedEvents/index.js
index 1a22f43..ecf241c 100644
--- a/src/Events/PromotedEvents/index.js
+++ b/src/Events/PromotedEvents/index.js
@@ -1,23 +1,21 @@
-import React, { Component } from 'react';
-import { object, arrayOf } from 'prop-types';
-import SinglePromotedEvent from './SinglePromotedEvent';
-import './PromotedEvents.scss';
+import React, { Component } from "react";
+import { object, arrayOf } from "prop-types";
+import SinglePromotedEvent from "./SinglePromotedEvent";
+import "./PromotedEvents.scss";
 
 class PromotedEventsComponent extends Component {
   static propTypes = {
-    events: arrayOf(object),
-  }
+    events: arrayOf(object)
+  };
 
   static defaultProps = {
-    events: [],
-  }
-
+    events: []
+  };
 
   renderEvent() {
     const { events } = this.props;
     return (
       <div id="all-wrapper">
-
         <div className="split left">
           <SinglePromotedEvent event={events[0]} className="promotedBusiness" />
         </div>
@@ -28,18 +26,14 @@ class PromotedEventsComponent extends Component {
     );
   }
 
-
   render() {
     return (
       <div className="promoted-wrapper">
-        <div className="title-header">
-          <h1>PÅMELDINGER</h1>
-        </div>
+        <div className="main-title">PÅMELDINGER</div>
         {this.renderEvent()}
       </div>
     );
   }
 }
 
-
 export default PromotedEventsComponent;
diff --git a/src/Events/UpcomingEvents/UpcomingEvents.css b/src/Events/UpcomingEvents/UpcomingEvents.css
index f1ea62e..fb2d7d2 100644
--- a/src/Events/UpcomingEvents/UpcomingEvents.css
+++ b/src/Events/UpcomingEvents/UpcomingEvents.css
@@ -5,7 +5,6 @@
   margin: 40px 0;
   padding: 10px;
   border-radius: 0 0 14px 14px;
-  box-shadow: 0px 5px 20px rgb(71, 71, 71);
 }
 
 .upcoming-wrapper div {
diff --git a/src/Main.css b/src/Main.css
index a8ff923..d6ddebf 100644
--- a/src/Main.css
+++ b/src/Main.css
@@ -20,7 +20,7 @@ body {
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  background-color: #263238;
+  background-color: #03080f;
 }
 
 div {
@@ -39,7 +39,7 @@ div {
   position: relative;
   width: 100%;
   height: 100%;
-  background: url("../public/background.svg") no-repeat center bottom fixed;
+  /* background: url("../public/background.svg") no-repeat center bottom fixed;*/
   z-index: 0;
 }
 
diff --git a/src/Main.js b/src/Main.js
index fc75912..51b0a38 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -29,6 +29,8 @@ class MainComponent extends Component {
   }
 
   renderComponent() {
+    return <PromotedEvents />;
+
     const { data } = this.props;
     switch (data.currentComponent) {
       case "bus":
@@ -46,11 +48,10 @@ class MainComponent extends Component {
     return (
       <div className="main">
         <div className="wrapper">
-          <UpcomingEvents />;
           {/* <React.Fragment>
           <Time displayTime />
         </React.Fragment> */}
-          {/* this.renderComponent() */}
+          {this.renderComponent()}
           {/* <Abakus /> */}
         </div>
       </div>

From 8e849a2d5f012034039e60d1d76c26b1662d7b2b Mon Sep 17 00:00:00 2001
From: mathith <mathith@stud.ntnu.no>
Date: Tue, 18 Feb 2020 12:20:51 +0100
Subject: [PATCH 2/4] Finished styling upcoming events. Clean up in css

---
 src/Events/UpcomingEvents/UpcomingEvents.css  | 43 ++++++++++++-------
 src/Events/UpcomingEvents/UpcomingEvents.js   |  4 +-
 .../UpcomingEvents/UpcomingSingleEvent.js     |  2 +-
 src/Main.css                                  |  2 +-
 src/Main.js                                   |  5 +--
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/Events/UpcomingEvents/UpcomingEvents.css b/src/Events/UpcomingEvents/UpcomingEvents.css
index fb2d7d2..63fb053 100644
--- a/src/Events/UpcomingEvents/UpcomingEvents.css
+++ b/src/Events/UpcomingEvents/UpcomingEvents.css
@@ -1,18 +1,6 @@
-.upcoming-wrapper {
-  text-align: center;
-  white-space: nowrap;
-  background-color: #ffffff;
-  margin: 40px 0;
-  padding: 10px;
-  border-radius: 0 0 14px 14px;
-}
-
-.upcoming-wrapper div {
-  font-size: 1.3em;
-  white-space: pre;
-}
+/* Styling for UpcomingEvents */
 
-.signup-wrapper {
+.upcoming-wrapper {
   display: flex;
 }
 
@@ -32,6 +20,8 @@
   right: 0;
 }
 
+/* Styling for UpcomingHalfEvents */
+
 .title {
   font-size: 2.3em;
   color: white;
@@ -39,9 +29,32 @@
   margin: 0;
 }
 
+/* Styling for UpcomingSingleEvent */
+
+.single-event-wrapper {
+  text-align: center;
+  white-space: nowrap;
+  background-color: #ffffff;
+  margin: 2vw 0;
+  padding: 7px;
+  border-radius: 14px;
+}
+
+.single-event-wrapper div {
+  white-space: pre;
+}
+
 .event-title {
   text-transform: uppercase;
-  font-size: 2.5em;
+  font-size: 2.8em;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.event-information {
+  color: #707070;
+  font-size: 1.6em;
 }
 
 .event-title,
diff --git a/src/Events/UpcomingEvents/UpcomingEvents.js b/src/Events/UpcomingEvents/UpcomingEvents.js
index e8f0528..9821897 100644
--- a/src/Events/UpcomingEvents/UpcomingEvents.js
+++ b/src/Events/UpcomingEvents/UpcomingEvents.js
@@ -46,18 +46,16 @@ class UpcomingEventsComponent extends Component {
         return (
           <div>
             <p className="main-title">KALENDER</p>
-            <div className="signup-wrapper">
+            <div className="upcoming-wrapper">
               <div className="split left">
                 <UpcomingHalfEvents
                   events={this.getBusinessEvents(data)}
-                  className="half"
                   title={"Bedriftspresentasjon & Kurs"}
                 />
               </div>
               <div className="split right">
                 <UpcomingHalfEvents
                   events={this.getPartyEvents(data)}
-                  className="half"
                   title={"Sosialarrangement"}
                 />
               </div>
diff --git a/src/Events/UpcomingEvents/UpcomingSingleEvent.js b/src/Events/UpcomingEvents/UpcomingSingleEvent.js
index 10fd182..a385194 100644
--- a/src/Events/UpcomingEvents/UpcomingSingleEvent.js
+++ b/src/Events/UpcomingEvents/UpcomingSingleEvent.js
@@ -38,7 +38,7 @@ const SingleSignupEvent = ({ event }) => {
 
   return (
     <div
-      className={`upcoming-wrapper border-${getTitleLineColor(eventType)}`}
+      className={`single-event-wrapper border-${getTitleLineColor(eventType)}`}
       key={id}
     >
       <h1 className="event-title">{title}</h1>
diff --git a/src/Main.css b/src/Main.css
index d6ddebf..c83a393 100644
--- a/src/Main.css
+++ b/src/Main.css
@@ -44,7 +44,7 @@ div {
 }
 
 .wrapper {
-  margin: 80px 0;
+  margin: 40px;
 }
 
 .main-title {
diff --git a/src/Main.js b/src/Main.js
index 51b0a38..6df7a32 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -29,8 +29,6 @@ class MainComponent extends Component {
   }
 
   renderComponent() {
-    return <PromotedEvents />;
-
     const { data } = this.props;
     switch (data.currentComponent) {
       case "bus":
@@ -51,7 +49,8 @@ class MainComponent extends Component {
           {/* <React.Fragment>
           <Time displayTime />
         </React.Fragment> */}
-          {this.renderComponent()}
+          {<UpcomingEvents />}
+          {/*this.renderComponent()*/}
           {/* <Abakus /> */}
         </div>
       </div>

From f02768c5e136d9648088c2300ce3c619ed8f79bf Mon Sep 17 00:00:00 2001
From: mathith <mathith@stud.ntnu.no>
Date: Tue, 18 Feb 2020 12:57:06 +0100
Subject: [PATCH 3/4] Add finishing styling to bus

---
 src/Bus/BusListItem.js |  6 ++---
 src/Bus/bus.css        | 57 +++++++++++++++++++++++++-----------------
 src/Main.css           |  1 -
 src/Main.js            |  2 +-
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/Bus/BusListItem.js b/src/Bus/BusListItem.js
index 789b3e1..fce3ee0 100644
--- a/src/Bus/BusListItem.js
+++ b/src/Bus/BusListItem.js
@@ -14,9 +14,9 @@ class BusListItem extends Component {
     const { number, bus, time, index } = this.props;
     return (
       <div className={index === 0 ? "list-item" : " list-item border-top"}>
-        <div>
-          <span className="line">{number}</span>
-          <span className="destination">{bus}</span>
+        <div className="left-info">
+          <p className="line">{number}</p>
+          <p className="destination">{bus}</p>
         </div>
         <span className="time-to-departure">{time}</span>
       </div>
diff --git a/src/Bus/bus.css b/src/Bus/bus.css
index 7be3ab2..9e33e21 100644
--- a/src/Bus/bus.css
+++ b/src/Bus/bus.css
@@ -1,8 +1,9 @@
+/* Styling for Bus */
+
 .full-grid {
-  height: 75vh;
   display: grid;
-  margin: 0 5vw;
-  grid-gap: 5vw 5vw;
+  margin: 2.5vw;
+  grid-gap: 5vh 5vw;
   grid-template-columns: auto auto;
 }
 
@@ -13,10 +14,23 @@
 
 .bus-list {
   background-color: white;
-  border-radius: 10px;
+  border-radius: 14px;
   flex-grow: 3;
 }
 
+.stop-title {
+  color: white;
+  font-size: 50px;
+  margin: 0 0 5px 0;
+  flex-grow: 1;
+}
+
+.stop-title > span {
+  font-size: 35px;
+}
+
+/* Stylinig for BusListItem */
+
 .list-item {
   height: 8vh;
   color: black;
@@ -28,37 +42,34 @@
 }
 
 .border-top {
-  border-top: 3px solid black;
+  border-top: 2px solid #707070;
+}
+
+.left-info {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: left;
 }
 
 .line {
-  margin-left: 5px;
+  margin-right: 15px;
   font-style: bold;
-  width: 10%;
-  font-size: 59px;
+  font-size: 50px;
+  text-align: center;
+  min-width: 50px;
 }
 
 .destination {
-  margin-left: 15px;
-  font-size: 37px;
+  margin-left: 5px;
+  font-size: 30px;
   white-space: nowrap;
   overflow: hidden;
 }
 
 .time-to-departure {
   text-align: right;
-  font-size: 44px;
-  color: #ebd01c;
+  font-size: 40px;
+  color: #01579b;
   padding-left: 10px;
 }
-
-.stop-title {
-  color: white;
-  font-size: 55px;
-  margin: 0;
-  flex-grow: 1;
-}
-
-.stop-title > span {
-  font-size: 35px;
-}
diff --git a/src/Main.css b/src/Main.css
index c83a393..50402e9 100644
--- a/src/Main.css
+++ b/src/Main.css
@@ -50,7 +50,6 @@ div {
 .main-title {
   color: white;
   text-align: center;
-  height: 20vh;
   margin: 0;
   font-weight: bolder;
   font-size: 90px;
diff --git a/src/Main.js b/src/Main.js
index 6df7a32..12b1c46 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -49,7 +49,7 @@ class MainComponent extends Component {
           {/* <React.Fragment>
           <Time displayTime />
         </React.Fragment> */}
-          {<UpcomingEvents />}
+          {<Bus />}
           {/*this.renderComponent()*/}
           {/* <Abakus /> */}
         </div>

From 58d1c7aab0a9d64e4902e0df83ee285d800838c2 Mon Sep 17 00:00:00 2001
From: mathith <mathith@stud.ntnu.no>
Date: Tue, 18 Feb 2020 13:18:58 +0100
Subject: [PATCH 4/4] Finished styling

---
 src/Bus/bus.css                               | 4 ++--
 src/Events/PromotedEvents/PromotedEvents.scss | 5 +----
 src/Events/UpcomingEvents/UpcomingEvents.css  | 8 --------
 src/Main.css                                  | 3 ++-
 src/Main.js                                   | 3 +--
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/Bus/bus.css b/src/Bus/bus.css
index 9e33e21..84d8223 100644
--- a/src/Bus/bus.css
+++ b/src/Bus/bus.css
@@ -2,7 +2,7 @@
 
 .full-grid {
   display: grid;
-  margin: 2.5vw;
+  padding: 0 2.5vw;
   grid-gap: 5vh 5vw;
   grid-template-columns: auto auto;
 }
@@ -29,7 +29,7 @@
   font-size: 35px;
 }
 
-/* Stylinig for BusListItem */
+/* Styling for BusListItem */
 
 .list-item {
   height: 8vh;
diff --git a/src/Events/PromotedEvents/PromotedEvents.scss b/src/Events/PromotedEvents/PromotedEvents.scss
index b01b11a..de99b99 100644
--- a/src/Events/PromotedEvents/PromotedEvents.scss
+++ b/src/Events/PromotedEvents/PromotedEvents.scss
@@ -4,6 +4,7 @@
   flex-direction: row;
   flex: auto;
   height: 80%;
+  margin-top: 5vh;
 }
 
 #promoted-event-wrapper {
@@ -14,10 +15,6 @@
   z-index: 10;
 }
 
-.promoted-wrapper {
-  height: 100vh;
-}
-
 .title-header {
   height: 20%;
   width: 100%;
diff --git a/src/Events/UpcomingEvents/UpcomingEvents.css b/src/Events/UpcomingEvents/UpcomingEvents.css
index 63fb053..55a9985 100644
--- a/src/Events/UpcomingEvents/UpcomingEvents.css
+++ b/src/Events/UpcomingEvents/UpcomingEvents.css
@@ -12,14 +12,6 @@
   text-align: center;
 }
 
-.left {
-  left: 0;
-}
-
-.right {
-  right: 0;
-}
-
 /* Styling for UpcomingHalfEvents */
 
 .title {
diff --git a/src/Main.css b/src/Main.css
index 50402e9..44d976a 100644
--- a/src/Main.css
+++ b/src/Main.css
@@ -50,7 +50,8 @@ div {
 .main-title {
   color: white;
   text-align: center;
-  margin: 0;
   font-weight: bolder;
   font-size: 90px;
+  margin: 0;
+  height: 20vh;
 }
diff --git a/src/Main.js b/src/Main.js
index 12b1c46..d969bc0 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -49,8 +49,7 @@ class MainComponent extends Component {
           {/* <React.Fragment>
           <Time displayTime />
         </React.Fragment> */}
-          {<Bus />}
-          {/*this.renderComponent()*/}
+          {this.renderComponent()}
           {/* <Abakus /> */}
         </div>
       </div>