Przeglądaj źródła

Refolder statics

Javi Jimenez Villar 13 lat temu
rodzic
commit
1a9dfa27e2

+ 2 - 2
GruntFile.coffee

@@ -86,8 +86,8 @@ module.exports = (grunt) ->
 
     watch:
       files: ['<%= resources.core %>', '<%= resources.modules %>', '<%= resources.stylesheets %>', '<%= resources.theme %>']
-      # tasks: ["coffee", "concat", "stylus:stylesheets", "stylus:theme"]
-      tasks: ["stylus:stylesheets", "stylus:theme"]
+      tasks: ["coffee", "concat", "stylus:stylesheets", "stylus:theme"]
+      # tasks: [ "stylus:theme"]
 
   grunt.loadNpmTasks "grunt-contrib-coffee"
   grunt.loadNpmTasks "grunt-contrib-concat"

+ 1 - 1
example/components/lungo.brownie

@@ -1 +1 @@
-Subproject commit e9b011ec211cf237e90c3327ce57148901b10af9
+Subproject commit 920d88bc255804ddceffa223c5028e3952e0c1c8

+ 11 - 11
example/index.html

@@ -49,7 +49,7 @@
     <link rel="stylesheet" href="components/lungo.brownie/lungo.theme.css" id="theme-stylesheet">
     <link rel="stylesheet" href="components/lungo.icon/lungo.icon.css">
     <!-- App Stylesheet -->
-    <link rel="stylesheet" href="stylesheets/app.css">
+    <link rel="stylesheet" href="static/stylesheets/app.css">
 </head>
 
 <body class="app">
@@ -59,7 +59,7 @@
             <nav>
                 <a href="#" data-view-aside="features" data-icon="menu"></a>
             </nav>
-            <img src="assets/logo.png" class="title centered">
+            <img src="static/images/logo.png" class="title centered">
 
             <nav class="right">
                 <a href="#" data-action="twitter" class="button" data-icon="brand twitter" data-article="main-article"></a>
@@ -75,11 +75,11 @@
         </header>
 
         <nav data-control="groupbar" data-article="icon-symbol icon-media icon-toolbar icon-social icon-item">
-            <a href="#" data-view-article="icon-symbol" data-label="Symbol" data-async="app/articles/icon-symbol.html"></a>
-            <a href="#" data-view-article="icon-media" data-label="Media" data-async="app/articles/icon-media.html"></a>
-            <a href="#" data-view-article="icon-toolbar" data-label="Toolbar" data-async="app/articles/icon-toolbar.html"></a>
-            <a href="#" data-view-article="icon-social" data-label="Social"  data-async="app/articles/icon-social.html"></a>
-            <a href="#" data-view-article="icon-item" data-label="Item" data-async="app/articles/icon-item.html"></a>
+            <a href="#" data-view-article="icon-symbol" data-label="Symbol" data-async="static/articles/icon-symbol.html"></a>
+            <a href="#" data-view-article="icon-media" data-label="Media" data-async="static/articles/icon-media.html"></a>
+            <a href="#" data-view-article="icon-toolbar" data-label="Toolbar" data-async="static/articles/icon-toolbar.html"></a>
+            <a href="#" data-view-article="icon-social" data-label="Social"  data-async="static/articles/icon-social.html"></a>
+            <a href="#" data-view-article="icon-item" data-label="Item" data-async="static/articles/icon-item.html"></a>
         </nav>
 
         <nav data-control="groupbar" data-article="list list-indented list-examples">
@@ -127,11 +127,11 @@
             name: 'Kitchen Sink',
             version: '2.1.0222',
             resources: [
-                'app/asides/features.html',
-                'app/asides/right.html',
-                'app/sections/form.html']
+                'static/asides/features.html',
+                'static/asides/right.html',
+                'static/sections/form.html']
         });
     </script>
-    <script src="app/app.js"></script>
+    <script src="static/javascripts/app.js"></script>
 </body>
 </html>

example/app/articles/buttons.html → example/static/articles/buttons.html


example/app/articles/data.html → example/static/articles/data.html


example/app/articles/environment.html → example/static/articles/environment.html


example/app/articles/grid.html → example/static/articles/grid.html


example/app/articles/icon-item.html → example/static/articles/icon-item.html


example/app/articles/icon-media.html → example/static/articles/icon-media.html


example/app/articles/icon-social.html → example/static/articles/icon-social.html


example/app/articles/icon-symbol.html → example/static/articles/icon-symbol.html


example/app/articles/icon-toolbar.html → example/static/articles/icon-toolbar.html


example/app/articles/list.html → example/static/articles/list.html


example/app/articles/notification.html → example/static/articles/notification.html


+ 1 - 1
example/app/articles/products.html

@@ -6,7 +6,7 @@
                 <small>Micro Mobile JavaScript Library</small>
             </a>
         </li>
