Skip to content

Commit

Permalink
Merge pull request #14 from kelseyledford/styling
Browse files Browse the repository at this point in the history 
fixes fonts and styling on all pages; responsive design; starts markers
  • Loading branch information
@kelseyledford
kelseyledford committed Jun 25, 2014
2 parents 64594e1 + 34999cf commit e6991c4
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 42 deletions.
2 changes: 1 addition & 1 deletion css/bootstrap.min.css
View file

Large diffs are not rendered by default.

75 changes: 61 additions & 14 deletions css/style.css
View file
@@ -1,5 +1,24 @@
* {
font-family: 'Puritan', sans-serif;
}

.navbar-custom {
background-color: black;
font-family: 'Oswald', sans-serif;
}

.navbar-default .navbar-brand {
color: white;
}

#nav-logo {
font-family: 'Nova Round', cursive;
font-size: 2em;
}

.navlink {
font-size: 1.2em;
font-family: 'Oswald', sans-serif;
}

/* start.html styling */
Expand All @@ -15,18 +34,28 @@
background-position: center center;
margin-left: 0px;
margin-top: 25px;
/*height: 675px;*/
}

#row1-text {
margin-top: 6%;
}

#start-textbox1 {
width: 50%;
margin-left: 25%;
margin-top: 15%;
width: 70%;
margin-left: 15%;
text-align: center;
}

#start-textbox1 p {
font-size: 2.5em;
font-family: 'Oswald', sans-serif;
}

#logo {
text-align: center;
font-size: 100px;
font-family: 'Nova Round', cursive;
font-size: 10em;
margin-top: 6%;
}

#logo a {
Expand Down Expand Up @@ -55,6 +84,7 @@
.tutorial-box {
width: 30%;
display: inline-block;
background-color: rgba(255, 255, 255, 0.7);
}

#tutorial-3 {
Expand Down Expand Up @@ -129,17 +159,10 @@
position: absolute;
}

@media only screen
and (max-width : 768px) {
#signin-container {
width: 60%;
margin: 20% 20% 20% 20%;
}
}

#signin-header {
padding: 25px 0 25px 0;
font-size: 3.5em;
font-family: 'Oswald', sans-serif;
}

#signin-container p {
Expand All @@ -161,7 +184,7 @@ and (max-width : 768px) {
}

#signup-container {
margin-top: 7%;
margin-top: 10%;
margin-left: 65%;
width: 30%;
height: 65%;
Expand All @@ -174,8 +197,32 @@ and (max-width : 768px) {
#signup-header {
padding: 15px 0 15px 0;
font-size: 3.5em;
font-family: 'Oswald', sans-serif;
}

#signup-submit {
margin-top: 10px;
}

@media only screen
and (max-width : 200px) {
#logo {
font-size: 100px;
}
}

@media only screen
and (max-width : 768px) {
#signin-container {
width: 70%;
margin: 20% 15% 20% 15%;
}
#signup-container {
width: 60%;
margin: 20% 20% 20% 20%;
}
#logo {
margin-top: 15%;
font-size: 6em;
}
}
11 changes: 7 additions & 4 deletions index.html
View file
Expand Up @@ -3,6 +3,9 @@
<head>
<title>ReveaLA</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='http://fonts.googleapis.com/css?family=Nova+Round' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Oswald:300' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Puritan' rel='stylesheet' type='text/css'>
<script src="js/jquery-1.11.1.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.18/angular.min.js"></script>
<script src="js/script.js"></script>
Expand Down Expand Up @@ -30,13 +33,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" data-match-route="/start" href="#/start">ReveaLA</a>
<a class="navbar-brand" id="nav-logo" data-match-route="/start" href="#/start">reveaLA</a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-right" ng-hide="currentUserSignedIn">
<li data-match-route-"/map"><a href="#/map">Scavenge!</a></li>
<li data-match-route="/signup"><a href="#/signup">Sign up</a></li>
<li data-match-route="/signin"><a href="#/signin">Sign in</a></li>
<li data-match-route-"/map"><a class="navlink" href="#/map">Scavenge!</a></li>
<li data-match-route="/signup"><a class="navlink" href="#/signup">Sign up</a></li>
<li data-match-route="/signin"><a class="navlink" href="#/signin">Sign in</a></li>
</ul>
<ul class="nav navbar-nav" ng-show="currentUserSignedIn">
<li>Sign Out</li>
Expand Down
37 changes: 17 additions & 20 deletions js/script.js
View file
Expand Up @@ -43,18 +43,6 @@ LaApp.config(function($stateProvider, $urlRouterProvider, $httpProvider) {
templateUrl: "../reveaLA-angular/partials/signin.html",
controller: 'SignInCtrl'
})
.state("tutorial", {
url: "/tutorial",
templateUrl: "../reveaLA-angular/partials/tutorial.html"
})
.state("tourtype", {
url: "/tourtype",
templateUrl: "../reveaLA-angular/partials/tourtype.html"
})
.state("found", {
url: "/found",
templateUrl: "../reveaLA-angular/partials/found.html"
});
});

