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 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 @@
\ 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 c0ade72..7e8b941 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": "Another action
", "href": "#anotherAction"}, + {"text": "Friends
", "ui-sref": "map.friends"}, {"text": ' Display an alert', click: '$alert("Holy guacamole!")'}, {"text": ' 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;