Merge pull request #107 from CaravanTransit/implement-homepage

Implement New Homepage Design
TransitTalk · Oct 10, 2018 · 2929bf0 · 2929bf0
2 parents f84d17b + dda8613
commit 2929bf0
Show file tree

Hide file tree

Showing 19 changed files with 467 additions and 54 deletions.
diff --git a/app/assets/images/.keep b/app/assets/images/.keep
diff --git a/app/assets/images/bus_white.svg b/app/assets/images/bus_white.svg
diff --git a/app/assets/images/caravan_logo.svg b/app/assets/images/caravan_logo.svg
diff --git a/app/assets/images/caravan_logo_bordered.svg b/app/assets/images/caravan_logo_bordered.svg
diff --git a/app/assets/images/cta-overhead-blur-mobile.jpg b/app/assets/images/cta-overhead-blur-mobile.jpg
diff --git a/app/assets/images/cta-overhead-blur.jpg b/app/assets/images/cta-overhead-blur.jpg
diff --git a/app/assets/images/cta-overhead.jpg b/app/assets/images/cta-overhead.jpg
diff --git a/app/assets/images/train_white.svg b/app/assets/images/train_white.svg
diff --git a/app/assets/javascripts/location.js b/app/assets/javascripts/location.js
@@ -1,4 +1,5 @@
-if (!window.location.href.includes("?") && window.location.pathname == "/") {
+// Run geolocation if on the view issues page
+if (!window.location.href.includes("?") && window.location.pathname.includes("/view_issues")) {
     geol();
 }
 

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -14,7 +14,7 @@
  *= require_self
  */
 
-@import "variables";
+@import 'variables';
 
 body {
 	font-family: 'Open Sans', sans-serif;

diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss
@@ -0,0 +1,47 @@
+.star { vertical-align: bottom; }
+
+.stops-container {
+  background-color: rgb(236,236,236);
+  left:0px;
+  right:0px;
+  padding:3px 4px 4px 4px;
+  margin-bottom:5px;
+  position:relative;
+  border-bottom-width:1px;
+  border-bottom-color:white;
+  box-shadow: 1px 1px 1px silver;
+}
+
+.ul-dash {
+    margin:0px;
+    margin-top:1px;
+    margin-bottom:1px;
+}
+
+.issue-container {
+  background-color: rgb(247,247,247);
+  width:100%;
+  float:center;
+  margin-top:0px;
+  margin-bottom:2px;
+  padding:0px;
+  position: relative;
+  display: inline-grid;
+}
+
+#stops_near, #stops_fav {
+    width:100%;
+    left:0px;
+    right:0px;
+    padding:0;
+    position:relative;
+}
+
+.issue-title {
+    font-size:18px;
+}
+
+.issue-time {
+    color:#999;
+    font-size:14px;
+}
diff --git a/app/assets/stylesheets/headers.scss b/app/assets/stylesheets/headers.scss
@@ -1,16 +1,16 @@
-@import "variables";
+@import 'variables';
 
 .headbar {
-	height: 50px;
+	height: $header-height;
 	width: 100%;
 	background-color: $theme-color;
 	text-align: center;
 }
 
 .hamburger {
 	float: left;
-	height: 50px;
-	width: 50px;
+	height: $header-height;
+	width: $header-height;
 	background-image: url(asset-path('menu.svg'));
 	background-size: 100%;
 }
@@ -28,8 +28,8 @@
 .search {
 	float: right;
 	background-image: url(asset-path('search-white.svg'));
-	height: 50px;
-	width: 50px;
+	height: $header-height;
+	width: $header-height;
 	background-size: 80%;
 	background-position: center;
 	background-repeat: no-repeat;
@@ -47,7 +47,7 @@
 /* HEADERS WITH TRANSPORTATION NAMES ("ROOSEVELT", "CERMAK-McCORMICK") */
 .locationList {
 
-	
+
 }
 
 .side-menu-overlay {
@@ -109,7 +109,7 @@
 			margin: auto;
 			font-size: 20px;
 		}
-	
+
 		input[type="submit"] {
 			box-shadow: none;
 			background: url(asset-path("search.svg"));