diff --git a/home.html b/home.html index 37531c3..b295d29 100644 --- a/home.html +++ b/home.html @@ -2,6 +2,7 @@ + @@ -13,65 +14,61 @@
- +
- - - +
diff --git a/sass/flashier.scss b/sass/flashier.scss index 02534cc..f018932 100644 --- a/sass/flashier.scss +++ b/sass/flashier.scss @@ -1,12 +1 @@ @import "materialize"; - -header, main, footer { - padding-left: 240px; -} - - -@media #{$medium-and-down} { - header, main, footer { - padding-left: 0; - } -} \ No newline at end of file diff --git a/scripts/FeedController.js b/scripts/FeedController.js index 3f7833d..57447cd 100644 --- a/scripts/FeedController.js +++ b/scripts/FeedController.js @@ -1,6 +1,6 @@ angular.module('flashy.FeedController', ['ui.router']). - controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function ($scope, $stateParams, $state, $http) { + controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function($scope, $stateParams, $state, $http) { diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js index 476e694..592d55f 100644 --- a/scripts/FlashcardDirective.js +++ b/scripts/FlashcardDirective.js @@ -13,7 +13,6 @@ angular.module('flashy.FlashcardDirective', []). /* Handles width of the card */ function refresh_width() { avail = $window.innerWidth - 17; - if (avail > 992) avail -= 240; width = Math.floor(avail / Math.floor(avail / 250) - 12); element.children().css({ width: width + 'px', diff --git a/scripts/LoginController.js b/scripts/LoginController.js index 9339306..f0a2404 100644 --- a/scripts/LoginController.js +++ b/scripts/LoginController.js @@ -32,10 +32,11 @@ angular.module('flashy.LoginController', ['ui.router']). 'password': password })). success(function(data) { + console.log(data); if (angular.isDefined($scope.returnToState)) $state.go($scope.returnToState.name, $scope.returnToStateParams); else $state.go('addclass'); - console.log(data); + }). error(function(data, status, headers, config) { console.log(data.email); diff --git a/styles/flashier.css b/styles/flashier.css index 58ad6b8..8aae859 100644 --- a/styles/flashier.css +++ b/styles/flashier.css @@ -7985,11 +7985,3 @@ button.picker__today:focus, button.picker__clear:focus, button.picker__close:foc .picker--time .picker__box { margin-bottom: 5em; } } - -header, main, footer { - padding-left: 240px; } - -@media only screen and (max-width : 992px) { - header, main, footer { - padding-left: 0; } - } diff --git a/styles/flashy.css b/styles/flashy.css index 30f5b30..a5ddc76 100644 --- a/styles/flashy.css +++ b/styles/flashy.css @@ -37,25 +37,10 @@ background-color: #aaaaff; } -.container .row { - margin-left: 0; - margin-right: 0; -} - -/*ul.side-nav.fixed li { - font-size: 24px; -} - -ul.side-nav.fixed li a.class { - height: 28px; - font-size: 20px; - line-height: normal; - font-weight: 600; -} - -ul.side-nav.fixed li a { - font-size: 24px; -}*/ +/*.container .row {*/ + /*margin-left: 0;*/ + /*margin-right: 0;*/ +/*}*/ /* Flashcard directive css */ .card { diff --git a/templates/addclass.html b/templates/addclass.html index b38c73a..074551e 100644 --- a/templates/addclass.html +++ b/templates/addclass.html @@ -1,38 +1,41 @@ -
-
- +
+
+
+

Add Class

+ -
-
- - -
-
{{item.short_name}}: {{item.course_title}} - ({{item.instructor}}) + +
+ + +
+
{{item.short_name}}: {{item.course_title}} + ({{item.instructor}}) +
+
+ {{item.lecture_times}} +
-
- {{item.lecture_times}} -
-
- - - No classes match "{{searchText}}". - - - -
+ + + No classes match "{{searchText}}". + + + +
- - + + +
-
+
\ No newline at end of file diff --git a/templates/login.html b/templates/login.html index b6ff6bc..ce710ee 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,11 +1,5 @@ -
- -
-
-
- -
-
+
+
  • Sign Up
  • Login
    • @@ -43,7 +37,7 @@ Invalid username or password!!
- +
@@ -52,8 +46,8 @@
-