javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace .content with main

Browse Source
This commit is contained in:
Adam Bradley
2013-08-24 21:09:20 -05:00
parent c2dda4448a a7e66c5f8e
commit a49e1170a6
11 changed files with 130 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -3,5 +3,4 @@
all: release all: release
release: release:
@sass -I scss/ scss/framework-structure.scss:dist/framework-structure.css @sass -I scss/ scss/framework-with-default-theme.scss:dist/framework-with-theme.css
@sass -I scss/ scss/framework-theme-default.scss:dist/framework-theme-default.css

8
dist/framework-with-theme.css vendored
View File

@ -18,7 +18,7 @@ ul {
margin: 0; margin: 0;
padding: 0; } padding: 0; }
.content { main {
position: fixed; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
@ -30,7 +30,7 @@ ul {
/* Hack to force all relatively and absolutely positioned elements still render while scrolling /* 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) */ Note: This is a bug for "-webkit-overflow-scrolling: touch" (via ratchet) */
.content > * { main > * {
-webkit-transform: translateZ(0px); -webkit-transform: translateZ(0px);
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. /* 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 */ Note: For these to work, content must come after both bars in the markup */
.bar ~ .content { .bar ~ main {
top: 50px; } top: 50px; }
.bar ~ .content { .bar ~ main {
bottom: 50px; } bottom: 50px; }
/* Bar docked to bottom used for primary app navigation */ /* Bar docked to bottom used for primary app navigation */

2
example/angular/index.html
View File

@ -20,7 +20,7 @@
<h1 class="title">Customers</h1> <h1 class="title">Customers</h1>
</header> </header>
<main class="content" ng-controller="CustomersCtrl"> <main ng-controller="CustomersCtrl">
<div ng-view class="pane reveal-animation"></div> <div ng-view class="pane reveal-animation"></div>
</main> </main>
<script src="../../js/framework/framework-list.js"></script> <script src="../../js/framework/framework-list.js"></script>

8
example/buttons.html
View File

@ -29,11 +29,9 @@
<body> <body>
<header class="bar bar-header bar-dark"> <header data-template="primary-header"></header>
<h1 class="title">Willkommen!</h1>
</header>
<main class="content content-padded"> <main class="content-padded">
<p> <p>
<a class="button button-default" href="grid.html">Default</a> <a class="button button-default" href="grid.html">Default</a>
<a class="button button-secondary" href="index.html">Secondary</a> <a class="button button-secondary" href="index.html">Secondary</a>
@ -59,7 +57,7 @@
<script src="../js/jquery/jquery-1.10.2.js"></script> <script src="../js/jquery/jquery-1.10.2.js"></script>
<script src="../js/framework/framework-utilities.js"></script> <script src="../js/framework/framework-events.js"></script>
<script src="../js/framework/framework-navigation.js"></script> <script src="../js/framework/framework-navigation.js"></script>
<script src="../js/framework/framework-buttons.js"></script> <script src="../js/framework/framework-buttons.js"></script>
<script src="../js/framework/test/event-listeners.js"></script> <script src="../js/framework/test/event-listeners.js"></script>

20
example/grid.html
View File

@ -1,19 +1,12 @@
<html> <html>
<head> <head>
<title>Grid</title>
<link rel="stylesheet" href="../dist/framework-structure.css"> <link rel="stylesheet" href="../dist/framework-structure.css">
<link rel="stylesheet" href="../dist/framework-theme-default.css"> <link rel="stylesheet" href="../dist/framework-theme-default.css">
<title>Grid</title>
</head> </head>
<body> <body>
<header data-template="primary-header"></header>
<header class="bar-header">
<a class="button-prev" data-history-go="-1" href="#">
Previous
</a>
<h1 class="title">Willkommen!</h1>
</header>
<main> <main>
<p> <p>
@ -27,17 +20,10 @@
</p> </p>
</main> </main>
<footer class="bar-footer"></footer> <footer class="bar-footer"></footer>
<script id="framework-globals" type="text/globals">
asdfasf
</script>
<script src="../js/jquery/jquery-1.10.2.js"></script> <script src="../js/jquery/jquery-1.10.2.js"></script>
<script src="../js/framework/framework-utilities.js"></script> <script src="../js/framework/framework-events.js"></script>
<script src="../js/framework/framework-navigation.js"></script> <script src="../js/framework/framework-navigation.js"></script>
<script src="../js/framework/test/event-listeners.js"></script> <script src="../js/framework/test/event-listeners.js"></script>
<script src="../js/framework/framework-init.js"></script> <script src="../js/framework/framework-init.js"></script>

73
example/index.html
View File

@ -28,7 +28,7 @@
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
<header class="bar bar-header bar-secondary framework-global" data-global-id="primary-header"> <header class="bar bar-header bar-secondary" data-template="primary-header">
<a class="button button-previous" href="#"> <a class="button button-previous" href="#">
<i class="icon-arrow-left"></i> <i class="icon-arrow-left"></i>
</a> </a>
@ -39,70 +39,27 @@
</header> </header>
<main> <main>
<ul class="list">
<a href="#" class="list-item">
Sasafras
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Candy
<i class="icon-arrow-right"></i>
</a>
<li class="list-divider">Other things</li>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
</ul>
<p> <p>
Here is some content <a class="button button-default" href="buttons.html">Button Examples</a>
</p>
<p>
<a class="button button-default" href="listview.html">List View Example</a>
</p>
<p>
<a class="button button-default" href="grid.html">Grid Example</a>
</p> </p>
<a class="button button-default">Click me</a>
</main> </main>
<footer class="bar bar-footer bar-secondary"> <footer class="bar bar-footer bar-secondary">
<h1 class="title">Auf Wiedersehen</h1> <h1 class="title">Auf Wiedersehen</h1>
</footer> </footer>
<script src="../js/jquery/jquery-1.10.2.js"></script>
<script src="../js/framework/framework-events.js"></script>
<script src="../js/framework/framework-navigation.js"></script>
<script src="../js/framework/framework-buttons.js"></script>
<script src="../js/framework/test/event-listeners.js"></script>
<script src="../js/framework/framework-init.js"></script>
</body> </body>
</html> </html>

101
example/listview.html
View File

@ -1,30 +1,93 @@
<html> <html>
<head> <head>
<link rel="stylesheet" href="../dist/framework-structure.css"> <meta charset="utf-8">
<link rel="stylesheet" href="../dist/framework-theme-default.css"> <title>List View</title>
<title>Listview</title>
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- Makes your prototype chrome-less once bookmarked to your phone's home screen -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<!-- Set a shorter title for iOS6 devices when saved to home screen -->
<meta name="apple-mobile-web-app-title" content="">
<!-- Set Apple icons for when prototype is saved to home screen -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="touch-icons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="touch-icons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="touch-icons/apple-touch-icon-57x57.png">
<link rel="stylesheet" href="../dist/framework-with-theme.css">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet">
<link rel="stylesheet" href="app.css">
<script src="app.js"></script>
</head> </head>
<body> <body>
<header class="bar-header"> <header data-template="primary-header"></header>
<a class="button-prev" data-history-go="-1" href="#">
Previous
</a>
<h1 class="title">Willkommen!</h1>
</header>
<main> <main>
<p> <ul class="list">
<a class="button button-default" href="grid.html">Grid</a> <a href="#" class="list-item">
</p> Sasafras
<p> <i class="icon-arrow-right"></i>
<a class="button button-primary" href="listview.html">List View</a> </a>
</p> <a href="#" class="list-item">
<p> Candy
<a class="button button-secondary" href="index.html">Home</a> <i class="icon-arrow-right"></i>
</p> </a>
<li class="list-divider">Other things</li>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
<a href="#" class="list-item">
Cheese cords
<i class="icon-arrow-right"></i>
</a>
</ul>
</main> </main>
@ -37,7 +100,7 @@
<script src="../js/jquery/jquery-1.10.2.js"></script> <script src="../js/jquery/jquery-1.10.2.js"></script>
<script src="../js/framework/framework-utilities.js"></script> <script src="../js/framework/framework-events.js"></script>
<script src="../js/framework/framework-navigation.js"></script> <script src="../js/framework/framework-navigation.js"></script>
<script src="../js/framework/test/event-listeners.js"></script> <script src="../js/framework/test/event-listeners.js"></script>
<script src="../js/framework/framework-init.js"></script> <script src="../js/framework/framework-init.js"></script>

8
js/framework/framework-list.js
View File

@ -1,5 +1,5 @@
(function(window, document, framework) { (function(window, document, framework) {
framework.Tabs = function() {} framework.List = function() {}
framework.List.prototype._TAB_ITEM_CLASS = 'tab-item'; framework.List.prototype._TAB_ITEM_CLASS = 'tab-item';
@ -16,8 +16,8 @@
} }
}; };
document.addEventListener('mousedown', framework.Tabs.prototype._onTouchStart); document.addEventListener('mousedown', framework.List.prototype._onTouchStart);
document.addEventListener('touchstart', framework.Tabs.prototype._onTouchStart); document.addEventListener('touchstart', framework.List.prototype._onTouchStart);
document.addEventListener('touchend', framework.Tabs.prototype._onTouchEnd); document.addEventListener('touchend', framework.List.prototype._onTouchEnd);
})(this, document, this.FM = this.FM || {}); })(this, document, this.FM = this.FM || {});

0
js/framework/framework-page.js
View File

17
js/framework/framework-templates.js Normal file
View File

@ -0,0 +1,17 @@
'use strict';
(function(window, document, framework) {
var x;
function collectTemplates() {
for(x=0; x<document.elements.length; x++) {
}
}
framework.on("ready", function(){
framework.collectTemplates();
});
})(this, document, this.FM = this.FM || {});

4
js/framework/framework-utilities.js
View File

@ -1,4 +0,0 @@
(function(window, document, framework) {
})(this, document, this.FM = this.FM || {});