Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Contributing Documentation #220

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Update Contributing Documentation #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0457fe
Format navbar. Contain inside container cer class. Add Waddle icon. A…
inje Oct 7, 2014
f04ab38
Merge pull request #217 from byeo630/dev
inje Oct 7, 2014
5d42a61
Merge branch 'dev' of https://github.com/valiantvu/waddle
valiantvu Oct 9, 2014
7018812
(doc) Update contributing guide for first time setup
valiantvu Oct 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 18 additions & 3 deletions client/app/modules/pages/partials/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion client/app/modules/pages/partials/navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
32 changes: 22 additions & 10 deletions client/styles/styles.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,12 @@ li{
background-color: #505050
}

.waddlelogo {
margin:5px;
width:25px;
height:auto;
}

#fsqsignin {
position: absolute;
border-radius: 3px;
Expand Down Expand Up @@ -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);
}
Expand All @@ -347,6 +354,8 @@ li{

.navigation li a:hover {
background-color: #ddd;
height: 100%;
text-decoration:none;
}

.navigation li a.selected {
Expand All @@ -355,20 +364,20 @@ 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;
}

.waddlefeed {
margin-top: 40px;
height: 40em;
margin-right: 10px;
height: 50em;
width: 275px;
float: right;
border-radius:5px;
Expand All @@ -392,9 +401,10 @@ li{

.waddlefeeditem {
padding: 5px;
height: 25%;
height: auto;
background-color: #fff;
margin: 5px;
border-radius: 5px;
overflow: hidden;
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down