From f0457fe9159cc8184619a42b56bef6a496bf9d76 Mon Sep 17 00:00:00 2001
From: byeo630 <byeo630@gmail.com>
Date: Tue, 7 Oct 2014 14:57:18 -0400
Subject: [PATCH 1/2] Format navbar. Contain inside container cer class. Add
 Waddle icon. Add search bar. Style feed items.

---
 client/app/modules/pages/partials/navbar.html | 21 ++++++++++--
 client/app/modules/pages/partials/navbar.js   |  2 +-
 client/styles/styles.styl                     | 32 +++++++++++++------
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/client/app/modules/pages/partials/navbar.html b/client/app/modules/pages/partials/navbar.html
index 1783e2c..52e1a99 100644
--- a/client/app/modules/pages/partials/navbar.html
+++ b/client/app/modules/pages/partials/navbar.html
@@ -1,15 +1,30 @@
 <div class='navigation'>
+<div class="container">
 	<ul>
 		<div class="navbarprofile">
+		<li ui-sref='map'><a>
 		 <img ng-src="{{photo}}"/>
-		 <button type="button" class="btn btn-sm btn-primary" bs-dropdown="dropdown" data-html="true" data-template="../app/modules/pages/partials/dropdown.tpl.html">Menu</button>
-		 <h6>{{name}}</h6>
+		 <h6>{{name}}</h6></a></li>
+ 		 <button type="button" class="btn btn-sm btn-primary" bs-dropdown="dropdown" data-html="true" data-template="../app/modules/pages/partials/dropdown.tpl.html">Menu</button>
+
 		</div>
-		<li ui-sref='map.providers' class='create'><a>add platforms</a></li>
+		<li><img class="waddlelogo" src="https://s3-us-west-2.amazonaws.com/waddle/WaddlePenguinLogoGrey_1.png"></li>
+		<li ui-sref='map.providers' class='create'><a>add social</a></li>
     <li ui-sref='map.friends'><a>friends</a></li>
 <!--     <li ui-sref='map.footprints'><a>my footprints</a></li> -->
     <li ng-click='loadBucketlist()'><a>hype list</a></li>
     <li ui-sref='map'><a>footprints</a></li>
 		<li ng-click='logout()'><a>sign out</a></li>
 	</ul>
+	<div class="row">
+  <div class="col-lg-3">
+    <div class="input-group">
+      <input type="text" class="form-control">
+      <span class="input-group-btn">
+        <button class="btn btn-default" type="button">Search</button>
+      </span>
+    </div><!-- /input-group -->
+  </div><!-- /.col-lg-6 -->
+</div><!-- /.row -->
 </div>
+</div>
\ No newline at end of file
diff --git a/client/app/modules/pages/partials/navbar.js b/client/app/modules/pages/partials/navbar.js
index 4f0bcdd..2751885 100644
--- a/client/app/modules/pages/partials/navbar.js
+++ b/client/app/modules/pages/partials/navbar.js
@@ -24,7 +24,7 @@ var NavbarController = function (Auth, $rootScope, $scope, UserRequests, MapFact
   // var myDropdown = $dropdown(element, {title: 'blah', content: 'bsadsda'});
 
   $scope.dropdown = [
-    {"text": "<p class= 'fa fa-download'>Another action</p>", "href": "#anotherAction"},
+    {"text": "<p class= 'fa fa-download'>Friends</p>", "ui-sref": "map.friends"},
     {"text": '<p class="fa fa-globe"></p>&nbsp;Display an alert', click: '$alert("Holy guacamole!")'},
     {"text": '<p class="fa fa-external-link"></p>&nbsp;External link', href: '/auth/facebook', target: '_self'},
     {divider: true},
diff --git a/client/styles/styles.styl b/client/styles/styles.styl
index 0112471..47f9fae 100644
--- a/client/styles/styles.styl
+++ b/client/styles/styles.styl
@@ -266,6 +266,12 @@ li{
   background-color: #505050
 }
 
+.waddlelogo {
+  margin:5px;
+  width:25px;
+  height:auto;
+}
+
 #fsqsignin {
   position: absolute;
   border-radius: 3px;
@@ -321,7 +327,8 @@ li{
   position: absolute;
   display: block;
   width: 100%;
-  height: 30px;
+  height: auto;
+  padding:5px
   top: 0;
   background-color:rgba(255, 255, 255, 0.9);
 }
@@ -347,6 +354,8 @@ li{
 
 .navigation li a:hover {
   background-color: #ddd;
+  height: 100%;
+  text-decoration:none;
 }
 
 .navigation li a.selected {
@@ -355,12 +364,11 @@ li{
 
 .navbarprofile {
   float: right;
-  margin-right: 20px;
+  margin-right: 10px;
 }
 
 .navbarprofile img {
-  border-radius: 3px;
-  margin-top: 3px;
+  border-radius: 5px;
   overflow: hidden;
   max-width: 25px;
   height: 25px; 
@@ -368,7 +376,8 @@ li{
 
 .waddlefeed {
    margin-top: 40px;
-   height: 40em;
+   margin-right: 10px;
+   height: 50em;
    width: 275px;
    float: right;
    border-radius:5px;
@@ -392,9 +401,10 @@ li{
 
 .waddlefeeditem {
   padding: 5px;
-  height: 25%;
+  height: auto;
   background-color: #fff;
   margin: 5px;
+  border-radius: 5px;
   overflow: hidden;
 }
 
@@ -409,12 +419,14 @@ li{
 
 .feedphoto {
   position: relative;
-  max-width: 100px;
-  max-height: 100px;
+  width: 100%;
+  height: auto;
   overflow:hidden;
-  left: 70px;
+  text-align:center;
   cursor: pointer;
   background-position: center;
+  border-radius: 5px;
+  padding: 5px;
 }
 
 .footprintbrick {
@@ -540,7 +552,7 @@ li{
 
 .comment_form input {
   position: relative;
-  height:12px; 
+  height:24px; 
   width:245px; 
   padding:5px;
   box-shadow: 0px 0px 3px #ccc, 0 10px 15px #eee inset;

From 7018812cbe0759830cdba53c7214e672a1e93d19 Mon Sep 17 00:00:00 2001
From: valiantvu <michelle.thi.vu@gmail.com>
Date: Thu, 9 Oct 2014 10:08:30 -0700
Subject: [PATCH 2/2] (doc) Update contributing guide for first time setup

---
 CONTRIBUTING.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c3d152f..d27dc6a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,17 @@
 # Contributing
 
-## General Workflow (tl;dr version)
+## Setup
+1. Fork the repo & clone
+2. Install neo4j
+3. Run npm install (this will also run the grunt file)
+4. Contact administrator to add you to the Heroku account
+5. Add heroku repo as a remote
+6. Run heroku config
+7. Save environment variables in bash profile
+8. Contact administrator to add you to the Facebook account
+9. Accept request to become a developer on the Facebook app
+
+## General Git Workflow (tl;dr version)
 
 1. Fork the repo
 1. Cut a namespaced feature branch from dev