diff --git a/.gitignore b/.gitignore index 694193b4d..832184a61 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ Homestead.yaml /public/js /public/uploads /public/bower +/public/build /storage/images _ide_helper.php \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index b7f680a83..1bbfc9818 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,6 +6,8 @@ elixir.config.js.browserify.transformers.push({ }); 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 index 000000000..c05600073 --- /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 3f76b0422..6bbe434b4 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -9,7 +9,8 @@ - + + @@ -89,6 +90,6 @@ @yield('bottom') - + diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index e30cfef82..937d52be1 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -35,7 +35,7 @@
-
+