Skip to content

Commit

Permalink
update cli, got css working
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Jul 24, 2014
1 parent af57336 commit a313f92
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/controllers/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ export default Ember.ObjectController.extend({

doneEditing: function() {
this.set('isEditing', false);
this.get('store').commit();
// this.store.commit();
}
});
16 changes: 9 additions & 7 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<h1 id='title'>Welcome to Ember.js</h1>

<div class="navbar">
<div class="navbar-inner">
<a class="brand" href="#">Bloggr</a>
<ul class="nav">
<li>{{#link-to 'posts'}}Posts{{/link-to}}</li>
<li>{{#link-to 'about'}}About{{/link-to}}</li>
</ul>
<div class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<div class="navbar-inner">
<a class="navbar-brand" href="#">Bloggr</a>
<ul class="nav navbar-nav">
<li>{{#link-to 'posts'}}Posts{{/link-to}}</li>
<li>{{#link-to 'about'}}About{{/link-to}}</li>
</ul>
</div>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions app/templates/posts.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span3">
<div class="row">
<div class="col-xs-3">
<table class='table'>
<thead>
<tr><th>Recent Posts</th></tr>
Expand All @@ -12,7 +12,7 @@
{{/each}}
</table>
</div>
<div class="span9">
<div class="col-xs-9">
{{outlet}}
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"author": "",
"license": "MIT",
"devDependencies": {
"ember-cli": "0.0.39",
"originate": "0.1.5",
"body-parser": "^1.2.0",
"broccoli-asset-rev": "0.0.17",
"broccoli-ember-hbs-template-compiler": "^1.5.0",
"ember-cli": "0.0.40",
"ember-cli-ember-data": "0.1.0",
"ember-cli-ic-ajax": "0.1.1",
"express": "^4.1.1",
"body-parser": "^1.2.0",
"glob": "^3.2.9",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-ember-data": "0.1.0",
"broccoli-asset-rev": "0.0.11"
"originate": "0.1.5"
}
}

0 comments on commit a313f92

Please sign in to comment.