Added revisioning to assets and added print styles. Closes #23.

diff --git a/.gitignore b/.gitignore
index 694193b4d017f2b6b780bed47c06dc9fba064dc6..832184a61ed25782ea27e4bdab03651e48e378b5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,6 @@ Homestead.yaml
 /public/js
 /public/uploads
 /public/bower
 /public/js
 /public/uploads
 /public/bower

+/public/build

 /storage/images
 _ide_helper.php
\ No newline at end of file
 /storage/images
 _ide_helper.php
\ No newline at end of file

diff --git a/gulpfile.js b/gulpfile.js
index b7f680a831a73d9e7bd9252011d404bfbd1692eb..1bbfc9818aaa6b3ebe3ceb71c4570082821e0663 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,6 +6,8 @@ elixir.config.js.browserify.transformers.push({
 });
 
 elixir(function(mix) {
 });
 
 elixir(function(mix) {

-    mix.sass('styles.scss');
-    mix.browserify(['jquery-extensions.js', 'global.js'], 'public/js/common.js');
+    mix.sass('styles.scss')
+        .sass('print-styles.scss')
+        .browserify(['jquery-extensions.js', 'global.js'], 'public/js/common.js')
+        .version(['css/styles.css', 'css/print-styles.css', 'js/common.js']);

 });
 });

diff --git a/resources/assets/sass/print-styles.scss b/resources/assets/sass/print-styles.scss
new file mode 100644 (file)
index 0000000..c056000
--- /dev/null
+++ b/resources/assets/sass/print-styles.scss
@@ -0,0 +1,34 @@
+@import "variables";
+
+header {
+  display: none;
+}
+
+body {
+  font-size: 12px;
+}
+
+.faded-small {
+  display: none;
+}
+
+.page-content {
+  margin: 0 auto;
+}
+
+.print-hidden {
+  display: none;
+}
+
+.print-full-width {
+  width: 100%;
+  float: none;
+  display: block;
+}
+
+h2 {
+  font-size: 2em;
+  line-height: 1;
+  margin-top: 0.6em;
+  margin-bottom: 0.3em;
+}
\ No newline at end of file

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 3f76b04226eba9c8771b2f0692d9d5d4a08db7e1..6bbe434b46d745fcb7a3d59693c9075283fbe741 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -9,7 +9,8 @@
     <meta charset="utf-8">
 
     <!-- Styles and Fonts -->
     <meta charset="utf-8">
 
     <!-- Styles and Fonts -->

-    <link rel="stylesheet" href="/css/styles.css">
+    <link rel="stylesheet" href="{{ elixir('css/styles.css') }}">
+    <link rel="stylesheet" media="print" href="{{ elixir('css/print-styles.css') }}">

     <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css">
 
     <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css">
 


@@ -89,6 +90,6 @@
     </section>
 
 @yield('bottom')
     </section>
 
 @yield('bottom')

-<script src="/js/common.js"></script>
+<script src="{{ elixir('js/common.js') }}"></script>

 </body>
 </html>
 </body>
 </html>

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index e30cfef8210647f5b0bc0b42488944a1a6e211a4..937d52be14e1d859f9a708a154327e01f1f22b99 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -35,7 +35,7 @@
 
     <div class="container">
         <div class="row">
 
     <div class="container">
         <div class="row">

-            <div class="col-md-9">
+            <div class="col-md-9 print-full-width">

                 <div class="page-content anim fadeIn">
 
                     <div class="pointer-container" id="pointer">
                 <div class="page-content anim fadeIn">
 
                     <div class="pointer-container" id="pointer">


@@ -58,7 +58,7 @@
 
                 </div>
             </div>
 
                 </div>
             </div>

-            <div class="col-md-3">
+            <div class="col-md-3 print-hidden">

 
                 @include('pages/sidebar-tree-list', ['book' => $book])
 
 
                 @include('pages/sidebar-tree-list', ['book' => $book])