Merge pull request #977 from unl/critical-path-opt

Remove some more network requests
unl · Mar 30, 2016 · 72bcf10 · 72bcf10
2 parents fcc37c9 + ffde9ef
commit 72bcf10
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -2,7 +2,6 @@ module.exports = function (grunt) {
 	// CSS files to be built (relative to less directory, no extension)
 	var cssObjs = [
 		'all',
-		'print',
 		'modules/pagination',
 		'modules/infographics'
 	];
@@ -192,6 +191,7 @@ module.exports = function (grunt) {
 		less: {
 			all: {
 				options: {
+					ieCompat: false,
 					paths: [hereDir + templateLess],
 					plugins: [
 						autoprefixPlugin,

diff --git a/wdn/templates_4.1/includes/scriptsandstyles.html b/wdn/templates_4.1/includes/scriptsandstyles.html
@@ -1,4 +1,3 @@
 <link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" />
 <link rel="stylesheet" href="https://unlcms.unl.edu/wdn/templates_4.1/css/all.css?dep=$DEP_VERSION$" />
-<link rel="stylesheet" media="print" href="https://unlcms.unl.edu/wdn/templates_4.1/css/print.css?dep=$DEP_VERSION$" />
 <script src="https://unlcms.unl.edu/wdn/templates_4.1/scripts/compressed/all.js?dep=$DEP_VERSION$" id="wdn_dependents"></script>
diff --git a/wdn/templates_4.1/includes/scriptsandstyles_debug.html b/wdn/templates_4.1/includes/scriptsandstyles_debug.html
@@ -1,4 +1,3 @@
 <link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" />
 <link rel="stylesheet" href="/wdn/templates_4.1/css/all.css?dep=$DEP_VERSION$" />
-<link rel="stylesheet" media="print" href="/wdn/templates_4.1/css/print.css?dep=$DEP_VERSION$" />
 <script src="/wdn/templates_4.1/scripts/debug.js?dep=$DEP_VERSION$" id="wdn_dependents"></script>
diff --git a/wdn/templates_4.1/includes/scriptsandstyles_local.html b/wdn/templates_4.1/includes/scriptsandstyles_local.html
@@ -1,4 +1,3 @@
 <link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" />
 <link rel="stylesheet" href="/wdn/templates_4.1/css/all.css?dep=$DEP_VERSION$" />
-<link rel="stylesheet" media="print" href="/wdn/templates_4.1/css/print.css?dep=$DEP_VERSION$" />
 <script src="/wdn/templates_4.1/scripts/compressed/all.js?dep=$DEP_VERSION$" id="wdn_dependents"></script>
diff --git a/wdn/templates_4.1/less/all.less b/wdn/templates_4.1/less/all.less
@@ -26,13 +26,13 @@
 @import "layouts/tables.less";
 @import "layouts/forms.less";
 @import "layouts/columns.less";
-    
-    // maincontent area
-    @import "layouts/old-grid.less";
-    @import "layouts/grid.less";
-    @import "layouts/tabs.less";
-    @import "layouts/twitter.less";
-    @import "layouts/infographic.less";
+
+// maincontent area
+@import "layouts/old-grid.less";
+@import "layouts/grid.less";
+@import "layouts/tabs.less";
+@import "layouts/twitter.less";
+@import "layouts/infographic.less";
 
 
 // Modularize
@@ -55,5 +55,8 @@
 @import "states/search.less";
 @import "states/share.less";
 
-    // maincontent area
-    @import "states/images.less";
+// maincontent area
+@import "states/images.less";
+
+// print styles
+@import "print.less";
diff --git a/wdn/templates_4.1/less/print.less b/wdn/templates_4.1/less/print.less
@@ -1,11 +1,11 @@
-@charset "UTF-8";
-
 @import "_mixins/all.less";
 
 @page {
     margin: 7.5%;
 }
 
+@media print {
+
 .hide() {
     display: none !important;
 }
@@ -97,3 +97,5 @@ a#logo,
 #wdn_site_affiliation {
     padding-top: 0.9em;
 }
+
+}