adds Assemble to build templates, removes grunt-includes

diff --git a/Gruntfile.js b/Gruntfile.js
index 6a993bcad84689ed3050286e487d1151949f94fb..bd08558d52c4c68ef1ddf48d7fa0ccfbbb46ce52 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,33 +1,22 @@
 module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    includes: {
+    assemble: {
+      options: {partials: 'css/*.css'},
       templates: {
         src: 'templates/**/*.html',
         dest: 'build/downloads',
-        cwd: '.',
-        options: {
-          includeRegexp: /^\s*\/\*\s*[Ii]nclude\s+([^'"\s]+)\s*\*\/$/,
-          includePath: 'css',
-        }
+        cwd: './'
       },
       docsDev: {
         src: 'docs/examples/*.html',
         dest: 'build/docs',
-        cwd: '.',
-        options: {
-          includeRegexp: /^\s*\/\*\s*[Ii]nclude\s+([^'"\s]+)\s*\*\/$/,
-          includePath: 'css',
-        }
+        cwd: './'
       },
       docsDeploy: {
         src: 'docs/examples/*.html',
         dest: 'build',
-        cwd: '.',
-        options: {
-          includeRegexp: /^\s*\/\*\s*[Ii]nclude\s+([^'"\s]+)\s*\*\/$/,
-          includePath: 'css',
-        }
+        cwd: './'
       }
     },
     shell: {
@@ -41,7 +30,7 @@ module.exports = function(grunt) {
           'mkdir build/docs',
         ].join('&&')
       },
-      zipTemplates: { 
+      zipTemplates: {
         command: [
           'cd build/downloads/templates/base',
           'cp * ../',
@@ -109,7 +98,7 @@ module.exports = function(grunt) {
     },
   });
 
-  grunt.loadNpmTasks('grunt-includes');
+  grunt.loadNpmTasks('assemble');
   grunt.loadNpmTasks('grunt-shell');
   grunt.loadNpmTasks('grunt-contrib-watch');
 
@@ -117,5 +106,5 @@ module.exports = function(grunt) {
   grunt.registerTask('deploy:downloads', ['shell:makeStage', 'includes:templates', 'shell:zipTemplates', 'shell:zipFramework', 'shell:linkFramework', 'shell:deployDownloads', 'shell:cleanUp']);
   grunt.registerTask('make:docs', ['shell:makeStage', 'includes:docsDev', 'shell:testDocs']);
   grunt.registerTask('deploy:docs', ['shell:makeStage', 'includes:docsDeploy', 'shell:deployDocs', 'shell:cleanUp']);
-  // grunt.registerTask('default', ['shell:makeStage', 'includes:docs', 'shell:deployDocs']);
+  grunt.registerTask('default', ['shell:makeStage', 'includes', 'shell:deployDocs']);
 };
\ No newline at end of file

diff --git a/docs/examples/basic-block-grid.html b/docs/examples/basic-block-grid.html
index c9a4eab0db1d74e9471e4f0fb843470e3719d6c7..042648fb947cbd7c59ff9c1f9384a081fc51a280 100644 (file)
--- a/docs/examples/basic-block-grid.html
+++ b/docs/examples/basic-block-grid.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 

diff --git a/docs/examples/basic-grid.html b/docs/examples/basic-grid.html
index a6c2edeee2c8a269fd18297dcc206e24a5d26f0a..550ebf1b889a3577ea0a1e420b5eb9154e6d7b52 100644 (file)
--- a/docs/examples/basic-grid.html
+++ b/docs/examples/basic-grid.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -69,7 +70,7 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-                      
+
                     </td>
                   </tr>
                   <tr>

diff --git a/docs/examples/basic-sub-grid.html b/docs/examples/basic-sub-grid.html
index 0dd068a41424286b65dad0511609b1ba0b907f6c..17eac5cb6272948d2c0224dbe68d49fdb4e1c112 100644 (file)
--- a/docs/examples/basic-sub-grid.html
+++ b/docs/examples/basic-sub-grid.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 

diff --git a/docs/examples/buttons.html b/docs/examples/buttons.html
index 83c3dbb1caee4c807e8a80fd1a91ca91db729079..57b61a76292e0adc278e04e77c9473f0d0d9c5a8 100644 (file)
--- a/docs/examples/buttons.html
+++ b/docs/examples/buttons.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 

diff --git a/docs/examples/center-class.html b/docs/examples/center-class.html
index cc47499ac0e7d0c8cd9af94835754cc9b841e142..db616c4b026f64a7e931625127a90742cd896a2a 100644 (file)
--- a/docs/examples/center-class.html
+++ b/docs/examples/center-class.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -35,7 +36,7 @@
           <table class="container">
             <tr>
               <td>
-                
+
                 <table class="row">
                   <tr>
                     <td class="wrapper">
@@ -45,7 +46,7 @@
                           <td class="center panel">
                             <center>
 
-                              Centered content 
+                              Centered content
 
                             </center>
                           </td>
@@ -79,7 +80,7 @@
           </table>
 
           <!-- END EXAMPLE CODE -->
-        
+
         </center>
       </td>
     </tr>

diff --git a/docs/examples/even-columns.html b/docs/examples/even-columns.html
index 3bf1363d025f636da060ae9c3aa911e0651db5ea..b82f50246329473a19c23ed5dc0f458599ddf6fd 100644 (file)
--- a/docs/examples/even-columns.html
+++ b/docs/examples/even-columns.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -44,7 +45,7 @@
                           <td class="panel">
 
                             twelve.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -63,7 +64,7 @@
                           <td class="panel">
 
                             .six.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -96,7 +97,7 @@
                           <td class="panel">
 
                             .four.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -110,7 +111,7 @@
                           <td class="panel">
 
                             .four.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -143,7 +144,7 @@
                           <td class="panel">
 
                             .three.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -157,7 +158,7 @@
                           <td class="panel">
 
                             .three.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -171,7 +172,7 @@
                           <td class="panel">
 
                             .three.columns
-                          
+
                           </td>
                           <td class="expander"></td>
                         </tr>

diff --git a/docs/examples/images.html b/docs/examples/images.html
index a15d51f26dc7266ecca42976b595d707e4d94940..78c744b1c89c613255b5af6550c762d3110b90a8 100644 (file)
--- a/docs/examples/images.html
+++ b/docs/examples/images.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 

diff --git a/docs/examples/offset-columns.html b/docs/examples/offset-columns.html
index 4691be686c13903bcd02e5c7bd76a1096a722851..467aa191b0261859258845de1f50e824b2db820a 100644 (file)
--- a/docs/examples/offset-columns.html
+++ b/docs/examples/offset-columns.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -39,7 +40,7 @@
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-                    
+
                       <table class="twelve columns">
                         <tr>
                           <td class="panel">
@@ -58,7 +59,7 @@
                 <table class="row">
                   <tr>
                     <td class="wrapper last offset-by-four">
-                    
+
                       <table class="eight columns">
                         <tr>
                           <td class="panel">

diff --git a/docs/examples/panel-sidebar.html b/docs/examples/panel-sidebar.html
index 145b64e9411ecfc6b2c8d4a9bc547835621aafae..b45380249bb8bd9ad1443f24a5bf71ba095fd478 100644 (file)
--- a/docs/examples/panel-sidebar.html
+++ b/docs/examples/panel-sidebar.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -65,7 +66,7 @@
                         <tr>
                           <td class="panel">
                             <h6>Panel content</h6>
-                            Lorem ipsum dolor sit amet, consectetur adipisicing elit. Architecto, recusandae natus temporibus quas at ea doloremque illo. 
+                            Lorem ipsum dolor sit amet, consectetur adipisicing elit. Architecto, recusandae natus temporibus quas at ea doloremque illo.
                           </td>
                           <td class="expander"></td>
                         </tr>
@@ -80,7 +81,7 @@
           </table>
 
           <!-- END EXAMPLE CODE -->
-        
+
         </center>
       </td>
     </tr>

diff --git a/docs/examples/panel-sub-grid.html b/docs/examples/panel-sub-grid.html
index 15a1ca1a06dd165fc9f23f70e6219dd5e785a3a7..3ab87a18acb3610f4f5245832092a6a26d5bc1ed 100644 (file)
--- a/docs/examples/panel-sub-grid.html
+++ b/docs/examples/panel-sub-grid.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -47,12 +48,12 @@
                             <table>
                               <tr>
                                 <td class="six sub-columns">
-                                  
+
                                   Left Sub-Column
 
                                 </td>
                                 <td class="six sub-columns">
-                                  
+
                                   Right Sub-Column
 
                                 </td>
@@ -73,7 +74,7 @@
           </table>
 
           <!-- END EXAMPLE CODE -->
-        
+
         </center>
       </td>
     </tr>

diff --git a/docs/examples/panels.html b/docs/examples/panels.html
index 5d56e5770bdaf5192a6eb0da807b34d0c6c81945..02bba5baaa6c63e32ff0d82d0e50bf073eb11a6a 100644 (file)
--- a/docs/examples/panels.html
+++ b/docs/examples/panels.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -58,7 +59,7 @@
           </table>
 
           <!-- END EXAMPLE CODE -->
-        
+
         </center>
       </td>
     </tr>

diff --git a/docs/examples/text-pad.html b/docs/examples/text-pad.html
index 06d91da81c271aa3b91c673af97d198db2024620..8986b7ba0f0b3544a53af8e8116a3257ac18acdf 100644 (file)
--- a/docs/examples/text-pad.html
+++ b/docs/examples/text-pad.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -101,7 +102,7 @@
           </table>
 
           <!-- END EXAMPLE CODE -->
-        
+
         </center>
       </td>
     </tr>

diff --git a/docs/examples/visibility-classes.html b/docs/examples/visibility-classes.html
index 4bbdd86e8dc7cfeb5600294b7485aa018cd84d9e..1c36d216e8748af14db40a7fccbfa13324a4c3eb 100644 (file)
--- a/docs/examples/visibility-classes.html
+++ b/docs/examples/visibility-classes.html
@@ -4,8 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-  
-    /* Include ink.css */
+
+{{> ink }}
+
 
     /* Custom styles go here */
 
@@ -45,7 +46,7 @@
                           <td class="panel">
 
                             .show-for-small
-                            
+
                           </td>
                           <td class="expander"></td>
                         </tr>

diff --git a/package.json b/package.json
index a8d244f634875e465400c8202aa235b704cfe52e..7be23ed72a0f5f4751e4c35555ebbea228871f80 100644 (file)
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "grunt-cli": "~0.1.9"
   },
   "devDependencies": {
-    "grunt-includes": "~0.3.5",
+    "assemble": "~0.4.33",
     "grunt-shell": "~0.5.0",
     "grunt-contrib-watch": "~0.5.3"
   },

diff --git a/templates/base/basic.html b/templates/base/basic.html
index 10b27c2fff733709977fae526f9a7eef0eef96fb..5ac0dc937bf1dfc75a323b973137272eb5c54922 100644 (file)
--- a/templates/base/basic.html
+++ b/templates/base/basic.html
@@ -4,10 +4,10 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="viewport" content="width=device-width"/>
        <style>
-               /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-               
+
     table.facebook td {
       background: #3b5998;
       border-color: #2d4473;
@@ -93,16 +93,16 @@
                <tr>
                        <td class="center" align="center" valign="top">
         <center>
-         
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
                             <td class="six sub-columns">
@@ -114,24 +114,24 @@
                             <td class="expander"></td>
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
-          
+
                 </center>
               </td>
             </tr>
-          </table> 
+          </table>
 
           <table class="container">
             <tr>
               <td>
-              
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-                  
+
                       <table class="twelve columns">
                         <tr>
                           <td>
@@ -142,11 +142,11 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-                  
+
                     </td>
                   </tr>
                 </table>
-              
+
                 <table class="row callout">
                   <tr>
                     <td class="wrapper last">
@@ -163,11 +163,11 @@
                     </td>
                   </tr>
                 </table>
-              
+
                 <table class="row footer">
                   <tr>
                     <td class="wrapper">
-                            
+
                       <table class="six columns">
                         <tr>
                           <td class="left-text-pad">
@@ -216,7 +216,7 @@
                             <h5>Contact Info:</h5>
                             <p>Phone: 408.341.0600</p>
                             <p>Email: <a href="mailto:hseldon@trantor.com">hseldon@trantor.com</a></p>
-                          </td>          
+                          </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
@@ -224,12 +224,12 @@
                     </td>
                   </tr>
                 </table>
-              
-              
+
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-            
+
                       <table class="twelve columns">
                         <tr>
                           <td align="center">
@@ -240,15 +240,15 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-            
+
                     </td>
                   </tr>
                 </table>
-              
+
               <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
                        </td>

diff --git a/templates/base/hero.html b/templates/base/hero.html
index 8cfbaf1b6e9b949409a75f762600a8c75f555159..ed83dae437706cd36ff48c4a9416901a0957ed54 100644 (file)
--- a/templates/base/hero.html
+++ b/templates/base/hero.html
@@ -4,10 +4,10 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="viewport" content="width=device-width"/>
        <style>
-    /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-    
+
     table.facebook td {
       background: #3b5998;
       border-color: #2d4473;
@@ -89,20 +89,20 @@
                <tr>
                        <td class="center" align="center" valign="top">
         <center>
-         
-         
+
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
-                          
+
                             <td class="six sub-columns">
                               <img src="http://placehold.it/200x50">
                             </td>
@@ -110,10 +110,10 @@
                               <span class="template-label">HERO</span>
                             </td>
                             <td class="expander"></td>
-                            
+
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
@@ -121,18 +121,18 @@
                 </center>
               </td>
             </tr>
-          </table> 
+          </table>
           <br>
-          
+
           <table class="container">
             <tr>
               <td>
-                
+
                 <!-- content start -->
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-                
+
                       <table class="twelve columns">
                         <tr>
                           <td>
@@ -145,11 +145,11 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-                
+
                     </td>
                   </tr>
                 </table>
-                
+
                 <table class="row callout">
                   <tr>
                     <td class="wrapper last">
@@ -168,7 +168,7 @@
                     </td>
                   </tr>
                 </table>
-                
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
@@ -188,8 +188,8 @@
                     </td>
                   </tr>
                 </table>
-                
-                
+
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
@@ -214,12 +214,12 @@
                     </td>
                   </tr>
                 </table>
-                
-                
+
+
                 <table class="row footer">
                   <tr>
                     <td class="wrapper">
-                            
+
                       <table class="six columns">
                         <tr>
                           <td class="left-text-pad">
@@ -268,7 +268,7 @@
                             <h5>Contact Info:</h5>
                             <p>Phone: 408.341.0600</p>
                             <p>Email: <a href="mailto:hseldon@trantor.com">hseldon@trantor.com</a></p>
-                          </td>          
+                          </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
@@ -276,12 +276,12 @@
                     </td>
                   </tr>
                 </table>
-                
-                
+
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-            
+
                       <table class="twelve columns">
                         <tr>
                           <td align="center">
@@ -292,15 +292,15 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-            
+
                     </td>
                   </tr>
                 </table>
-                
+
                 <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
                        </td>

diff --git a/templates/base/newsletter.do-not-include b/templates/base/newsletter.do-not-include
index caf0cf13d5d6f92fb8d179c10d465ff8fa2ad7c4..ade858d136319cc09bd96e3c6d2e180bb1c6f224 100644 (file)
--- a/templates/base/newsletter.do-not-include
+++ b/templates/base/newsletter.do-not-include
@@ -4,10 +4,10 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="viewport" content="width=device-width"/>
        <style>
-    /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-    
+
     .facebook table td {
       background: #3b5998;
       border-color: #2d4473;
@@ -89,16 +89,16 @@
                <tr>
                        <td class="center" align="center" valign="top">
         <center>
-         
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
                             <td class="six sub-columns">
@@ -107,30 +107,30 @@
                             <td class="six sub-columns last" style="text-align:right; vertical-align:middle;">
                               <span class="template-label">NEWSLETTER</span>
                             </td>
-                                
+
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
-          
+
                 </center>
               </td>
             </tr>
           </table>
 
           <br>
-        
+
           <table class="container">
             <tr>
               <td>
-              
+
                 <!-- content start -->
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-                  
+
                       <table class="twelve columns">
                         <tr>
                           <td>
@@ -142,16 +142,16 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-                  
+
                     </td>
                   </tr>
                 </table>
-                
+
                 <!-- Article List 1 -->
                 <table class="row">
                   <tr>
                     <td class="wrapper">
-          
+
                       <table class="twelve columns">
                         <tr>
                           <td class="three sub-columns">
@@ -162,12 +162,12 @@
                             <!-- Top Right sub-grid -->
                             <h5>Title Ipsum <small>This is a note.</small></h5>
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-                            
+
                             <!-- custom wrapped button -->
                             <table width="150">
                               <tr>
                                 <td>
-                                  
+
                                   <a class="button" href="#">
                                     <table>
                                       <tr>
@@ -181,12 +181,12 @@
                                 </td>
                               </tr>
                             </table>
-                            
+
                           </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                       <table class="twelve columns">
                         <tr>
                           <td class="three sub-columns">
@@ -197,7 +197,7 @@
                             <!-- Top Right sub-grid -->
                             <h5>Title Ipsum <small>This is a note.</small></h5>
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-                            
+
                             <!-- custom wrapped button -->
                             <table width="150">
                               <tr>
@@ -216,20 +216,20 @@
                                 </td>
                               </tr>
                             </table>
-                            
+
                           </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                     </td>
                   </tr>
                 </table>
-                
+
                 <!-- Panel with call to action -->
                 <table class="row  callout">
                   <tr>
-                  
+
                     <td class="wrapper last">
                       <table class="twelve columns">
                         <tr>
@@ -240,7 +240,7 @@
                         </tr>
                       </table>
                     </td>
-                    
+
                   </tr>
                 </table>
                 <br>
@@ -248,7 +248,7 @@
                 <table class="row">
                   <tr>
                     <td class="wrapper">
-          
+
                       <table class="twelve columns">
                         <tr>
                           <td class="three sub-columns">
@@ -259,7 +259,7 @@
                             <!-- Top Right sub-grid -->
                             <h5>Title Ipsum <small>This is a note.</small></h5>
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-                            
+
                             <!-- custom wrapped button -->
                             <table width="150">
                               <tr>
@@ -278,12 +278,12 @@
                                 </td>
                               </tr>
                             </table>
-                            
+
                           </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                       <table class="twelve columns">
                         <tr>
                           <td class="three sub-columns">
@@ -294,7 +294,7 @@
                             <!-- Top Right sub-grid -->
                             <h5>Title Ipsum <small>This is a note.</small></h5>
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-                            
+
                             <!-- custom wrapped button -->
                             <table width="150">
                               <tr>
@@ -313,22 +313,22 @@
                                 </td>
                               </tr>
                             </table>
-                            
+
                           </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                     </td>
                   </tr>
                 </table>
-                
-                
-                              
+
+
+
                 <table class="row footer">
                   <tr>
                     <td class="wrapper">
-                            
+
                       <table class="six columns">
                         <tr>
                           <td class="left-text-pad">
@@ -383,7 +383,7 @@
                             <h5>Contact Info:</h5>
                             <p>Phone: 408.341.0600</p>
                             <p>Email: <a href="mailto:hseldon@trantor.com">hseldon@trantor.com</a></p>
-                          </td>          
+                          </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
@@ -391,12 +391,12 @@
                     </td>
                   </tr>
                 </table>
-                
-                
+
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-            
+
                       <table class="twelve columns">
                         <tr>
                           <td align="center">
@@ -407,15 +407,15 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-            
+
                     </td>
                   </tr>
                 </table>
-              
+
               <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
                        </td>

diff --git a/templates/base/sidebar-hero.html b/templates/base/sidebar-hero.html
index 6652afaaca82e9ce30d9d4061c9321f73b0cd4a7..34dd5ba9c707f76785e833bb37615d01d3cb7914 100644 (file)
--- a/templates/base/sidebar-hero.html
+++ b/templates/base/sidebar-hero.html
@@ -4,10 +4,10 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="viewport" content="width=device-width"/>
        <style>
-    /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-    
+
     table.facebook td {
       background: #3b5998;
       border-color: #2d4473;
@@ -89,16 +89,16 @@
                <tr>
                        <td class="center" align="center" valign="top">
         <center>
-         
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
                             <td class="six sub-columns">
@@ -107,25 +107,25 @@
                             <td class="six sub-columns last" style="text-align:right; vertical-align:middle;">
                               <span class="template-label">SIDEBAR HERO</span>
                             </td>
-                            <td class="expander"></td>  
+                            <td class="expander"></td>
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
-          
+
                 </center>
               </td>
             </tr>
           </table>
 
           <br>
-                                
+
           <table class="container">
             <tr>
               <td>
-              
+
               <!-- content start -->
               <table class="row">
                 <tr>
@@ -141,7 +141,7 @@
                         <td class="expander"></td>
                       </tr>
                     </table>
-        
+
                     <table class="twelve columns">
                       <tr>
                         <td class="panel">
@@ -154,9 +154,9 @@
                   </td>
                 </tr>
               </table>
-              
+
               <br>  <!-- Break Tag for row -->
-                
+
               <table class="row">
                 <tr>
                   <td class="wrapper">
@@ -164,7 +164,7 @@
                     <table class="six columns">
                       <tr>
                         <td>
-                          
+
                           <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
 
                           <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
@@ -289,17 +289,17 @@
                         <td class="expander"></td>
                       </tr>
                     </table>
-        
+
                   </td>
                 </tr>
               </table>
               <br>
               <br>
-              <!-- Legal + Unsubscribe -->            
+              <!-- Legal + Unsubscribe -->
               <table class="row">
                 <tr>
                   <td class="wrapper last">
-          
+
                     <table class="twelve columns">
                       <tr>
                         <td align="center">
@@ -310,15 +310,15 @@
                         <td class="expander"></td>
                       </tr>
                     </table>
-          
+
                   </td>
                 </tr>
               </table>
-              
+
               <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
                        </td>

diff --git a/templates/base/sidebar.html b/templates/base/sidebar.html
index 6365cd5b87915c90b206a72c4d0d8b7a08c1c1d4..7fc3a4889ca5bde0a4bd4b759b0b7101351c6543 100644 (file)
--- a/templates/base/sidebar.html
+++ b/templates/base/sidebar.html
@@ -4,10 +4,10 @@
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="viewport" content="width=device-width"/>
        <style>
-    /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-    
+
     table.facebook td {
       background: #3b5998;
       border-color: #2d4473;
@@ -89,16 +89,16 @@
                <tr>
                        <td class="center" align="center" valign="top">
         <center>
-         
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
                             <td class="six sub-columns">
@@ -110,28 +110,28 @@
                             <td class="expander"></td>
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
-          
+
                 </center>
               </td>
             </tr>
           </table>
-                                
+
                                 <br>
-                                
+
           <table class="container">
             <tr>
               <td>
-              
+
               <!-- content start -->
-              
+
                 <table class="row">
                   <tr>
                     <td class="wrapper">
-          
+
                       <table class="six columns">
                         <tr>
                           <td>
@@ -142,17 +142,17 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                       <table class="six columns">
                         <tr>
                           <td class="panel">
                             <p>Phasellus dictum sapien a neque luctus cursus. Pellentesque sem dolor, fringilla et pharetra vitae. <a href="#">Click it! »</a></p>
                           </td>
-                          
+
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                       <table class="six columns">
                         <tr>
                           <td>
@@ -160,7 +160,7 @@
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et.</p>
 
                             <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
-                            
+
                             <table class="button">
                               <tr>
                                 <td>
@@ -168,15 +168,15 @@
                                 </td>
                               </tr>
                             </table>
-                            
+
                           </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                     </td>
                     <td class="wrapper last">
-          
+
                       <table class="six columns">
                         <tr>
                           <td class="panel">
@@ -243,7 +243,7 @@
                       </table>
 
                       <br>
-                      
+
                       <table class="six columns">
                         <tr>
                           <td class="panel">
@@ -283,17 +283,17 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-          
+
                     </td>
                   </tr>
                 </table>
                 <br>
                 <br>
-                <!-- Legal + Unsubscribe -->            
+                <!-- Legal + Unsubscribe -->
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-            
+
                       <table class="twelve columns">
                         <tr>
                           <td align="center">
@@ -304,15 +304,15 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-            
+
                     </td>
                   </tr>
                 </table>
-              
+
               <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
                        </td>

diff --git a/templates/examples/basic.html b/templates/examples/basic.html
index 87079b374ce3b3e5e5987a73fef8695c14686cad..12ef9c98acbb0ea823d0cca9b1cdaf536f639e8b 100644 (file)
--- a/templates/examples/basic.html
+++ b/templates/examples/basic.html
@@ -4,10 +4,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-    /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-    
+
     table.facebook td {
       background: #3b5998;
       border-color: #2d4473;
@@ -93,16 +93,16 @@
     <tr>
       <td class="center" align="center" valign="top">
         <center>
-         
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
                             <td class="six sub-columns">
@@ -114,24 +114,24 @@
                             <td class="expander"></td>
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
-          
+
                 </center>
               </td>
             </tr>
-          </table> 
+          </table>
 
           <table class="container">
             <tr>
               <td>
-              
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-                  
+
                       <table class="twelve columns">
                         <tr>
                           <td>
@@ -142,11 +142,11 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-                  
+
                     </td>
                   </tr>
                 </table>
-              
+
                 <table class="row callout">
                   <tr>
                     <td class="wrapper last">
@@ -163,11 +163,11 @@
                     </td>
                   </tr>
                 </table>
-              
+
                 <table class="row footer">
                   <tr>
                     <td class="wrapper">
-                            
+
                       <table class="six columns">
                         <tr>
                           <td class="left-text-pad">
@@ -216,7 +216,7 @@
                             <h5>Contact Info:</h5>
                             <p>Phone: 408.341.0600</p>
                             <p>Email: <a href="mailto:hseldon@trantor.com">hseldon@trantor.com</a></p>
-                          </td>          
+                          </td>
                           <td class="expander"></td>
                         </tr>
                       </table>
@@ -224,12 +224,12 @@
                     </td>
                   </tr>
                 </table>
-              
-              
+
+
                 <table class="row">
                   <tr>
                     <td class="wrapper last">
-            
+
                       <table class="twelve columns">
                         <tr>
                           <td align="center">
@@ -240,15 +240,15 @@
                           <td class="expander"></td>
                         </tr>
                       </table>
-            
+
                     </td>
                   </tr>
                 </table>
-              
+
               <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
       </td>

diff --git a/templates/examples/sidebar-hero.html b/templates/examples/sidebar-hero.html
index f18796be92e9b40db43bf10b13e0cc385572d49b..86a00fc8a7acb337bbf2e6fb8d65e758536045ba 100644 (file)
--- a/templates/examples/sidebar-hero.html
+++ b/templates/examples/sidebar-hero.html
@@ -4,10 +4,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width"/>
   <style>
-    /* Include ink.css */
+{{> ink }}
   </style>
   <style>
-    
+
     table.facebook td {
       background: #3b5998;
       border-color: #2d4473;
@@ -89,16 +89,16 @@
     <tr>
       <td class="center" align="center" valign="top">
         <center>
-         
+
           <table class="row header">
             <tr>
               <td class="center" align="center">
                 <center>
-          
+
                   <table class="container">
                     <tr>
                       <td class="wrapper last">
-            
+
                         <table class="twelve columns">
                           <tr>
                             <td class="six sub-columns">
@@ -107,25 +107,25 @@
                             <td class="six sub-columns last" style="text-align:right; vertical-align:middle;">
                               <span class="template-label">SIDEBAR HERO</span>
                             </td>
-                            <td class="expander"></td>  
+                            <td class="expander"></td>
                           </tr>
                         </table>
-            
+
                       </td>
                     </tr>
                   </table>
-          
+
                 </center>
               </td>
             </tr>
           </table>
 
           <br>
-         
+
           <table class="container">
             <tr>
               <td>
-              
+
               <!-- content start -->
               <table class="row">
                 <tr>
@@ -141,7 +141,7 @@
                         <td class="expander"></td>
                       </tr>
                     </table>
-        
+
                     <table class="twelve columns">
                       <tr>
                         <td class="panel">
@@ -154,9 +154,9 @@
                   </td>
                 </tr>
               </table>
-              
+
               <br>  <!-- Break Tag for row -->
-                
+
               <table class="row">
                 <tr>
                   <td class="wrapper">
@@ -164,7 +164,7 @@
                     <table class="six columns">
                       <tr>
                         <td>
-                          
+
                           <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
 
                           <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
@@ -289,17 +289,17 @@
                         <td class="expander"></td>
                       </tr>
                     </table>
-        
+
                   </td>
                 </tr>
               </table>
               <br>
               <br>
-              <!-- Legal + Unsubscribe -->            
+              <!-- Legal + Unsubscribe -->
               <table class="row">
                 <tr>
                   <td class="wrapper last">
-          
+
                     <table class="twelve columns">
                       <tr>
                         <td align="center">
@@ -310,15 +310,15 @@
                         <td class="expander"></td>
                       </tr>
                     </table>
-          
+
                   </td>
                 </tr>
               </table>
-              
+
               <!-- container end below -->
               </td>
             </tr>
-          </table> 
+          </table>
 
         </center>
       </td>