Skip to content

Commit

Permalink
Merge pull request #27 from yanhick/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
yanhick committed Jun 13, 2012
2 parents e0e1074 + 050a897 commit f957a5d
Show file tree
Hide file tree
Showing 2,278 changed files with 93,836 additions and 54,660 deletions.
3,819 changes: 277 additions & 3,542 deletions demo/market/bin/WebApp.js

Large diffs are not rendered by default.

49 changes: 27 additions & 22 deletions demo/market/bin/WebApp_js.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<title>French Tech</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=yes"/>
<!-- <link href="default.css" rel="stylesheet" type="text/css"> -->
<script type="text/javascript">
// method used to hide the navigation in phones
function init()
{
// Set a timeout...
setTimeout(function(){
// Hide the address bar!
window.scrollTo(0, 1);
}, 1);
}
</script>
</head>
<body onLoad="init()">
<script type="text/javascript" src="WebApp.js"></script>
<div id="haxe:trace"></div>
</body>
<!DOCTYPE html>
<html>
<head>
<title>French Tech</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<link href="default.css" rel="stylesheet" type="text/css">
<script type="text/javascript">
// method used to hide the navigation in phones
function init()
{
// Set a timeout...
setTimeout(function(){
// Hide the address bar!
window.scrollTo(0, 1);
}, 1);
}
</script>
<!-- following metadata are used so that the webapp behaves like a "real" app once shortcut is added to the springboard (hidden url & navigation bars) -->
<meta name="apple-mobile-web-app-capable" content="yes" />
<link rel="apple-touch-icon-precomposed" href="./native_apps/App_512.png"/>
<link rel="apple-touch-startup-image" href="./splashScreens/splash-screen-320x460.png">
<link rel="apple-touch-startup-image" href="./splashScreens/splash-screen-640x920.png">
</head>
<body>
<script type="text/javascript" src="WebApp.js"></script>
<div id="haxe:trace"></div>
</body>
</html>
Binary file removed demo/market/bin/assets/200-156_purple.png
Binary file not shown.
Binary file removed demo/market/bin/assets/200-156_red.png
Binary file not shown.
Binary file removed demo/market/bin/assets/400-156.png
Binary file not shown.
Binary file added demo/market/bin/assets/Frenchweb-Logo-700x700.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/market/bin/assets/Silicon-Sentier.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed demo/market/bin/assets/rss-icon.png
Binary file not shown.
Binary file added demo/market/bin/assets/techcrunch-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/market/bin/assets/tile_french-tech.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/market/bin/assets/tile_french-tech2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
699 changes: 0 additions & 699 deletions demo/market/bin/data/feed3.rss

This file was deleted.

81 changes: 45 additions & 36 deletions demo/market/bin/default.css
Original file line number Diff line number Diff line change
@@ -1,37 +1,46 @@
* {

width: auto;
height: auto;

min-width: 0;
max-width: none;
min-height: 0;
max-height: none;

margin: 0;
padding: 0;

line-height: normal;
vertical-align: baseline;

position: static;

font-size: medium;

top: auto;
bottom: auto;
left: auto;
right: auto;

float: none;
clear: none;

font-family:serif;
color:black;
text-decoration:none;

/*box-sizing:border-box;
-moz-box-sizing:border-box; /* Firefox */
/*-webkit-box-sizing:border-box; /* Safari */

* {

/*width: auto;
height: auto;
min-width: 0;
max-width: none;
min-height: 0;
max-height: none;
margin: 0;
padding: 0;
line-height: normal;
vertical-align: baseline;
position: static;
font-size: medium;
top: auto;
bottom: auto;
left: auto;
right: auto;
float: none;
clear: none;
font-family:serif;
color:black;
text-decoration:none;*/

/*box-sizing:border-box;
-moz-box-sizing:border-box; /* Firefox */
/*-webkit-box-sizing:border-box; /* Safari */

/* Done to avoid default mobile Safari tap color */
-webkit-tap-highlight-color: rgba(0,0,0,0);
/* This will disable user selection (orange border on click) in Firefox and WebKit */
-webkit-user-select:none;
-moz-user-select:none;

/* used to have native scroll in iOS5 */
/*-webkit-overflow-scrolling: touch;*/

}
Binary file removed demo/market/bin/native_apps/App_114.png
Binary file not shown.
Binary file added demo/market/bin/native_apps/App_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f957a5d

Please sign in to comment.