Merge branch 'master' into release

Added new asset structure
2026-02-05 08:39:55 +03:00 · 2015-12-16 17:29:34 +00:00 · 2015-12-16 17:27:53 +00:00 · 2015-12-16 17:21:21 +00:00 · 2015-12-01 21:30:21 +00:00 · 2015-12-01 21:15:08 +00:00
4 changed files with 10 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@ Homestead.yaml
 /public/dist
 .idea
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/uploads
 /public/bower
 /public/build
--- a/public/css/print-styles.css
+++ b/public/css/print-styles.css
@@ -0,0 +1 @@
+.faded-small,.print-hidden,header{display:none}body{font-size:12px}.page-content{margin:0 auto}.print-full-width{width:100%;float:none;display:block}h2{font-size:2em;line-height:1;margin-top:.6em;margin-bottom:.3em}
--- a/public/css/styles.css
+++ b/public/css/styles.css
--- a/public/js/common.js
+++ b/public/js/common.js
Author	SHA1	Message	Date
Dan Brown	a91d42634d	Merge branch 'master' into release	2015-12-16 17:29:34 +00:00
Dan Brown	f517ef3616	Added new asset structure	2015-12-16 17:27:53 +00:00
Dan Brown	e99507ddcf	Merge branch 'master' into release	2015-12-16 17:21:21 +00:00
Dan Brown	d2cacf1945	Release update	2015-12-01 21:30:21 +00:00
Dan Brown	448ac1405b	Merge branch 'master' into release	2015-12-01 21:15:08 +00:00
Dan Brown	6ad21ce885	Added built assets for release	2015-11-30 21:59:34 +00:00
				`@@ -0,0 +1 @@`
				`.faded-small,.print-hidden,header{display:none}body{font-size:12px}.page-content{margin:0 auto}.print-full-width{width:100%;float:none;display:block}h2{font-size:2em;line-height:1;margin-top:.6em;margin-bottom:.3em}`