Merge branch 'Pumpkin-Spice'

LICENSE.mdown

@@ -1,7 +1,7 @@
 License
 =======
 
-Copyright 2010 Dave Balmer, Jr. All rights reserved.
+Copyright 2010-2013 Dave Balmer, Jr. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
 permitted provided that the following conditions are met:

README.mdown

@@ -43,16 +43,11 @@ Important files in the directory tree are:
   will need to build the library to make this file (as well as the un-minified
   version `jo.js` which is useful for debugging).
 
-- `css/aluminum`
+- `css/flattery/*`
 
-  This is a CSS3 bundle ready to ship your app with. Also serves as a good example
+  This is the new CSS3 bundle ready to ship your app with. Also serves as a good example
   of modern HTML5 styling capabilities. Looks pretty bad in IE up through version 8.
 
-- `css/jo.css`
-
-  This is a newer base CSS theme for Jo, preferred over Aluminum for now. Built with
-  Less CSS compiler.
-
 - `docs/*.mdown`
 
   These are supplimental doc files which are used by joDoc to build out the

build

@@ -2,13 +2,13 @@
 echo "Building jo.js"
 
 cd js/core
-cat log.js _jo.js dom.js event.js subject.js time.js yield.js cache.js clipboard.js local.js > ../jo.js
+cat log.js _jo.js dom.js event.js subject.js time.js yield.js cache.js clipboard.js local.js queue.js timer.js > ../jo.js
 
 cd ../data
-cat datasource.js record.js database.js sqldatasource.js filesource.js script.js preference.js yql.js dispatch.js >> ../jo.js
+cat datasource.js record.js database.js sqldatasource.js filesource.js script.js preference.js yql.js dispatch.js template.js >> ../jo.js
 
 cd ../ui
-cat interface.js collect.js view.js container.js control.js button.js list.js busy.js caption.js card.js stack.js scroller.js divider.js expando.js expandotitle.js flexrow.js focus.js footer.js gesture.js group.js html.js input.js label.js menu.js option.js passwordinput.js popup.js screen.js shim.js sound.js stackscroller.js tabbar.js table.js textarea.js title.js toolbar.js form.js dialog.js selectlist.js navbar.js select.js toggle.js slider.js >> ../jo.js
+cat interface.js collect.js view.js container.js control.js button.js list.js busy.js caption.js card.js stack.js scroller.js divider.js expando.js expandotitle.js flexrow.js focus.js footer.js gesture.js group.js html.js input.js label.js menu.js option.js passwordinput.js popup.js screen.js shim.js sound.js stackscroller.js tabbar.js table.js textarea.js title.js toolbar.js form.js dialog.js selectlist.js navbar.js select.js toggle.js slider.js image.js canvas.js >> ../jo.js
 
 cd ..
 echo "Done."

build.bat

@@ -6,13 +6,13 @@ goto wrongdir
 echo "Building js\jo.js"
 
 cd js\core
-copy log.js + _jo.js + dom.js + event.js + subject.js + time.js + yield.js + cache.js + clipboard.js + local.js ..\jo_core.js
+copy log.js + _jo.js + dom.js + event.js + subject.js + time.js + yield.js + cache.js + clipboard.js + local.js + timer.js + queue.js ..\jo_core.js
 
 cd ..\data
-copy datasource.js + record.js + database.js + filesource.js + sqldatasource.js + script.js + preference.js + yql.js + dispatch.js ..\jo_data.js
+copy datasource.js + record.js + database.js + filesource.js + sqldatasource.js + script.js + preference.js + yql.js + dispatch.js + template.js ..\jo_data.js
 
 cd ..\ui
-copy collect.js + interface.js + view.js + container.js + control.js + button.js + list.js + busy.js + caption.js + card.js + stack.js + scroller.js + divider.js + expando.js + expandotitle.js + flexrow.js + focus.js + footer.js + gesture.js + group.js + html.js + input.js + label.js + menu.js + option.js + passwordinput.js + popup.js + screen.js + shim.js + sound.js + stackscroller.js + tabbar.js + table.js + textarea.js + title.js + toolbar.js + form.js + dialog.js + selectlist.js + navbar.js + select.js + toggle.js + slider.js ..\jo_ui.js
+copy collect.js + interface.js + view.js + container.js + control.js + button.js + list.js + busy.js + caption.js + card.js + stack.js + scroller.js + divider.js + expando.js + expandotitle.js + flexrow.js + focus.js + footer.js + gesture.js + group.js + html.js + input.js + label.js + menu.js + option.js + passwordinput.js + popup.js + screen.js + shim.js + sound.js + stackscroller.js + tabbar.js + table.js + textarea.js + title.js + toolbar.js + form.js + dialog.js + selectlist.js + navbar.js + select.js + toggle.js + slider.js + image.js + canvas.js ..\jo_ui.js
 
 cd ..
 

css/bootstrap/jo.bootstrap.css

@@ -1005,3 +1005,31 @@ jobackbutton {
 	border-color: #424242;
 	font-size: 85%;
 }
+
+.nativescroll jostack { width: 100%; position: relative; }
+
+.nativescroll joscroller {
+  position: absolute;
+  display: block;
+  height: auto;
+  width: auto;
+  top: 0; left: 0; bottom: 0; right: 0;
+  overflow: auto;
+  padding: 0;
+  margin: 0;
+  -webkit-overflow-scrolling: touch;
+}
+
+.nativescroll jocontainer {
+    height: inherit;
+}
+
+.nativescroll joscroller {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+

css/flat/jo.flat.css

@@ -1001,3 +1001,31 @@ jobackbutton {
 	border-color: #424242;
 	font-size: 85%;
 }
+
+.nativescroll jostack { width: 100%; position: relative; }
+
+.nativescroll joscroller {
+  position: absolute;
+  display: block;
+  height: auto;
+  width: auto;
+  top: 0; left: 0; bottom: 0; right: 0;
+  overflow: auto;
+  padding: 0;
+  margin: 0;
+  -webkit-overflow-scrolling: touch;
+}
+
+.nativescroll jocontainer {
+    height: inherit;
+}
+
+.nativescroll joscroller {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+

css/flattery/README.md

@@ -0,0 +1,26 @@
+Jo Flattery Theme
+=================
+
+Clean, flat design style which uses a custom font for glyphs and no image files.
+
+- Simple cross-platform unified look for your app
+- Fast load time
+- Quick render time
+- Easy to customize
+- Easy to scale
+- Includes commonly-used glyphs in the custom font created with icomoon (feel
+free to create your own)
+
+Required Files
+--------------
+
+`jo-flattery.css` Main CSS file
+`jo-flattery.ttf` Glyph font
+`jo-flattery.woff` Glyph font for older MSIE browsers (and WP8)
+
+Build File
+----------
+
+`jo.flattery.less` requires less.js to build. Easy to tweak style preferences
+to suit your project (e.g. colors, size, spacing, rounding, borders).
+