Merge pull request mozilla-b2g#1075 from krellian/owa

Experimental Market app which wraps Labs' existing (and working) app directory
lambdabaa · Mar 28, 2012 · 8b547e6 · 8b547e6
2 parents 29d757f + 0e099ef
commit 8b547e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/apps/market/index.html b/apps/market/index.html
@@ -7,5 +7,6 @@
     <link rel="stylesheet" type="text/css" media="screen" href="style/market.css"/>
   </head>
   <body>
+    <iframe src="https://apps.mozillalabs.com/appdir/" />
   </body>
 </html>
diff --git a/apps/market/manifest.appcache b/apps/market/manifest.appcache
@@ -1,9 +1,8 @@
 CACHE MANIFEST
-# Version 15c2268756d50bcef26f601664fbad9d
+# Version 9bcdd542f79bc474be6afe656f3d8312
 index.html
 
 manifest.json
 style/icons/Market.png
-style/images/market.png
 style/market.css
 http://gaiamobile.org/webapi.js
diff --git a/apps/market/style/images/market.png b/apps/market/style/images/market.png
diff --git a/apps/market/style/market.css b/apps/market/style/market.css
@@ -1,9 +1,5 @@
-html, body {
-  font-family: "Roboto", sans-serif;
-  font-size: 16px;
-  background-color: rgb(210, 210, 210);
-  background-image: url(images/market.png);
-  background-position: 0 -32px;
-  background-repeat: no-repeat;
-}
-
+html, body, iframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,6 @@ @@
         <link rel="stylesheet" type="text/css" media="screen" href="style/market.css"/>
       </head>
       <body>
+        <iframe src="https://apps.mozillalabs.com/appdir/" />
       </body>
     </html>