Fix asset order

weierophinney · weierophinney · commit 9984f8d0ae9f · 2016-08-15T11:50:25.000-05:00
I incorrectly reverted the changes in #343, and didn't correct the order to what was used previously. This patch fixes that. - CSS order (when emitted): - bootstrap.min.css - bootstrap-theme.min.css - style.css - JS order (when emitted): - jquery-2.2.4.min.js - bootstrap.min.js
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -12,15 +12,15 @@
 
         <!-- Le styles -->
         <?= $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'])
-            ->prependStylesheet($this->basePath('css/bootstrap.min.css'))
-            ->prependStylesheet($this->basePath('css/bootstrap-theme.min.css'))
             ->prependStylesheet($this->basePath('css/style.css'))
+            ->prependStylesheet($this->basePath('css/bootstrap-theme.min.css'))
+            ->prependStylesheet($this->basePath('css/bootstrap.min.css'))
         ?>
 
         <!-- Scripts -->
         <?= $this->headScript()
-            ->prependFile($this->basePath('js/jquery-2.2.4.min.js'))
             ->prependFile($this->basePath('js/bootstrap.min.js'))
+            ->prependFile($this->basePath('js/jquery-2.2.4.min.js'))
         ?>
     </head>
     <body>
