diff --git a/scripts/FeedController.js b/scripts/FeedController.js index 564ec5b..7a9aed7 100644 --- a/scripts/FeedController.js +++ b/scripts/FeedController.js @@ -32,6 +32,22 @@ angular.module('flashy.FeedController', ['ui.router']). success(function(data) { console.log(data); $scope.cards = data; + + $scope.noCards = function () { + + alert(data.length); + + if (data.length == 0) { + return true; + } else { + return false; + } + + } + + + + }). error(function(err) { console.log('pulling feed failed'); diff --git a/styles/flashy.css b/styles/flashy.css index 35207c1..002de17 100644 --- a/styles/flashy.css +++ b/styles/flashy.css @@ -203,9 +203,6 @@ body { background-color: #e8e8e8; overflow-x: hidden; font-family: 'Titillium Web', sans-serif; - display: flex; - min-height: 100vh; - flex-direction: column; } html { @@ -241,7 +238,6 @@ nav { } main{ min-height:145px; - flex: 1 0 auto; } .side-nav .collapsible-body { width: 100%; @@ -283,9 +279,3 @@ md-content.md-default-theme { /*#sidenav-overlay { background-color: rgba(0, 0, 0, 0) !important; }*/ - - -h3{ - text-align: center; - color: #654193; -} \ No newline at end of file diff --git a/templates/feed.html b/templates/feed.html index 91ddcd5..0c71a42 100644 --- a/templates/feed.html +++ b/templates/feed.html @@ -5,6 +5,7 @@ +