-        <li data-image="http://cdn.tapquo.com/lungo/icon-144.png" data-view-section="list"  data-async="app/sections/list.html">
+        <li data-image="http://cdn.tapquo.com/lungo/icon-144.png" data-view-section="list"  data-async="static/sections/list.html">
             <strong>TukTuk</strong>
             <small>Lorem ipsum dolor sit amet</small>
         </li>

example/app/articles/theme.html → example/static/articles/theme.html


example/app/articles/touchevents.html → example/static/articles/touchevents.html


+ 16 - 16
example/app/asides/features.html

@@ -14,13 +14,13 @@
             </li>
 
             <!-- Layout & Navigation -->
-            <li data-view-section="layout" data-async="app/sections/layout.html">
+            <li data-view-section="layout" data-async="static/sections/layout.html">
                 <strong>Layout</strong>
                 <div class="tag right">5</div>
             </li>
 
             <!-- List -->
-            <li data-view-article="list" data-async="app/articles/list.html">
+            <li data-view-article="list" data-async="static/articles/list.html">
                 <strong>Lists</strong>
                 <div class="tag right">22</div>
             </li>
@@ -32,84 +32,84 @@
             </li>
 
             <!-- Asides -->
-            <li data-view-section="aside" data-async="app/sections/aside.html">
+            <li data-view-section="aside" data-async="static/sections/aside.html">
                 <strong>Aside</strong>
             </li>
 
             <!-- Menu -->
-            <li data-view-section="menu" data-async="app/sections/menu.html">
+            <li data-view-section="menu" data-async="static/sections/menu.html">
                 <div class="tag right">2</div>
                 <strong>Menu</strong>
             </li>
 
             <!-- Data-Attributes -->
-            <li data-view-article="data" data-async="app/articles/data.html">
+            <li data-view-article="data" data-async="static/articles/data.html">
                 <div class="tag right">9</div>
                 <strong>Data-attributes</strong>
             </li>
 
             <!-- Icons -->
-            <li data-view-article="icon-symbol" data-async="app/articles/icon-symbol.html">
+            <li data-view-article="icon-symbol" data-async="static/articles/icon-symbol.html">
                 <div class="tag right">+250</div>
                 <strong>Icons</strong>
             </li>
 
             <!-- Scrolls -->
-            <li data-view-section="scroll" data-async="app/sections/scroll.html">
+            <li data-view-section="scroll" data-async="static/sections/scroll.html">
                 <div class="tag right">2</div>
                 <strong>Scrolls</strong>
             </li>
 
             <!-- Touch Events -->
-            <li data-view-article="touchevents" data-async="app/articles/touchevents.html">
+            <li data-view-article="touchevents" data-async="static/articles/touchevents.html">
                 <div class="tag right">19</div>
                 <strong>Touch Events</strong>
             </li>
 
             <!-- Layout Events -->
-            <li data-view-section="layoutevents" data-async="app/sections/layoutevents.html">
+            <li data-view-section="layoutevents" data-async="static/sections/layoutevents.html">
                 <div class="tag right">2</div>
                 <strong>Layout Events</strong>
             </li>
 
             <!-- Notifications -->
-            <li data-view-article="notification" data-async="app/articles/notification.html">
+            <li data-view-article="notification" data-async="static/articles/notification.html">
                 <div class="tag right">8</div>
                 <strong>Notifications</strong>
             </li>
 
             <!-- Pull & Refresh -->
-            <li  data-view-section="pull" data-async="app/sections/pull.html">
+            <li  data-view-section="pull" data-async="static/sections/pull.html">
                 <div class="tag right">1</div>
                 <strong>Pull & Refresh</strong>
             </li>
 
             <!-- Carousel -->
-            <li data-view-section="carousel" data-async="app/sections/carousel.html">
+            <li data-view-section="carousel" data-async="static/sections/carousel.html">
                 <div class="tag right">1</div>
                 <strong>Carousel</strong>
             </li>
 
             <!-- Environment -->
-            <li data-view-article="environment" data-async="app/articles/environment.html">
+            <li data-view-article="environment" data-async="static/articles/environment.html">
                 <div class="tag right">1</div>
                 <strong>Environment</strong>
             </li>
 
             <!-- Buttons & Colours -->
-            <li data-view-article="buttons" data-async="app/articles/buttons.html">
+            <li data-view-article="buttons" data-async="static/articles/buttons.html">
                 <div class="tag right">14</div>
                 <strong>Buttons & Colours</strong>
             </li>
 
             <!-- Theme roller -->
-            <li  data-view-article="themeroller" data-async="app/articles/theme.html">
+            <li  data-view-article="themeroller" data-async="static/articles/theme.html">
                 <div class="tag right">4</div>
                 <strong>Theme roller</strong>
             </li>
 
             <!-- Grid System -->
