aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Schaaf <kevin.schaaf@palm.com>2012-12-10 13:16:57 -0800
committerKevin Schaaf <kevin.schaaf@palm.com>2012-12-10 13:16:57 -0800
commitcb581f5b60c3a498fb3b63272a71b0e013a7cd55 (patch)
treee45e38fbb26b21bbdbc2e16986fb0b2ea9d1e7e3
parent98fc74304c7ecedf10b8544bdedc40ac6f8e2ac4 (diff)
downloadbiblez-ng-cb581f5b60c3a498fb3b63272a71b0e013a7cd55.tar.gz
ENYO-1640: Start bootplate with more practical starter app.
Enyo-DCO-1.1-Signed-Off-By: Kevin Schaaf (kevin.schaaf@palm.com)
-rw-r--r--source/App.css9
-rw-r--r--source/App.js11
2 files changed, 12 insertions, 8 deletions
diff --git a/source/App.css b/source/App.css
index 9f7626f..1ae2687 100644
--- a/source/App.css
+++ b/source/App.css
@@ -2,9 +2,6 @@
Put anything you reference with "url()" in ../assets/
This way, you can minify your application, and just remove the "source" folder for production
*/
-#app {
- margin: 16px;
- border-radius: 4px;
- background-color: silver;
- padding: 16px;
-}
+.nice-padding {
+ padding: 15px;
+} \ No newline at end of file
diff --git a/source/App.js b/source/App.js
index 77dee2a..fa74204 100644
--- a/source/App.js
+++ b/source/App.js
@@ -1,10 +1,17 @@
enyo.kind({
name: "App",
+ kind: "FittableRows",
fit: true,
components:[
- {name: "hello", content: "Hello World", allowHtml: true, ontap: "helloWorldTap"}
+ {kind: "onyx.Toolbar", content: "Hello World"},
+ {kind: "enyo.Scroller", fit: true, components: [
+ {name: "main", classes: "nice-padding", allowHtml: true}
+ ]},
+ {kind: "onyx.Toolbar", components: [
+ {kind: "onyx.Button", content: "Tap me", ontap: "helloWorldTap"}
+ ]}
],
helloWorldTap: function(inSender, inEvent) {
- this.$.hello.addContent("<br/><b>hello</b> control was tapped");
+ this.$.main.addContent("The button was tapped.<br/>");
}
});