Skip to content

Commit

Permalink
#5 Final touch ups to the demo prior to release.
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Sep 29, 2017
1 parent c8f0bb1 commit 53e7c38
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 11 deletions.
1 change: 1 addition & 0 deletions install_ember_addons.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh

ember install ember-cli-app-version
ember install ember-cli-bootstrap3-sass
ember install ember-cli-deploy
ember install ember-cli-deploy-build
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.14.2",
"ember-cli-app-version": "^3.1.0",
"ember-cli-bootstrap3-sass": "^1.0.6",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-deploy": "^1.0.1",
Expand Down
4 changes: 4 additions & 0 deletions tests/dummy/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ body {
padding-top: 50px; // for the fixed navbar
margin-bottom: 50%; // to allow scrolling beyond the end of the last example
}

footer {
margin-top: 50px;
}
30 changes: 20 additions & 10 deletions tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,26 @@
</div>
</nav>

<section class="container">
<div class="page-header">
<h1>
Demo
<img
src="http://badge.fury.io/gh/cybertoothca%2Fember-cli-bootstrap3-tooltip.svg"
alt="ember-cli-bootstrap3-tooltip version">
<img src="https://badge.fury.io/js/ember-cli-bootstrap3-tooltip.svg" alt="ember-cli-bootstrap3-tooltip npm"/>
</h1>
<section>
<div class="container">
<div class="page-header">
<h1>
Demo
<img
src="http://badge.fury.io/gh/cybertoothca%2Fember-cli-bootstrap3-tooltip.svg"
alt="ember-cli-bootstrap3-tooltip version">
<img src="https://badge.fury.io/js/ember-cli-bootstrap3-tooltip.svg" alt="ember-cli-bootstrap3-tooltip npm"/>
</h1>
</div>
</div>
</section>

{{outlet}}
{{outlet}}

<section>
<div class="container">
<footer class="text-center small">
Built with <code>ember-cli-bootstrap3-tooltip-{{app-version}}</code>
</footer>
</div>
</section>
19 changes: 18 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2138,6 +2138,13 @@ ember-ajax@^3.0.0:
dependencies:
ember-cli-babel "^6.0.0"

ember-cli-app-version@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.0.tgz#074b0330581a7b8ab094ff07fefb34e0d0254bfd"
dependencies:
ember-cli-babel "^6.8.0"
git-repo-version "0.4.1"

ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
version "5.2.4"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
Expand All @@ -2148,7 +2155,7 @@ ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"

ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.3.0, ember-cli-babel@^6.8.1:
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.3.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1:
version "6.8.2"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.2.tgz#eac2785964f4743f4c815cd53c6288f00cc087d7"
dependencies:
Expand Down Expand Up @@ -3381,6 +3388,16 @@ git-repo-info@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"

git-repo-info@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2"

[email protected]:
version "0.4.1"
resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.4.1.tgz#75fab9a0a4ec8470755b0eea7fdaa6f9d41453bf"
dependencies:
git-repo-info "~1.2.0"

glob-base@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
Expand Down

0 comments on commit 53e7c38

Please sign in to comment.