Skip to content

Commit d3a02cd

Browse files
alexdilibertoalexdiliberto
committed
Added bootstrap to update demo app
1 parent 3f42fb8 commit d3a02cd

File tree

14 files changed

+184
-107
lines changed

14 files changed

+184
-107
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [Unreleased][unreleased]
6+
### Added
7+
- Nothing!
8+
9+
10+
## [0.5.0] - 2015-10-17
611
### Updated
712
- `README.md` "Update Demo App" instructions
813
- `package.json` and `bower.json` dependencies
14+
- Demo app now uses Bootstrap
915

1016

1117
## [0.4.0] - 2015-09-19
@@ -130,7 +136,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
130136
- Initial transformicons
131137

132138

133-
[unreleased]: https://github.com/alexdiliberto/ember-cli-transformicons/compare/v0.4.0...HEAD
139+
[unreleased]: https://github.com/alexdiliberto/ember-cli-transformicons/compare/v0.5.0...HEAD
140+
[0.5.0]: https://github.com/alexdiliberto/ember-cli-transformicons/compare/v0.4.0...0.5.0
134141
[0.4.0]: https://github.com/alexdiliberto/ember-cli-transformicons/compare/v0.3.2...v0.4.0
135142
[0.3.2]: https://github.com/alexdiliberto/ember-cli-transformicons/compare/v0.3.0...v0.3.2
136143
[0.3.0]: https://github.com/alexdiliberto/ember-cli-transformicons/compare/v0.2.0...v0.3.0