LaApp.controller('LaController', function ($scope) {
Expand All @@ -64,23 +52,32 @@ LaApp.controller('LaController', function ($scope) {
});

LaApp.factory('Spot', ['$resource', function($resource) {
return $resource('http://107.170.214.225/spots/',
{update: { method: 'GET'}});
return $resource('http://107.170.214.225/spots');
}]);

LaApp.controller('MapCtrl', function ($scope) {
LaApp.controller('MapCtrl', ['$scope', 'Spot', '$state', function ($scope, Spot, $state) {

$scope.spots = [];
$scope.spotMarkers = [];

Spot.query(function(spots) {
$scope.spots = spots;
for(var n=0; n < $scope.spots.length; n++) {
$scope.spotMarkers.push({latitude: $scope.spots[n].latitude, longitude: $scope.spots[n].longitude });
console.log($scope.spotMarkers[0].latitude, $scope.spotMarkers[0].longitude);
};
});

console.log($scope.spotMarkers);

$scope.map = {
control : {},
center: {
latitude: 45,
longitude: -73
},
zoom: 16,
markers: [{
latitude: 45,
longitude: -73
}]
markers: $scope.spotMarkers
};

if (navigator.geolocation) {
Expand Down Expand Up @@ -121,7 +118,7 @@ LaApp.controller('MapCtrl', function ($scope) {
}
}
},30000);
});
}]);

LaApp.controller('SignInCtrl', ['$scope', '$state', function($scope, $state) {
// MODIFY THIS FUNCTION FOR SIGN IN/SESSIONS
Expand Down
Empty file removed partials/found.html
View file
Empty file.
3 changes: 2 additions & 1 deletion partials/map.html
View file
@@ -1,3 +1,4 @@
<google-map center="map.center" zoom="map.zoom" draggable='true'>
<marker ng-repeat="m in map.markers" coords="m"></marker>
<marker ng-repeat="m in map.markers track by $index" coords="m"></marker>
<marker ng-repeat="marker in map.spotMarkers track by $index" latitude="marker.latitude" coords="marker.latitude, marker.longitude"></marker>
</google-map>
7 changes: 5 additions & 2 deletions partials/start.html
View file
@@ -1,9 +1,12 @@
<!-- <button type="button" class="btn btn-lg btn-danger" data-animation="am-fade-and-slide-top" data-template="partials/signin.html" bs-modal="modal">Sign In</button> -->
<div id="start-pg">
<div class="row" id="row1">
<div id="start-textbox1">
<div id="row1-text">
<div id="logo">
<a data-match-route="/map" href="#/map">ReveaLA</a>
<a data-match-route="/map" href="#/map">reveaLA</a>
</div>
<div id="start-textbox1">
<p>Hunt For LA's Best Hidden Spots</p>
</div>
</div>
</div>
Expand Down
Empty file removed partials/tourtype.html
View file
Empty file.
Empty file removed partials/tutorial.html
View file
Empty file.

0 comments on commit e6991c4

Please sign in to comment.