changed the file names of the scss files

diff --git a/gulpfile.js b/gulpfile.js
index 5967cd3c6e8ced1fd8ce254feb64a2f6667e8eb2..5576335671101d5c40a0d4ce59340b47a7870833 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -193,7 +193,6 @@ gulp.task('build', ['clean:dist', 'sass'], function() {
   gulp.start('inky-parse');
 });
 
-
 // Deploy
 // When you're all ready to send your email
 // Minify the html, inline the css, inject media queries in the head

diff --git a/scss/ink.scss b/scss/ink.scss
index 16e245d95915c1bc893cd3333bbf96249d84222b..e22e65239a88a4f39df702bdbbeeb6e4a714ef0d 100755 (executable)
--- a/scss/ink.scss
+++ b/scss/ink.scss
@@ -13,10 +13,10 @@
        "ink/components/block-grid",
        "ink/components/alignment",
        "ink/components/type",
-  "ink/components/buttons",
-  "ink/components/callouts",
-  "ink/components/thumbnails",
-       "ink/components/inline-lists",
+  "ink/components/button",
+  "ink/components/callout",
+  "ink/components/thumbnail",
+       "ink/components/inline-list",
        "ink/components/outlook-first",
        "ink/components/media-query",
   "ink/override";
\ No newline at end of file

diff --git a/scss/ink/components/_buttons.scss b/scss/ink/components/_button.scss
similarity index 100%
rename from scss/ink/components/_buttons.scss
rename to scss/ink/components/_button.scss

diff --git a/scss/ink/components/_callouts.scss b/scss/ink/components/_callout.scss
similarity index 100%
rename from scss/ink/components/_callouts.scss
rename to scss/ink/components/_callout.scss

diff --git a/scss/ink/components/_inline-lists.scss b/scss/ink/components/_inline-list.scss
similarity index 100%
rename from scss/ink/components/_inline-lists.scss
rename to scss/ink/components/_inline-list.scss

diff --git a/scss/ink/components/_panels.scss b/scss/ink/components/_panel.scss
similarity index 100%
rename from scss/ink/components/_panels.scss
rename to scss/ink/components/_panel.scss

diff --git a/scss/ink/components/_thumbnails.scss b/scss/ink/components/_thumbnail.scss
similarity index 100%
rename from scss/ink/components/_thumbnails.scss
rename to scss/ink/components/_thumbnail.scss

diff --git a/src/pages/container-test.handlebars b/src/pages/container-test.handlebars
new file mode 100644 (file)
index 0000000..d3118fb
--- /dev/null
+++ b/src/pages/container-test.handlebars
@@ -0,0 +1,31 @@
+<container>
+  <row>
+    <columns large='12'>
+       <subcolumns large='6' small='6'>
+          <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.
+          </p>
+        </subcolumns>
+        <subcolumns large='6' small='6'>
+          <img src="http://placehold.it/400x100" alt="">
+         </subcolumns>
+    </columns>
+  </row>
+</container>
+
+<br/>
+<br/>
+<br/>
+<br/>
+
+<container>
+  <row>
+    <columns large='6'>
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.
+      </p>
+    </columns>
+    <columns large='6'>
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.
+      </p>
+    </columns>
+  </row>
+</container>

diff --git a/src/pages/hello.handlebars b/src/pages/hello.handlebars
index 1ccfad270af7c7daabdaec9a309555b128de5722..3ac8d2ec69914cd23536af7d51a73c7cf67e4c55 100644 (file)
--- a/src/pages/hello.handlebars
+++ b/src/pages/hello.handlebars
@@ -1,10 +1,21 @@
-{{> header }}
+<row class="header">
+  <container>
+    <columns large='12' small='12'>
+      <subcolumns large='6' small='6'>
+        <img src="http://placehold.it/200x50">
+      </subcolumns>
+      <subcolumns large='6' small='6'>
+        <span class="template-label">SIDEBAR HERO</span>
+      </subcolumns>
+    </columns>
+  </container>    
+</row>
 <container>
   <row>
     <columns large='12'>
       <h1>asdfakh</h1>
       <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et.</p>
-      <img width="580" height="300" src="http://placehold.it/580x300">
+      <img width="580" height="300" src="https://placekitten.com/g/580/300">
     </columns>
   </row>
   <row>
@@ -70,5 +81,4 @@
       </callout>
     </columns>
   </row>
- </container>
- {{> footer }}
+</container>

diff --git a/src/pages/letter.handlebars b/src/pages/letter.handlebars
index 7f8f4942e4077162de07abe257103e4ae8784d43..bffe585cb7ca2c41891f9269a559afcf470a3188 100644 (file)
--- a/src/pages/letter.handlebars
+++ b/src/pages/letter.handlebars
@@ -12,8 +12,8 @@
 </row>
 <row>
   <columns large='12'>
-  <p >Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
-  <p >Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Nulla vitae elit libero, a pharetra augue. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
   <p>Cheers,<br>Bryan</p>
 </columns>
 </row>
@@ -92,6 +92,7 @@
 <!-- ^^^Not sure how to best implement the offset class.^^^^ 
      It is applied to a td.wrapper that is automatically generated.
      This might be a proposed option -->
+     <columns large="1"></columns>
   <columns large="5">
     <button class="facebook">
       <a href="#">Share on facebook</a> 

diff --git a/src/partials/footer.handlebars b/src/partials/footer.handlebars
index 985208da80999d37d12205978753e65607bd93fd..284b2a0196ac49fd0a03959b2463b885f82408ac 100644 (file)
--- a/src/partials/footer.handlebars
+++ b/src/partials/footer.handlebars
@@ -4,4 +4,5 @@
       <p style="text-align:center;"><a href="#">Terms</a> | <a href="#">Privacy</a> | <a href="#">Unsubscribe</a></p>
     </center>
   </columns>
-</row>
\ No newline at end of file
+</row>
+</container>
\ No newline at end of file

diff --git a/src/partials/header.handlebars b/src/partials/header.handlebars
index d7cf77ab7b7bbd35f565c7348af5dfee4a298c49..6477e848f6954ba5da8ece2a82c7c9a6b43a9da5 100644 (file)
--- a/src/partials/header.handlebars
+++ b/src/partials/header.handlebars
@@ -1,10 +1,12 @@
 <row class="header">
-  <columns large='12' small='12'>
-    <subcolumns large='6' small='6'>
-      <img src="http://placehold.it/200x50">
-    </subcolumns>
-    <subcolumns large='6' small='6'>
-      <span class="template-label">SIDEBAR HERO</span>
-    </subcolumns>
-  </columns>
- </row>
\ No newline at end of file
+  <container>
+    <columns large='12' small='12'>
+      <subcolumns large='6' small='6'>
+        <img src="http://placehold.it/200x50">
+      </subcolumns>
+      <subcolumns large='6' small='6'>
+        <span class="template-label">SIDEBAR HERO</span>
+      </subcolumns>
+    </columns>
+  </container>    
+</row>
\ No newline at end of file