diff --git a/flashy.css b/flashy.css
index a5b6b32..2a8c0ca 100644
--- a/flashy.css
+++ b/flashy.css
@@ -4,7 +4,6 @@
#loginform {
max-width: 400px;
- margin: 30px auto;
}
#sidebar{
@@ -13,7 +12,6 @@
left:0px;
}
-
.container{
width: 500px;
-}
\ No newline at end of file
+}
diff --git a/scripts/DeckController.js b/scripts/DeckController.js
index 96d5395..312ddde 100644
--- a/scripts/DeckController.js
+++ b/scripts/DeckController.js
@@ -1,11 +1,7 @@
var app = angular.module("flashy.DeckController", ['ui.router']);
app.controller("DeckController", ['$scope', function ($scope) {
-
$scope.hello = function () {
alert("hello");
}
-
-
-
}]);
diff --git a/scripts/LoginController.js b/scripts/LoginController.js
index f9399d2..cb4de79 100644
--- a/scripts/LoginController.js
+++ b/scripts/LoginController.js
@@ -1,23 +1,25 @@
angular.module('flashy.LoginController', ['ui.router']).
- controller('LoginController', ['$scope', '$state', '$http',
- function($scope, $state, $http) {
- 'use strict';
- $scope.login = function(email, password) {
- $http.post('/api/login', JSON.stringify({
- 'email': email,
- 'password': password
- })).success(function(data) {
- $state.go('feed');
- console.log(data);
- });
- };
- $scope.register = function(email, password) {
- $http.post('/api/users/me', JSON.stringify({
- 'email': email,
- 'password': password
- })).success(function(data) {
- $state.go('feed');
- console.log(data);
- });
- };
- }]);
+
+controller('LoginController', ['$scope', '$state', '$http',
+ function($scope, $state, $http) {
+ 'use strict';
+ $scope.login = function(email, password) {
+ $http.post('/api/login', JSON.stringify({
+ 'email': email,
+ 'password': password
+ })).success(function(data) {
+ $state.go('feed');
+ console.log(data);
+ });
+ };
+ $scope.register = function(email, password) {
+ $http.post('/api/users/me', JSON.stringify({
+ 'email': email,
+ 'password': password
+ })).success(function(data) {
+ $state.go('feed');
+ console.log(data);
+ });
+ };
+ }
+]);
diff --git a/templates/deck.html b/templates/deck.html
index e4d83b8..16743d5 100644
--- a/templates/deck.html
+++ b/templates/deck.html
@@ -1,21 +1,21 @@
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+