diff --git a/Makefile b/Makefile index 47a1887e95..0fb9a11d37 100644 --- a/Makefile +++ b/Makefile @@ -3,5 +3,4 @@ all: release release: - @sass -I scss/ scss/framework-structure.scss:dist/framework-structure.css - @sass -I scss/ scss/framework-theme-default.scss:dist/framework-theme-default.css \ No newline at end of file + @sass -I scss/ scss/framework-with-default-theme.scss:dist/framework-with-theme.css diff --git a/dist/framework-with-theme.css b/dist/framework-with-theme.css index 12ddc7bbf7..3f98a9898e 100644 --- a/dist/framework-with-theme.css +++ b/dist/framework-with-theme.css @@ -18,7 +18,7 @@ ul { margin: 0; padding: 0; } -.content { +main { position: fixed; top: 0; right: 0; @@ -30,7 +30,7 @@ ul { /* Hack to force all relatively and absolutely positioned elements still render while scrolling Note: This is a bug for "-webkit-overflow-scrolling: touch" (via ratchet) */ -.content > * { +main > * { -webkit-transform: translateZ(0px); transform: translateZ(0px); } @@ -98,10 +98,10 @@ ul { /* Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab. Note: For these to work, content must come after both bars in the markup */ -.bar ~ .content { +.bar ~ main { top: 50px; } -.bar ~ .content { +.bar ~ main { bottom: 50px; } /* Bar docked to bottom used for primary app navigation */ diff --git a/example/angular/index.html b/example/angular/index.html index 59f162b3ef..f820fc2fec 100644 --- a/example/angular/index.html +++ b/example/angular/index.html @@ -20,7 +20,7 @@

Customers

-
+
diff --git a/example/buttons.html b/example/buttons.html index 052379a162..badc167552 100644 --- a/example/buttons.html +++ b/example/buttons.html @@ -29,11 +29,9 @@ -
-

Willkommen!

-
+
-
+

Default Secondary @@ -59,7 +57,7 @@ - + diff --git a/example/grid.html b/example/grid.html index 3717ff9e9c..fd98446cea 100644 --- a/example/grid.html +++ b/example/grid.html @@ -1,19 +1,12 @@ + Grid - Grid - -

- - Previous - -

Willkommen!

-
- +

@@ -27,17 +20,10 @@

-
- - - - - + diff --git a/example/index.html b/example/index.html index d3d8b3856d..c8769aa53c 100644 --- a/example/index.html +++ b/example/index.html @@ -28,7 +28,7 @@ -
+
@@ -39,70 +39,27 @@
-

- Here is some content + Button Examples +

+

+ List View Example +

+

+ Grid Example

- Click me

Auf Wiedersehen

+ + + + + + + diff --git a/example/listview.html b/example/listview.html index a204ea45fd..3993fafcf9 100644 --- a/example/listview.html +++ b/example/listview.html @@ -1,30 +1,93 @@ - - - Listview + + List View + + + + + + + + + + + + + + + + + + + + + + + -
- - Previous - -

Willkommen!

-
+
-

- Grid -

-

- List View -

-

- Home -

+
@@ -37,7 +100,7 @@ - + diff --git a/js/framework/framework-list.js b/js/framework/framework-list.js index b6c7c8c7b1..74e696be59 100644 --- a/js/framework/framework-list.js +++ b/js/framework/framework-list.js @@ -1,5 +1,5 @@ (function(window, document, framework) { - framework.Tabs = function() {} + framework.List = function() {} framework.List.prototype._TAB_ITEM_CLASS = 'tab-item'; @@ -16,8 +16,8 @@ } }; - document.addEventListener('mousedown', framework.Tabs.prototype._onTouchStart); - document.addEventListener('touchstart', framework.Tabs.prototype._onTouchStart); - document.addEventListener('touchend', framework.Tabs.prototype._onTouchEnd); + document.addEventListener('mousedown', framework.List.prototype._onTouchStart); + document.addEventListener('touchstart', framework.List.prototype._onTouchStart); + document.addEventListener('touchend', framework.List.prototype._onTouchEnd); })(this, document, this.FM = this.FM || {}); diff --git a/js/framework/framework-page.js b/js/framework/framework-page.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/js/framework/framework-templates.js b/js/framework/framework-templates.js new file mode 100644 index 0000000000..b1307469b1 --- /dev/null +++ b/js/framework/framework-templates.js @@ -0,0 +1,17 @@ +'use strict'; + +(function(window, document, framework) { + + var x; + + function collectTemplates() { + for(x=0; x