adding components in new files

diff --git a/testing/gulpfile.babel.js b/testing/gulpfile.babel.js
index 7212dd3380114a8da3a39655c4ad478a65cbcf73..3b4e386640dc7ba0c858c0149340998652e060ca 100644 (file)
--- a/testing/gulpfile.babel.js
+++ b/testing/gulpfile.babel.js
@@ -34,13 +34,13 @@ function clean(done) {
 // Compile layouts, pages, and partials into flat HTML files
 // Then parse using Inky templates
 function pages() {
-  return gulp.src('src/pages/**/*.html')
+  return gulp.src('src/pages/grid.html')
+    .pipe(inky())
     .pipe(panini({
       root: 'src/pages',
       layouts: 'src/layouts',
       partials: 'src/partials'
     }))
-    .pipe(inky())
     .pipe(gulp.dest('dist'));
 }
 

diff --git a/testing/package.json b/testing/package.json
index 182ad9c9386086e7768ed1dab25430754c65280a..50fbe965d2a01a4ed25909d69414f6436e52f154 100644 (file)
--- a/testing/package.json
+++ b/testing/package.json
@@ -24,7 +24,7 @@
     "gulp-sass": "^2.1.0",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-webserver": "^0.9.1",
-    "inky": "zurb/inky",
+    "inky": "git://github.com/zurb/inky.git#0.3.0",
     "lazypipe": "^1.0.1",
     "media-query-extractor": "^0.1.1",
     "panini": "^1.1.1",

diff --git a/testing/src/pages/block-inky.html b/testing/src/pages/block-inky.html
index a9d235fa500a0fb032aca49ba3bb2b8ce09527ac..9ebec42433c1541cd9aff630cef2475e18a9d9c3 100644 (file)
--- a/testing/src/pages/block-inky.html
+++ b/testing/src/pages/block-inky.html
@@ -1,52 +1,24 @@
 <container>
   <block-grid up="2">
-    <td>
-      <p>one</p>
-    </td>
-    <td>
-      <p>two</p>
-    </td>
+    <td><p>one</p></td>
+    <td><p>two</p></td>
   </block-grid>
   <block-grid up="3">
-    <td>
-      <p>one</p>
-    </td>
-    <td>
-      <p>two</p>
-    </td>
-    <td>
-      <p>three</p>
-    </td>
+    <td><p>one</p></td>
+    <td><p>two</p></td>
+    <td><p>three</p></td>
   </block-grid>
   <block-grid up="4">
-    <td>
-      <p>one</p>
-    </td>
-    <td>
-      <p>two</p>
-    </td>
-    <td>
-      <p>three</p>
-    </td>
-    <td>
-      <p>four</p>
-    </td>
+    <td><p>one</p></td>
+    <td><p>two</p></td>
+    <td><p>three</p></td>
+    <td><p>four</p></td>
   </block-grid>
   <block-grid up="5">
-    <td>
-      <p>one</p>
-    </td>
-    <td>
-      <p>two</p>
-    </td>
-    <td>
-      <p>three</p>
-    </td>
-    <td>
-      <p>four</p>
-    </td>
-    <td>
-      <p>five</p>
-    </td>
+    <td><p>one</p></td>
+    <td><p>two</p></td>
+    <td><p>three</p></td>
+    <td><p>four</p></td>
+    <td><p>five</p></td>
   </block-grid>
 </container>
\ No newline at end of file

diff --git a/testing/src/pages/block.html b/testing/src/pages/block.html
new file mode 100644 (file)
index 0000000..bbfa4da
--- /dev/null
+++ b/testing/src/pages/block.html
@@ -0,0 +1,69 @@
+<table class="container">
+  <tr>
+    <td>
+
+      <table class="block-grid up-2">
+        <tr>
+          <td>
+            <p>one</p>
+          </td>
+          <td>
+            <p>two</p>
+          </td>
+        </tr>
+      </table>
+
+      <table class="block-grid up-3">
+        <tr>
+          <td>
+            <p>one</p>
+          </td>
+          <td>
+            <p>two</p>
+          </td>
+          <td>
+            <p>three</p>
+          </td>
+        </tr>
+      </table>
+
+      <table class="block-grid up-4">
+        <tr>
+          <td>
+            <p>one</p>
+          </td>
+          <td>
+            <p>two</p>
+          </td>
+          <td>
+            <p>three</p>
+          </td>
+          <td>
+            <p>four</p>
+          </td>
+        </tr>
+      </table>
+
+      <table class="block-grid up-5">
+        <tr>
+          <td>
+            <p>one</p>
+          </td>
+          <td>
+            <p>two</p>
+          </td>
+          <td>
+            <p>three</p>
+          </td>
+          <td>
+            <p>four</p>
+          </td>
+          <td>
+            <p>five</p>
+          </td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+</table>
\ No newline at end of file

diff --git a/testing/src/pages/button-inky.html b/testing/src/pages/button-inky.html
new file mode 100644 (file)
index 0000000..3f665f6
--- /dev/null
+++ b/testing/src/pages/button-inky.html
@@ -0,0 +1,42 @@
+<container>
+  <row>
+    <columns small="12" large="12">
+      <button class="large" href="http://zurb.com">I am a large button</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button href="http://zurb.com">I am a button</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button class="small" href="http://zurb.com">I am a small button</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button class="tiny" href="http://zurb.com">I am a tiny button</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button class="secondary" href="http://zurb.com">I am secondary</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button class="success" href="http://zurb.com">I am successful</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button class="alert" href="http://zurb.com">I alert</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button class="expand">I expand</button>
+    </columns>
+  </row>
+</container>
\ No newline at end of file

diff --git a/testing/src/pages/button.html b/testing/src/pages/button.html
index 8e88fdc6eab23005d3354b191b15acd5088a69b0..3d6f74ab49a0110f5805cbc102ef1a5cb2838483 100644 (file)
--- a/testing/src/pages/button.html
+++ b/testing/src/pages/button.html
@@ -28,7 +28,7 @@
       <tr>
         <th class="small-12 large-12 columns">
 
-          <table  class="button">
+          <table class="button">
             <tr>
               <td>
                 <table>
@@ -135,15 +135,38 @@
       </tr>
     </table>
 
+
+    <table class="row">
+      <tr>
+        <th class="small-12 large-12 columns">
+
+          <table class="button alert">
+            <tr>
+              <td>
+                <table>
+                  <tr>
+                    <td>
+                      <a href="https://zurb.com">I alert</a>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+
+        </th>
+      </tr>
+    </table>
+
     <table class="row">
       <tr>
         <td class="small-12 large-12 columns">
 
-          <table class=" button alert expand">
+          <table class=" button expand">
             <tr>
               <td>
                 
-                <table border="0" cellspacing="0" cellpadding="0">
+                <table>
                   <tr>
                     <td>
                       <a href="https://zurb.com">I expand</a>
@@ -152,13 +175,10 @@
                 </table>
 
               </td>
-              <td class="expander"></td>
             </tr>
           </table>
 
         </td>
-              <td class="expander"></td>
-
       </tr>
     </table>
 

diff --git a/testing/src/pages/index.html b/testing/src/pages/index.html
index c5081fc7eac9d5474db835fbd3a8405c628f1f1a..44b18fe2cdb6fa1a1dc8c83597c6c2132ebfd272 100644 (file)
--- a/testing/src/pages/index.html
+++ b/testing/src/pages/index.html
@@ -1,128 +1,13 @@
-<table class="container">
-  <tr>
-    <td>
-
-    <table class="row collapse">
-      <tr>
-        <th class="large-12 small-12 columns">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit. Totam fugiat nihil, autem unde modi laborum consequuntur cumque at nemo, adipisci laboriosam dolores animi repellat beatae, eveniet itaque, nisi perspiciatis iste! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum eos odit consequatur reprehenderit, deleniti incidunt rerum quam harum praesentium hic officia tempore quisquam consectetur eligendi cumque sit obcaecati ab nam? Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro fugiat optio similique consequatur illo excepturi. Eveniet fugit ut nam sit soluta laudantium, necessitatibus laboriosam! Numquam iste cumque fugit fuga dolores!
-        </th>
-      </tr>
-    </table>
-
-    <table class="row collapse">
-      <tr>
-        <th class="large-6 small-12 columns" style="background:green;">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit. Totam fugiat nihil, autem unde modi laborum consequuntur cumque at nemo, adipisci laboriosam dolores animi repellat beatae, eveniet itaque, nisi perspiciatis iste! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum eos odit consequatur reprehenderit, deleniti incidunt rerum quam harum praesentium hic officia tempore quisquam consectetur eligendi cumque sit obcaecati ab nam? Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro fugiat optio similique consequatur illo excepturi. Eveniet fugit ut nam sit soluta laudantium, necessitatibus laboriosam! Numquam iste cumque fugit fuga dolores!
-        </th>
-        <th class="large-6 small-12 columns" style="background:yellow">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit. Totam fugiat nihil, autem unde modi laborum consequuntur cumque at nemo, adipisci laboriosam dolores animi repellat beatae, eveniet itaque, nisi perspiciatis iste! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum eos odit consequatur reprehenderit, deleniti incidunt rerum quam harum praesentium hic officia tempore quisquam consectetur eligendi cumque sit obcaecati ab nam? Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro fugiat optio similique consequatur illo excepturi. Eveniet fugit ut nam sit soluta laudantium, necessitatibus laboriosam! Numquam iste cumque fugit fuga dolores!
-        </th>
-      </tr>
-    </table>
-
-    <table class="row">
-      <tr>
-        <th class="large-6 small-12 columns first" style="background: red;">
-          <table>
-            <tr>
-              <th>
-                <p>
-                  One word
-                </p>
-              </th>
-              <th class="expander"></th>
-            </tr>
-          </table>
-        </th>
-        <th class="large-6 small-12 columns last" style="background: blue;">
-          <table>
-            <tr>
-              <th>
-                ipsum dolor sit amet, consectetur adipisicing elit. Perspiciatis recusandae non consequatur similique fugiat, modi repellendus, culpa! Ea dolorum quae nobis omnis voluptatem, delectus facilis sapiente. Sit excepturi eligendi dolore!Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur neque eos vitae tenetur illum dolorum, quam officiis ut est molestias explicabo, sed autem quod saepe praesentium rem ad hic deleniti.
-              </th>
-              <th class="expander"></th>
-            </tr>
-          </table>
-        </th>
-      </tr>
-    </table>
-
-
-
-      <table class="row">
-        <tr>
-          <th class="large-2 small-12 columns first" style="background: red;">
-            <table>
-              <tr>
-                <th>
-                  <p>
-                    One word
-                  </p>
-                </th>
-                <th class="expander"></th>
-              </tr>
-            </table>
-          </th>
-          <th class="large-4 small-12 columns" style="background: green;">
-            <table>
-              <tr>
-                <th>
-                  ipsum dolor sit amet, consectetur adipisicing elit. Perspiciatis recusandae non consequatur similique fugiat, modi repellendus, culpa! Ea dolorum quae nobis omnis voluptatem, delectus facilis sapiente. Sit excepturi eligendi dolore!Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur neque eos vitae tenetur illum dolorum, quam officiis ut est molestias explicabo, sed autem quod saepe praesentium rem ad hic deleniti.
-                </th>
-                <th class="expander"></th>
-              </tr>
-            </table>
-          </th>
-          <th class="large-6 small-12 columns last" style="background: blue;">
-            <table>
-              <tr>
-                <th>
-                  ipsum dolor sit amet, consectetur adipisicing elit. Perspiciatis recusandae non consequatur similique fugiat, modi repellendus, culpa! Ea dolorum quae nobis omnis voluptatem, delectus facilis sapiente. Sit excepturi eligendi dolore!Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur neque eos vitae tenetur illum dolorum, quam officiis ut est molestias explicabo, sed autem quod saepe praesentium rem ad hic deleniti.
-                </th>
-                <th class="expander"></th>
-              </tr>
-            </table>
-          </th>
-        </tr>
-      </table>
-
-      <table class="row">
-        <tr>
-          <th class="large-2 small-12 columns first" style="background: red;">
-            <table>
-              <tr>
-                <th>
-                  <p>
-                    One word
-                  </p>
-                </th>
-                <th class="expander"></th>
-              </tr>
-            </table>
-          </th>
-          <th class="large-4 small-4 columns" style="background: green;">
-            <table>
-              <tr>
-                <th>
-                  ipsum dolor sit amet, consectetur adipisicing elit. Perspiciatis recusandae non consequatur similique fugiat, modi repellendus, culpa! Ea dolorum quae nobis omnis voluptatem, delectus facilis sapiente. Sit excepturi eligendi dolore!Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur neque eos vitae tenetur illum dolorum, quam officiis ut est molestias explicabo, sed autem quod saepe praesentium rem ad hic deleniti.
-                </th>
-                <th class="expander"></th>
-              </tr>
-            </table>
-          </th>
-          <th class="large-6 small-8 columns last" style="background: blue;">
-            <table>
-              <tr>
-                <th>
-                  ipsum dolor sit amet, consectetur adipisicing elit. Perspiciatis recusandae non consequatur similique fugiat, modi repellendus, culpa! Ea dolorum quae nobis omnis voluptatem, delectus facilis sapiente. Sit excepturi eligendi dolore!Lorem ipsum dolor sit amet, consectetur adipisicing elit. Consequatur neque eos vitae tenetur illum dolorum, quam officiis ut est molestias explicabo, sed autem quod saepe praesentium rem ad hic deleniti.
-                </th>
-                <th class="expander"></th>
-              </tr>
-            </table>
-          </th>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
\ No newline at end of file
+<container>
+  <row>
+    <columns small="12" large="12">
+      <h3>Testing 1, 2, 3!!</h3>
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Optio quo fuga commodi! Iusto maiores officia magni nam fuga, numquam maxime. Reiciendis ad natus exercitationem dolor reprehenderit animi, soluta tempora alias.</p>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="6" class="offset-large-6">
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsa, sapiente asperiores sit quia accusantium distinctio dolorum officiis libero, quo. Non, officiis, id! Ab cupiditate natus fugit dolorem velit eveniet similique. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iure ipsa beatae impedit dicta vero quis quibusdam similique optio expedita asperiores consectetur, obcaecati soluta deleniti facere aliquid fugiat nihil temporibus sed.</p>
+    </columns>
+  </row>
+</container>

diff --git a/testing/src/pages/menu-inky.html b/testing/src/pages/menu-inky.html
new file mode 100644 (file)
index 0000000..3459c20
--- /dev/null
+++ b/testing/src/pages/menu-inky.html
@@ -0,0 +1,7 @@
+<container>
+  <menu>
+    <item href="http://zurb.com">Item</item>
+    <item href="http://zurb.com">Item</item>
+    <item href="http://zurb.com">Item</item>
+  </menu>
+</container>
\ No newline at end of file

diff --git a/testing/src/pages/menu.html b/testing/src/pages/menu.html
new file mode 100644 (file)
index 0000000..650fe55
--- /dev/null
+++ b/testing/src/pages/menu.html
@@ -0,0 +1,15 @@
+ <table class="container">
+  <tr>
+    <td>     
+
+      <table class="menu">
+        <tr>
+          <td><a href="http://zurb.com">Item</a></td>
+          <td><a href="http://zurb.com">Item</a></td>
+          <td><a href="http://zurb.com">Item</a></td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+</table>
\ No newline at end of file