‎bower.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"ember-qunit-notifications": "0.1.0",
1010
"jquery": "^2.1.4",
1111
"loader.js": "ember-cli/loader.js#3.3.0",
12-
"qunit": "~1.19.0"
12+
"qunit": "~1.19.0",
13+
"bootstrap": "~3.3.5"
1314
},
1415
"resolutions": {
1516
"ember": "2.1.0"

‎ember-cli-build.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ module.exports = function(defaults) {
1212
This build file does *not* influence how the addon or the app using it
1313
behave. You most likely want to be modifying `./index.js` or app's build file
1414
*/
15+
app.import('bower_components/bootstrap/dist/css/bootstrap.css');
16+
app.import('bower_components/bootstrap/dist/css/bootstrap.css.map', { destDir: 'assets' });
17+
app.import('bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot', { destDir: 'fonts' });
18+
app.import('bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg', { destDir: 'fonts' });
19+
app.import('bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf', { destDir: 'fonts' });
20+
app.import('bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff', { destDir: 'fonts' });
21+
app.import('bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2', { destDir: 'fonts' });
1522

1623
return app.toTree();
1724
};

‎tests/dummy/app/app.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import config from './config/environment';
55

66
var App;
77

8+
Ember.LinkComponent.reopen({
9+
attributeBindings: ['role']
10+
});
11+
812
Ember.MODEL_FACTORY_INJECTIONS = true;
913

1014
App = Ember.Application.extend({

‎tests/dummy/app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<title>Dummy</title>
77
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
99

1010
{{content-for 'head'}}
1111

‎tests/dummy/app/styles/app.scss‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
1-
html,
2-
body {
3-
font-family: Helvetica, Arial, sans-serif;
4-
margin: 10px;
5-
}
6-
7-
.site-nav > a {
8-
display: inline-block;
9-
padding: 10px;
10-
margin: 0 10px 0 0;
11-
text-decoration: none;
12-
box-shadow: 0px 0px 5px #888;
13-
border-radius: 3px;
14-
background-color: #EEE;
15-
color: #444;
16-
opacity: .7;
17-
-webkit-transition: .3s;
18-
transition: .3s;
19-
&:hover, &:focus, &.active {
20-
opacity: 1;
21-
}
1+
html {
2+
font-size: 16px;
223
}
234

245
.mail {
25-
padding-bottom: 15px;
6+
margin-bottom: 15px;
267
display: inline-block;
278
}

‎tests/dummy/app/templates/add.hbs‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
<h2>Add</h2>
2-
<h3>animation</h3>
3-
<code>\{{t-add}}</code> {{t-add id="add-default"}}
4-
<code>\{{t-add a="minus"}}</code> {{t-add a="minus"}}
5-
<code>\{{t-add a="check"}}</code> {{t-add a="check"}}
6-
<code>\{{t-add a="typo"}}</code> {{t-add a="typo"}}
1+
<div class="row">
2+
<div class="col-xs-12">
3+
<h2>Add</h2>
4+
<h3>animation</h3>
5+
</div>
6+
</div>
7+
<div class="row">
8+
<div class="col-xs-12 col-sm-6">
9+
<code>\{{t-add}}</code> {{t-add id="add-default"}}
10+
<code>\{{t-add a="minus"}}</code> {{t-add a="minus"}}
11+
</div>
12+
<div class="col-xs-6">
13+
<code>\{{t-add a="check"}}</code> {{t-add a="check"}}
14+
<code>\{{t-add a="typo"}}</code> {{t-add a="typo"}}
15+
</div>
16+
</div>
17+
<div class="row">
18+
<div class="col-xs-12">
19+
<h3>is-added</h3>
20+
<code>\{{t-add is-added=true}}</code> {{t-add is-added=true}}
721

8-
<h3>is-added</h3>
9-
<code>\{{t-add is-added=true}}</code> {{t-add is-added=true}}
10-
11-
<h3>action</h3>
12-
<code>\{{t-add is-added=isAdded action=(action "updateAddControllerProperty")}}</code> {{t-add is-added=isAdded action=(action "updateAddControllerProperty")}}
13-
<p>isAdded = {{isAdded}}</p>
22+
<h3>action</h3>
23+
<code>\{{t-add is-added=isAdded action=(action "updateAddControllerProperty")}}</code> {{t-add is-added=isAdded action=(action "updateAddControllerProperty")}}
24+
<p>isAdded = {{isAdded}}</p>
25+
</div>
26+
</div>

‎tests/dummy/app/templates/application.hbs‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
<h1 id="title">ember-cli-transformicons</h1>
1+
<div class="container">
2+
<div class="page-header">
3+
<h1>ember-cli-transformicons</h1>
4+
</div>
5+
<div class="row">
6+
<div class="col-xs-12">
7+
<nav class="btn-group" role="group">
8+
{{link-to 'Menu' 'menu' class="btn btn-default" role="button"}}
9+
{{link-to 'Grid' 'grid' class="btn btn-default" role="button"}}
10+
{{link-to 'Add' 'add' class="btn btn-default" role="button"}}
11+
{{link-to 'Remove' 'remove' class="btn btn-default" role="button"}}
12+
{{link-to 'Mail' 'mail' class="btn btn-default" role="button"}}
13+
{{link-to 'Video' 'video' class="btn btn-default" role="button"}}
14+
{{link-to 'Loader' 'loader' class="btn btn-default" role="button"}}
15+
</nav>
16+
</div>
17+
</div>
218

3-
<nav class="site-nav">
4-
{{link-to 'Menu' 'menu'}}
5-
{{link-to 'Grid' 'grid'}}
6-
{{link-to 'Add' 'add'}}
7-
{{link-to 'Remove' 'remove'}}
8-
{{link-to 'Mail' 'mail'}}
9-
{{link-to 'Video' 'video'}}
10-
{{link-to 'Loader' 'loader'}}
11-
</nav>
12-
13-
{{outlet}}
19+
{{outlet}}
20+
</div>

‎tests/dummy/app/templates/grid.hbs‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
<h2>Grid</h2>
2-
<h3>animation</h3>
3-
<code>\{{t-grid}}</code> {{t-grid id="grid-default"}}
4-
<code>\{{t-grid a="rearrange"}}</code> {{t-grid a="rearrange"}}
5-
<code>\{{t-grid a="collapse"}}</code> {{t-grid a="collapse"}}
6-
<code>\{{t-grid a="typo"}}</code> {{t-grid a="typo"}}
1+
<div class="row">
2+
<div class="col-xs-12">
3+
<h2>Grid</h2>
4+
<h3>animation</h3>
5+
</div>
6+
</div>
7+
<div class="row">
8+
<div class="col-xs-12 col-sm-6">
9+
<code>\{{t-grid}}</code> {{t-grid id="grid-default"}}
10+
<code>\{{t-grid a="rearrange"}}</code> {{t-grid a="rearrange"}}
11+
</div>
12+
<div class="col-xs-6">
13+
<code>\{{t-grid a="collapse"}}</code> {{t-grid a="collapse"}}
14+
<code>\{{t-grid a="typo"}}</code> {{t-grid a="typo"}}
15+
</div>
16+
</div>
17+
<div class="row">
18+
<div class="col-xs-12">
19+
<h3>is-open</h3>
20+
<code>\{{t-grid is-open=true}}</code> {{t-grid is-open=true}}
721

8-
<h3>is-open</h3>
9-
<code>\{{t-grid is-open=true}}</code> {{t-grid is-open=true}}
10-
11-
<h3>action</h3>
12-
<code>\{{t-grid is-open=isGridOpen action=(action "updateGridControllerProperty")}}</code> {{t-grid is-open=isGridOpen action=(action "updateGridControllerProperty")}}
13-
<p>isGridOpen = {{isGridOpen}}</p>
22+
<h3>action</h3>
23+
<code>\{{t-grid is-open=isGridOpen action=(action "updateGridControllerProperty")}}</code> {{t-grid is-open=isGridOpen action=(action "updateGridControllerProperty")}}
24+
<p>isGridOpen = {{isGridOpen}}</p>
25+
</div>
26+
</div>

‎tests/dummy/app/templates/loader.hbs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
<h2>Loader</h2>
1+
<div class="row">
2+
<div class="col-xs-12">
3+
<h2>Loader</h2>
24

3-
<code>\{{t-loader}}</code> {{t-loader id="loader-default"}}
5+
<h3>animation</h3>
6+
<code>\{{t-loader}}</code> {{t-loader id="loader-default"}}
7+
</div>
8+
</div>

0 commit comments

Comments
 (0)