Commit dbf77a0124e90aff5bc873444bfa3dcc6f517276
1 parent
0bf5d19119
Exists in
master
and in
1 other branch
back to original
Showing 4 changed files with 17 additions and 12 deletions Side-by-side Diff
scripts/FeedController.js
View file @
dbf77a0
... | ... | @@ -32,6 +32,22 @@ |
32 | 32 | success(function(data) { |
33 | 33 | console.log(data); |
34 | 34 | $scope.cards = data; |
35 | + | |
36 | + $scope.noCards = function () { | |
37 | + | |
38 | + alert(data.length); | |
39 | + | |
40 | + if (data.length == 0) { | |
41 | + return true; | |
42 | + } else { | |
43 | + return false; | |
44 | + } | |
45 | + | |
46 | + } | |
47 | + | |
48 | + | |
49 | + | |
50 | + | |
35 | 51 | }). |
36 | 52 | error(function(err) { |
37 | 53 | console.log('pulling feed failed'); |
styles/flashy.css
View file @
dbf77a0
... | ... | @@ -203,9 +203,6 @@ |
203 | 203 | background-color: #e8e8e8; |
204 | 204 | overflow-x: hidden; |
205 | 205 | font-family: 'Titillium Web', sans-serif; |
206 | - display: flex; | |
207 | - min-height: 100vh; | |
208 | - flex-direction: column; | |
209 | 206 | } |
210 | 207 | |
211 | 208 | html { |
... | ... | @@ -241,7 +238,6 @@ |
241 | 238 | } |
242 | 239 | main{ |
243 | 240 | min-height:145px; |
244 | - flex: 1 0 auto; | |
245 | 241 | } |
246 | 242 | .side-nav .collapsible-body { |
247 | 243 | width: 100%; |
... | ... | @@ -283,10 +279,4 @@ |
283 | 279 | /*#sidenav-overlay { |
284 | 280 | background-color: rgba(0, 0, 0, 0) !important; |
285 | 281 | }*/ |
286 | - | |
287 | - | |
288 | -h3{ | |
289 | - text-align: center; | |
290 | - color: #654193; | |
291 | -} |
templates/feed.html
View file @
dbf77a0