-            <li data-view-article="grid" data-async="app/articles/grid.html">
+            <li data-view-article="grid" data-async="static/articles/grid.html">
                 <strong>Grid System</strong>
             </li>
         </ul>

example/app/asides/right.html → example/static/asides/right.html


example/assets/logo.png → example/static/images/logo.png


example/app/app.js → example/static/javascripts/app.js


example/app/sections/aside.html → example/static/sections/aside.html


+ 2 - 2
example/app/sections/carousel.html

@@ -3,8 +3,8 @@
         <div class="centered title">Photo Nº<span>1</span></div>
 
         <nav class="right">
-            <a href="#" data-action="carousel" data-direction="left" data-icon="left" class="button"></a>
-            <a href="#" data-action="carousel" data-direction="right" data-icon="right" class="button"></a>
+            <a href="#" data-action="carousel" data-direction="left" data-icon="arrow-left"></a>
+            <a href="#" data-action="carousel" data-direction="right" data-icon="arrow-right"></a>
         </nav>
     </header>
     <article id="carousel-article" class="active block" data-control="carousel">

example/app/sections/form.html → example/static/sections/form.html


+ 1 - 1
example/app/sections/layout.html

@@ -1,7 +1,7 @@
 <section id="layout" data-transition="slide">
     <header data-title="Layout" data-back="home">
         <nav class="right">
-            <button data-view-section="splash" data-async="app/sections/splash.html" data-label="splash"></button>
+            <button data-view-section="splash" data-async="static/sections/splash.html" data-label="splash"></button>
         </nav>
     </header>
 

example/app/sections/layoutevents.html → example/static/sections/layoutevents.html


example/app/sections/menu.html → example/static/sections/menu.html


example/app/sections/pull.html → example/static/sections/pull.html


example/app/sections/scroll.html → example/static/sections/scroll.html


example/app/sections/splash.html → example/static/sections/splash.html


example/stylesheets/app.css → example/static/stylesheets/app.css


+ 5 - 6
example/test.html

@@ -234,11 +234,10 @@
                 <a href="#" data-icon="user" class="button" data-article="products" data-view-article="folks"></a>
             </nav>
 
-            <!-- <img src="http://cdn.tapquo.com/lungo/logo.png" class="title centered"> -->
             <div class="title centered">Folks</div>
 
             <nav class="right">
-                <button data-icon="user" class="button" data-article="folks" data-label="Products" data-view-article="products" data-async="app/articles/products.html"></button>
+                <button data-icon="user" class="button" data-article="folks" data-label="Products" data-view-article="products" data-async="static/articles/products.html"></button>
             </nav>
         </header>
 
@@ -252,7 +251,7 @@
 
         <nav data-control="groupbar" data-article="folks">
             <a href="#" data-view-article="folks" data-label="Folks" data-count="11"></a>
-            <a href="#" data-view-article="products" data-async="app/articles/products.html" data-label="Products" id="products"></a>
+            <a href="#" data-view-article="products" data-async="static/articles/products.html" data-label="Products" id="products"></a>
         </nav>
 
         <article id="folks" class="active list scroll indente-d">
@@ -319,7 +318,7 @@
                         <small>Micro Mobile JavaScript Library</small>
                     </a>
                 </li>
-                <li data-image="http://cdn.tapquo.com/lungo/icon-144.png" data-view-section="list"  data-async="app/sections/list.html">
+                <li data-image="http://cdn.tapquo.com/lungo/icon-144.png" data-view-section="list"  data-async="static/sections/list.html">
                     <strong>TukTuk</strong>
                     <small>Lorem ipsum dolor sit amet</small>
                 </li>
@@ -437,7 +436,7 @@
                     </a>
                 </li>
 
-                <li data-view-article="products" data-title="Third Parties" data-async="app/articles/products.html">
+                <li data-view-article="products" data-title="Third Parties" data-async="static/articles/products.html">
                     <div class="tag right">5</div>
                     <strong>Products</strong>
                     <small>Fueled by coffee</small>
@@ -480,7 +479,7 @@
             version: '2.2',
             history: false
             //,
-            // resources: ['app/sections/list.html']
+            // resources: ['static/sections/list.html']
         });
 
         Lungo.ready(function() {

+ 1 - 1
packages/lungo.icon

@@ -1 +1 @@
-Subproject commit ee11e3604629a3b04d82ecfa8f6516849750c4a5
+Subproject commit ea9c96ed3937d9f8928fa14381063364b9f7369b

+ 1 - 1
src/modules/Lungo.Attributes.coffee

@@ -13,7 +13,7 @@ Lungo.Attributes =
     html: "<span class=\"tag theme count\">{{value}}</span>"
 
   pull:
-    selector: "section"
+    selector: "*"
     html: """
       <div class=\"{{value}}\" data-control=\"pull\" data-icon=\"down\" data-loading=\"black\">
         <strong>title</strong>