110swag / flashy-frontend

Download as
Browse Code ยป

Commit 97093984be372d3d103b73ce1be0d91a5b9730ec

Authored by Tetranoir
1 parent 07920d05fe
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

doesnt need 'rows' anymore, its still there, do whatever with it

Showing 3 changed files with 12 additions and 3 deletions Side-by-side Diff

scripts/FeedController.js View file @ 9709398
... ... @@ -16,7 +16,6 @@
16 16 /* Handles number of columns */
17 17 function calculate_cols() {
18 18 var avail = $window.innerWidth - 17;
19   - if (avail > 992) avail -= 240;
20 19 return Math.floor(avail / 250);
21 20 }
22 21  
styles/flashy.css View file @ 9709398
... ... @@ -300,4 +300,8 @@
300 300 [ng-cloak] {
301 301 display: none !important;
302 302 }
  303 +
  304 +.cardColumn {
  305 + float: left;
  306 +}
templates/feed.html View file @ 9709398
... ... @@ -4,8 +4,14 @@
4 4 <div class="progress center-align" style="margin: 70px auto auto;width:50%;" ng-show="cardRows.length == 0">
5 5 <div class="indeterminate"></div>
6 6 </div>
7   - <div class='row' ng-repeat="row in cardRows">
  7 + <!--div class='row' ng-repeat="row in cardRows">
8 8 <div ng-repeat ="card in row">
  9 + <flashcard flashcard-obj="card" refresh="hide(card)"/>
  10 + </div>
  11 + </div>-->
  12 +
  13 + <div class="cardColumn" ng-repeat="col in cardCols">
  14 + <div ng-repeat="card in col">
9 15 <flashcard flashcard-obj="card" refresh="hide(card)"/>
10 16 </div>
11 17 </div>