diff --git a/flashy.css b/flashy.css index 0a1b0e1..01c2282 100644 --- a/flashy.css +++ b/flashy.css @@ -69,8 +69,8 @@ ul.side-nav.fixed li a { float: left; height: calc(3*5vw); margin: 6px; - max-height: calc(3*70px); - max-width: calc(5*70px); + max-height: calc(3*60px); + max-width: calc(5*60px); min-height: calc(3*50px); min-width: calc(5*50px); min-height: calc(3*50px); @@ -82,8 +82,8 @@ ul.side-nav.fixed li a { /* display: none; */ height: calc(3*5vw); left: 0; - max-height: calc(3*70px); - max-width: calc(5*70px); + max-height: calc(3*60px); + max-width: calc(5*60px); min-height: calc(3*50px); min-width: calc(5*50px); opacity: 0; @@ -159,7 +159,6 @@ ul.side-nav.fixed li a { } .container { - margin-left: 250px; /*position: relative; width: 600px; height: 80px;*/ diff --git a/scripts/FeedController.js b/scripts/FeedController.js index 7290a06..6093e2b 100644 --- a/scripts/FeedController.js +++ b/scripts/FeedController.js @@ -5,9 +5,9 @@ angular.module('flashy.FeedController', ['ui.router']). sectionId = $stateParams.sectionId; $scope.cards = []; - $scope.cards[0] = {'id': 1, 'title': 'title1', 'content': 'abc'}; - $scope.cards[1] = {'id': 2, 'title': 'title2', 'content': 'xyz'}; - $scope.cards[2] = {'id': 2, 'title': 'title3', 'content': 'qwe'}; + $scope.cards[0] = {'id': 1, 'title': 'title1', 'content': 'abchello'}; + $scope.cards[1] = {'id': 2, 'title': 'title2', 'content': 'xyz2 2 2 2 2'}; + $scope.cards[2] = {'id': 2, 'title': 'title3', 'content': 'qwe 3 3 3'}; $http.get('/api/sections/' + sectionId + '/flashcards/'). success(function(data) { diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js index e0642d2..8118a47 100644 --- a/scripts/FlashcardDirective.js +++ b/scripts/FlashcardDirective.js @@ -5,7 +5,7 @@ directive('flashcard', function() { templateUrl: '/app/templates/flashcard.html', restrict: 'E', scope: { - content: '=flashcardContent' // two way binding + content: '=flashcardContent' //flashcard-content in outer scope }, link: function(scope) { console.log("HELLO FROM FLASHCARD DIRECTIVE"); diff --git a/templates/feed.css b/templates/feed.css deleted file mode 100644 index e69de29..0000000 diff --git a/templates/feed.html b/templates/feed.html index 93f43f6..5ed4e9f 100644 --- a/templates/feed.html +++ b/templates/feed.html @@ -7,13 +7,7 @@
-
-
-
- {{card.content}} -
-
-
+