Update master from 'dev'. Clean version for on premise-deployment.

Toxantron · Dec 6, 2018 · add1e64 · add1e64
2 parents 32ff20b + 054f79c
commit add1e64
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 1,313 deletions.
diff --git a/src/css/scrumonline.css b/src/css/scrumonline.css
@@ -127,7 +127,23 @@ div.card, div.card-flip {
 
 /* Card flip */
 div.card-overview {
-  perspective: 1000;
+  perspective: 1000px;
+  margin-right: -40px;
+}
+div.card-overview:first-child {
+  margin-left: 15px;
+}
+div.card-overview div.card-container {
+  float: left;  
+  width: 175px;
+}
+@media(min-width: 992px) {
+  div.card-overview {
+    margin-right: -60px;
+  }
+  div.card-overview div.card-container {
+    width: 210px;
+  }
 }
 div.card.front, div.card.back {
   -webkit-backface-visibility: hidden;

diff --git a/src/index.php b/src/index.php
@@ -7,13 +7,10 @@
 
 // Find all templates with their own navigation item
 $navItems = [];
-$indexPage;
 foreach($templates as $index=>$template)
 {
   if ($template->isNavigation)
     $navItems[$index] = $template;
-  if ($template->isIndex)
-    $indexPage = $template;
 }
 ?>
 <!doctype html>
@@ -75,23 +72,17 @@
 </nav>
 
 <!-- Add your site or application content here -->
-<div class="container-fluid main" ng-view>
-  <!-- Render index page in here for instand display -->
-  <?php $indexPage->render(false) ?>
-</div>
+<div class="container-fluid main" ng-view></div>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular-route.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular-cookies.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular-sanitize.min.js"></script>
-<script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.6/dist/showdown.min.js"></script>  
-<script src="/js/angular-google-analytics.js"></script>
+<script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.6/dist/showdown.min.js"></script>
 <script src="/js//bootstrap.min.js"></script>
 <script src="/js/J2M.js"></script>
 <script type="text/javascript">
-  var ga_id = '<?= $ga ?>';
-
   var cardSets = [
 <?php foreach($cardSets as $key=>$cardSet) { ?>
     { set: <?= $key ?>, cards: <?= json_encode($cardSet) ?>  },
@@ -107,7 +98,7 @@
 <?php
   foreach($templates as $template)
   {
-     $template->render(true);
+     $template->render();
   }
 ?>
 </body>