Commits

Zach Woodward committed a4b25f3

Modified the base html and css, as well as added an img folder

Comments (0)

Files changed (5)

groupGo/apps/organizations/templates/organizations/map.html

 
 {% block extra_js %}
 <script data-main="{{ STATIC_URL }}js/app/application.js" src="{{ STATIC_URL }}js/bower_components/requirejs/require.js"></script>
+<script src="{{ STATIC_URL }}js/bower_components/jquery/jquery.min.js"></script>
+
+<script type="text/javascript">  
+$(function(){
+   setTimeout(function() {
+      $("#splash").fadeOut("slow");
+   }, 2000);
+});
+</script>
 {% endblock %}
 
 {% block title %}
 
 {% block content %}
 {% endblock %}
+
+{% block more_content %}
+<div id="splash" class="section splash">
+	<div class="container splash">
+		<img src="{{ STATIC_URL }}img/g-logo.gif">
+	</div>
+</div>
+{% endblock %}

groupGo/staticfiles/css/groupgo.css

 	background-color: rgba(0,0,0,0.60);	
 }
 
+.section.splash {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	background-color: rgba(0,0,0,0.85);
+	z-index: 10;
+}
+
 .container.header {
 	max-width: 80%;
 	padding: 1rem 1rem 0.625rem 1rem;
 	padding: 1rem;
 }
 
+.container.splash {
+	margin: 22% 40%;
+}
+
+.logo {
+	max-height: 25px;
+}
+
 .nav_link:hover {
 	background-color: rgba(255, 255, 255, 0.25);
 	cursor: pointer;
 	color: inherit;
 }
 
+.nav_link.logo {
+	background-color: transparent;
+}
+
 .row {
 	overflow: auto;
 }

groupGo/staticfiles/img/cat-logo.jpg

Added
New image

groupGo/staticfiles/img/g-logo.gif

Added
New image

groupGo/templates/layouts/base.html

     <body>
         <div class="section header">
             <div class="container header">
-                <a href="/organizations" class="nav_link">Home</a>
-                <a href="/organizations/addOrg" class="nav_link">Add an Organization</a>
+                <a href="/organizations/addOrg" class="nav_link">Add an Org</a>
+                <a href="/organizations" class="nav_link logo"><img class="logo" src="{{ STATIC_URL }}img/g-logo.gif"></a>
                 <a href="/organizations/addCar" class="nav_link">Add a Car</a>
-                <a class="nav_link">Something</a>
             </div>
         </div>
         <div id="map-canvas" class="section map">