Skip to content

Commit

Permalink
Current style is okay for now
Browse files Browse the repository at this point in the history
  • Loading branch information
shijiezhou1 committed Jul 30, 2019
1 parent ede7bdb commit 80380a3
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 44 deletions.
5 changes: 4 additions & 1 deletion app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
{{sidebar-left category=category}}
{{sidebar-right}}
{{!--{{outlet 'onlyApp'}}--}}
{{outlet}}
<div class="application_container layout-row layout-align-center">
{{outlet}}
<div class="fakeHeight"></div>
</div>
9 changes: 3 additions & 6 deletions app/templates/culture.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
<div class="application_container">
<div class="layout-row layout-align-center">
<h3>culture</h3>
{{article-share-menu}}
</div>
</div>
<h3>
Culture
</h3>
6 changes: 1 addition & 5 deletions app/templates/design.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
<div class="application_container">
<div class="layout-row layout-align-center">
<h3>design</h3>
</div>
</div>
<h3>Design</h3>
30 changes: 11 additions & 19 deletions app/templates/home.hbs
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
{{!-- TODO find a way to combine application container and flex container together, because we used those tag in three different place already.
{{! TODO find a way to combine application container and flex container together, because we used those tag in three different place already.
it is alway locate on the center of the page
--}}
<div class="application_container layout-row layout-align-center">
{{!-- <div class="grid-container">--}}
{{!-- {{#each post as |value|}}--}}
{{!-- {{article-list value=value}}--}}
{{!-- {{/each}}--}}
{{!-- </div>--}}
<div class="flex-container">
{{#each evenPost as |value|}}
{{article-list value=value articleClick=(action "submit")}}
{{/each}}
</div>
<div class="flex-container">
{{#each oddPost as |value|}}
{{article-list value=value articleClick=(action "submit")}}
{{/each}}
</div>
}}
<div class="flex-container">
{{#each evenPost as |value|}}
{{article-list value=value articleClick=(action "submit")}}
{{/each}}
</div>
<div class="fakeHeight"></div>
<div class="flex-container">
{{#each oddPost as |value|}}
{{article-list value=value articleClick=(action "submit")}}
{{/each}}
</div>
19 changes: 8 additions & 11 deletions app/templates/post.hbs
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<div class="application_container layout-row layout-align-center">
<div class="flex-container">
<h2>Welcome to Ember mirage</h2>
</div>
</div>
{{!--<h2 id="title">--}}
{{!-- Welcome to Ember mirage--}}
{{!--</h2>--}}
<h3>
Welcome to this post
</h3>
{{!<h2 id="title">}}
{{! Welcome to Ember mirage}}
{{!</h2>}}
{{!--{{#each model as |post|}}--}}
{{!-- {{#link-to "posts" post.id}}--}}
{{!-- {{post.title}}--}}
{{!-- {{/link-to}}--}}
{{!-- <br />--}}
{{! <br />}}
{{!--{{/each}}--}}
{{!--<br />--}}

{{!<br />}}
{{!--Title:{{model.title}}<br>--}}
{{!--Text:{{model.text}}<br>--}}
4 changes: 2 additions & 2 deletions app/templates/tech.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="application_container">
<div class="">
<div class="layout-row layout-align-center">
<h3>
tech
Tech
</h3>
</div>
<div class="layout-row layout-align-center">
Expand Down

0 comments on commit 80380a3

Please sign in to comment.