Skip to content

Commit

Permalink
add list dividers
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelcobain committed Feb 10, 2015
1 parent fc87486 commit ad9c2bd
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 5 deletions.
14 changes: 14 additions & 0 deletions addon/components/paper-divider.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import Ember from 'ember';

export default Ember.Component.extend({
tagName:'md-divider',
attributeBindings:['insetAttr:md-inset'],
classNames:['paper-divider','md-default-theme'],
/*
* Not binding boolean values in Ember 1.8.1?
* https://github.com/emberjs/ember.js/issues/9595
*/
insetAttr:function(){
return this.get('inset') ? 'md-inset' : null;
}.property('inset')
});
2 changes: 2 additions & 0 deletions addon/styles/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,7 @@
@import 'paper-toggle';
@import 'paper-text';
@import 'paper-list';
@import 'paper-divider';
@import 'paper-whiteframe';

@import 'paper-sidenav';
13 changes: 13 additions & 0 deletions addon/styles/scss/paper-divider.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
md-divider {
display: block;
border-top: 1px solid;
margin: 0;

&[md-inset] {
margin-left: $baseline-grid * 10;
}
}

md-divider.md-#{$theme-name}-theme {
border-top-color: $foreground-quarternary-color;
}
15 changes: 15 additions & 0 deletions addon/styles/scss/paper-whiteframe.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.md-whiteframe-z1 {
box-shadow: $whiteframe-shadow-z1;
}
.md-whiteframe-z2 {
box-shadow: $whiteframe-shadow-z2;
}
.md-whiteframe-z3 {
box-shadow: $whiteframe-shadow-z3;
}
.md-whiteframe-z4 {
box-shadow: $whiteframe-shadow-z4;
}
.md-whiteframe-z5 {
box-shadow: $whiteframe-shadow-z5;
}
3 changes: 3 additions & 0 deletions app/components/paper-divider.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import PaperDivider from 'ember-paper/components/paper-divider';

export default PaperDivider;
File renamed without changes.
3 changes: 2 additions & 1 deletion tests/dummy/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ Router.map(function() {
this.route('radio');
this.route('toggle');
this.route('typography');
this.route('lists');
this.route('list');
this.route('divider');
this.route('navigation');
this.route('textfield');
//this.route('index',);
Expand Down
5 changes: 5 additions & 0 deletions tests/dummy/app/routes/divider.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Ember from 'ember';

export default Ember.Route.extend({
controllerName: 'list'
});
3 changes: 2 additions & 1 deletion tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<li>{{#link-to "index"}}Introduction{{/link-to}}</li>
<li>{{#link-to "navigation"}}Navigation{{/link-to}}</li>
<li>{{#link-to "typography"}}Typography{{/link-to}}</li>
<li>{{#link-to "lists"}}Lists{{/link-to}}</li>
<li>{{#link-to "list"}}Lists{{/link-to}}</li>
<li>{{#link-to "divider"}}Dividers{{/link-to}}</li>
<li>{{#link-to "button"}}Button{{/link-to}}</li>
<li>{{#link-to "checkbox"}}Checkbox{{/link-to}}</li>
<li>{{#link-to "toggle"}}Toggle{{/link-to}}</li>
Expand Down
69 changes: 69 additions & 0 deletions tests/dummy/app/templates/divider.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<h3>Dividers</h3>

<h4>Full width dividers</h4>
{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-list}}
{{#each listData}}
{{#paper-item}}
{{#paper-tile-left}}
<img {{bind-attr src=face alt=who}} class="face">
{{/paper-tile-left}}

{{#paper-tile-content}}
<h3>{{what}}</h3>
<h4>{{who}}</h4>
<p>
{{notes}}
</p>
{{/paper-tile-content}}
{{/paper-item}}
{{paper-divider}}
{{/each}}
{{/paper-list}}
{{/paper-content}}

<h4>Inset dividers</h4>
{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-list}}
{{#each listData}}
{{#paper-item}}
{{#paper-tile-left}}
<img {{bind-attr src=face alt=who}} class="face">
{{/paper-tile-left}}

{{#paper-tile-content}}
<h3>{{what}}</h3>
<h4>{{who}}</h4>
<p>
{{notes}}
</p>
{{/paper-tile-content}}
{{/paper-item}}
{{paper-divider inset=true}}
{{/each}}
{{/paper-list}}
{{/paper-content}}

<h3>Template</h3>
<pre>
\{{#paper-content classNames="md-whiteframe-z1"}}
\{{#paper-list}}
\{{#each listData}}
\{{#paper-item}}
\{{#paper-tile-left}}
&lt;img \{{bind-attr src=face alt=who}} class=&quot;face&quot;&gt;
\{{/paper-tile-left}}

\{{#paper-tile-content}}
&lt;h3&gt;\{{what}}&lt;/h3&gt;
&lt;h4&gt;\{{who}}&lt;/h4&gt;
&lt;p&gt;
\{{notes}}
&lt;/p&gt;
\{{/paper-tile-content}}
\{{/paper-item}}
\{{paper-divider}} \{{! OR \{{paper-divider inset=true}} }}
\{{/each}}
\{{/paper-list}}
\{{/paper-content}}
</pre>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h3>Lists</h3>
<div class="preview-block list-demo">

<div class="list-demo">

{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
{{#paper-list}}
{{#each listData}}
{{#paper-item}}
Expand All @@ -19,11 +19,12 @@
{{/paper-item}}
{{/each}}
{{/paper-list}}

{{/paper-content}}
</div>

<h3>Template</h3>
<pre>
\{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
\{{#paper-list}}
\{{#each listData}}
\{{#paper-item}}
Expand All @@ -41,4 +42,5 @@
\{{/paper-item}}
\{{/each}}
\{{/paper-list}}
\{{/paper-content}}
</pre>

2 comments on commit ad9c2bd

@stefanpenner
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will look really nice with the htmlbars HTML syntax.

@miguelcobain
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally! I think I've already dreamed with that some nights ago.

Please sign in to comment.