From 7a15b1d953d241b22a5ef876bf991e146bca8c5a Mon Sep 17 00:00:00 2001 From: Markus Grigull Date: Mon, 28 Sep 2015 13:59:06 +0200 Subject: [PATCH] Add properties-table component --- app/components/properties-table.js | 6 +++ app/styles/app.css | 42 +++++++++---------- app/templates/components/properties-table.hbs | 10 +++++ app/templates/lab-mashup.hbs | 13 +----- 4 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 app/components/properties-table.js create mode 100644 app/templates/components/properties-table.hbs diff --git a/app/components/properties-table.js b/app/components/properties-table.js new file mode 100644 index 0000000..b47b62e --- /dev/null +++ b/app/components/properties-table.js @@ -0,0 +1,6 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'table', + classNames: ['properties-table'] +}); diff --git a/app/styles/app.css b/app/styles/app.css index ed1af53..fff2f7e 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -6,11 +6,11 @@ html, body { body { background: #ccc; color: #4d4d4d; - + min-width: 300px; max-width: 1500px; margin: 0 auto; - + font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 300; font-smoothing: antialiased; @@ -26,18 +26,18 @@ body { background: #fff; box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1); - + margin: 150px 0 40px 0; position: relative; } #lapMashupApp h1 { color: rgba(95, 95, 95, 0.7); - + position: absolute; top: -175px; width: 100%; - + font-size: 70px; font-weight: 100; text-align: center; @@ -48,7 +48,7 @@ body { #main { border-top: 1px solid #e6e6e6; - + padding: 20px; position: relative; z-index: 2; @@ -57,18 +57,18 @@ body { #footer { color: #777; border-top: 1px solid #e6e6e6; - + padding: 10px 15px; height: 20px; - + text-align: center; } #info { color: #777; - + margin: 65px auto 0; - + font-size: 12px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-align: center; @@ -76,37 +76,37 @@ body { #last-update-info { margin: 30px auto auto 0; - + font-size: 12px; text-align: center; } -#properties-table { +.properties-table { background: #eee; - + border: 1px solid #999; border-collapse: collapse; - + width: 50%; margin: 0 auto; } -#properties-table th { +.properties-table th { background: #ddd; - + border: 1px solid #999; border-collapse: collapse; - + padding: 5px; - + font-size: 16px; } -#properties-table td { +.properties-table td { border: 1px solid #999; border-collapse: collapse; - + padding: 5px; - + font-size: 14px; } diff --git a/app/templates/components/properties-table.hbs b/app/templates/components/properties-table.hbs new file mode 100644 index 0000000..4e843c4 --- /dev/null +++ b/app/templates/components/properties-table.hbs @@ -0,0 +1,10 @@ + + Name + Value + +{{#each properties as |property|}} + + {{property.name}} + {{property.value}} {{property.unit}} + +{{/each}} diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs index f3c85a6..d955b10 100644 --- a/app/templates/lab-mashup.hbs +++ b/app/templates/lab-mashup.hbs @@ -1,14 +1,3 @@
- - - - - - {{#each model as |property|}} - - - - - {{/each}} -
NameValue
{{property.name}}{{property.value}} {{property.unit}}
+ {{properties-table properties=model}}