Minimal changes

examples/test/app/events.js

@@ -1,91 +1,9 @@
-<<<<<<< HEAD
+
 LUNGO.Events.init({
+    'section#a article a tap': function(){
+        LUNGO.Notification.loading('hole', '1', 'user');
+    },
     'section#sec-1 header #btn-toggle-loading tap': App.View.toggleLoading,
-    'section#sec-2 load': funtion(event) {
-
-    };
-
-    'a': App.View.toggleLoading
+    'section#sec-2 load': App.View.toggleLoading
 });
 
-/*
-App.Events = (function(lng, undefined) {
-
-    lng.ready(function() {
-        //lng.View.Aside.toggle('.onright');
-
-        setTimeout(function() {
-            lng.View.Element.progress('#progress-normal', 50, true, 'yeah');
-            lng.View.Element.progress('#progress-big', 75, true, 'yeah');
-
-            lng.View.Element.loading('#loading-code', 'white');
-        }, 1000);
-
-    });
-
-
-
-    $$('section#sec-1 header #btn-toggle-loading').tap(function(event) {
-        var el = lng.dom(this);
-
-        if (el.children('.loading').length > 0) {
-            el.children('.icon').show();
-            lng.View.Element.loading(this);
-        } else {
-            el.children('.icon').hide();
-            lng.View.Element.loading(this, 'white');
-        }
-
-    });
-
-    //SPECIAL
-    $$('section#sec-1').on('load', function(event) {
-        console.error('section#sec-1 loaded', event);
-
-        console.error('current section', lng.Element.Current.section);
-        lng.Router.article('sec-1', 'nav-2');
-    });
-
-
-    $$('section#sec-2').on('unload', function(event) {
-        console.error('section#sec-2 unloaded', event);
-    });
-
-    $$('section#sec-2').on('load', function(event) {
-        console.error('section#sec-2 loaded', event);
-    });
-
-    $$('article#nav-1').on('load', function(event) {
-        console.error('article#nav-1 loaded', event);
-    });
-
-    $$('article#nav-3').on('unload', function(event) {
-        console.error('article#nav-1 unloaded', event);
-    });
-
-
-    return {
-        a: a
-    };
-
-})(LUNGO);
-*/
-=======
-// Generated by CoffeeScript 1.3.3
-(function() {
-
-  LUNGO.Events.init({
-    "section#a article a tap": App.View.notify
-    /*
-    ,
-    "section#sec-1 header #btn-toggle-loading tap": App.View.toggleLoading,
-    "section#sec-1 load": function(event) {
-      console.error("section#sec-1 loaded", event);
-      console.error("current section", lng.Element.Current.section);
-      return LUNGO.Router.article("sec-1", "nav-2");
-    }
-    */
-  });
-
-}).call(this);
->>>>>>> New themes

examples/test/app/view.js

@@ -1,5 +1,9 @@
 App.View = (function(lng, App, undefined) {
 
+    growl = function() {
+        alert(1111)
+    };
+
     toggleLoading = function(event) {
         var el = lng.dom(this);
 
@@ -13,8 +17,9 @@ App.View = (function(lng, App, undefined) {
     };
 
     return {
+        growl: growl,
         toggleLoading: toggleLoading
     };
 
 
-})(LUNGO, App);
+})(LUNGO, App);

examples/test/index.html

@@ -28,6 +28,7 @@
     <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.layout.aside.css">
     <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.layout.article.css">
     <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.layout.list.css">
+    <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.layout.grid.css">
     <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.widgets.css">
     <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.widgets.splash.css">
     <link rel="stylesheet" href="../../src/stylesheets/css/Lungo.widgets.button.css">
@@ -60,6 +61,30 @@
         </article>
     </section>
 -->
+    <section id="foundation">
+        <header data-title="test"></header>
+        <footer class="toolbar with-labels"></footer>
+
+        <article>
+            <div class="row one red">.row.one</div>
+
+            <div class="row six blue">
+                <div class="one column orange"></div>
+                <div class="one column"></div>
+                <div class="four column orange">.four.column.orange</div>
+                <div class="one column"></div>
+                <div class="one column orange tall"></div>
+                <div class="one column "></div>
+                <div class="one column orange "></div>
+            </div>
+
+            <div class="row two green">
+                <div class="two columns centered red"></div>
+            </div>
+
+            <div class="row one yellow">.row.one.yellow</div>
+        </article>
+    </section>
 
     <section id="a" data-transition="pop" >
         <header data-title="a">

src/stylesheets/Lungo.theme.scaffold.less

@@ -238,8 +238,7 @@ section.aside {
 &.indented {
     & ul {
         border: 1px solid @theme;
-
-            .box-shadow(0 1px 1px rgba(0,0,0,0.05));
+        .box-shadow(0 1px 1px rgba(0,0,0,0.05));
     }
     & li {
         &:first-child {
@@ -364,4 +363,4 @@ input[type="range"] {
         .box-shadow(~'inset 0 1px 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(255,255,255,0.2)');
     }
 
-/* @end */
+/* @end */