updated user app.scss file with correct order of commented parts of F…

…oundation
revskill10 · Sep 18, 2012 · 6e8ba6e · 6e8ba6e
1 parent 3abefa8
commit 6e8ba6e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/templates/project/scss/app.scss b/templates/project/scss/app.scss
@@ -11,12 +11,10 @@
 // @import "compass/css3";
 // @import "foundation/settings";
 // @import "foundation/functions/all";
-// @import "foundation/common/globals";
-// @import "foundation/mixins/clearfix";
-// @import "modular-scale";
 
 // Control which mixins you have access too
 
+// @import "foundation/mixins/clearfix";
 // @import "foundation/mixins/css-triangle";
 // @import "foundation/mixins/font-size";
 
@@ -25,6 +23,9 @@
 // @import "foundation/mixins/respond-to";
 // @import "foundation/mixins/semantic-grid";
 
+// @import "foundation/common/globals";
+// @import "modular-scale";
+
 // Must include the grid for any responsiveness
 
 // @import "foundation/components/grid";

diff --git a/test/orbit.html b/test/orbit.html
@@ -101,7 +101,10 @@ <h4>What? You didn't click it?</h4>
 	<script src="../vendor/assets/javascripts/foundation/app.js"></script>
   <script type="text/javascript">
     $(window).load(function(){
-      $("#featured").orbit();
+      $("#featured").orbit({
+        animation: 'fade',
+        resetTimerOnClick: true
+      });
       $('#featuredContent').orbit({ fluid: '2x1' });
     });
   </script>

diff --git a/test/reveal.html b/test/reveal.html
@@ -39,7 +39,7 @@ <h3>Reveal &mdash; Simple, Flexible Modal Dialogs</h3>
 			<h4 class="subheader">Modal dialogs, or pop-up windows, are handy for prototyping and production. Foundation includes Reveal our jQuery modal plugin, to make this easy for you.</h4>
 
 			<p>
-        <a href="#" data-reveal-id="exampleModal" class="radius button">  
+        <a href="#" data-reveal-id="exampleModal" class="radius button">
           Example Modal&hellip;
         </a>
       </p>

diff --git a/test/tabs.html b/test/tabs.html
@@ -23,7 +23,7 @@
 	<![endif]-->
 </head>
 <body>
-  
+
 	<div class="row">
     <div class="twelve columns">
       <p><a href="index.html">&laquo; Back</a></p>
@@ -37,11 +37,11 @@ <h2>Foundation Tabs Testing</h2>
         <dd><a href="#pill-style-tables">Pill-Style Tabs</a></dd>
         <dd><a href="#vertical-tabs">Vertical Tabs</a></dd>
         <dd><a href="#mobile-tabs">Mobile Tabs</a></dd>
-        
+
       </dl>
     </div>
   </div>
-	
+
 	<!-- Test Foundation Components Here -->
   <div class="row">
     <div class="twelve columns">
@@ -70,7 +70,7 @@ <h4>Simple Tabs</h4>
           </ul>
         </div>
       </div>
-      
+
       <br><br>
 
       <div class="row">
@@ -96,7 +96,7 @@ <h4>Tab Sizing</h4>
           </dl>
         </div>
       </div>
-      
+
       <br><br>
 
       <div class="row">
@@ -121,7 +121,7 @@ <h4>Contained Tabs</h4>
           </ul>
         </div>
       </div>
-      
+
       <br><br>
 
       <div class="row">
@@ -139,7 +139,7 @@ <h4>Pill-Style Tabs</h4>
           </dl>
         </div>
       </div>
-      
+
       <div class="row">
         <div class="four columns">
           <a name="vertical-tabs"></a>
@@ -154,15 +154,15 @@ <h4>Vertical Tabs</h4>
           </dl>
         </div>
       </div>
-      
-      
+
+
       <a name="mobile-tabs"></a>
   		<h4>Mobile Tabs</h4>
   		<p>If you want a standard, horizontal tab group to act vertical on small devices, adding a class of "mobile" to a standard (not vertical) tab group will switch them to full width nav bars on small screens.</p>
 
   	</div>
   </div>
-	
+
 	<!-- Included JS Files -->
 	<script src="../vendor/assets/javascripts/foundation/jquery.js"></script>
   <script src="../vendor/assets/javascripts/foundation/jquery.foundation.mediaQueryToggle.js"></script>
@@ -179,6 +179,6 @@ <h4>Mobile Tabs</h4>
 	<script src="../vendor/assets/javascripts/foundation/app.js"></script>
   <script type="text/javascript">
     // Page-Specific JavaScript Goes Here
-  </script>	
+  </script>
 </body>
 </html>