Skip to content

Commit 810efe4

Browse files
committed
Merge branch 'show-addon-version-in-docs' of https://github.com/heyjinkim/ember-concurrency into heyjinkim-show-addon-version-in-docs
2 parents 2b19e7f + 889270f commit 810efe4

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed
+10-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
11
import Ember from 'ember';
2-
export default Ember.Controller;
2+
import config from '../config/environment';
3+
4+
const versionRegExp = /\d[.]\d[.]\d/;
5+
const {
6+
APP: { version }
7+
} = config;
8+
9+
export default Ember.Controller.extend({
10+
addonVersion: version.match(versionRegExp)[0]
11+
});

tests/dummy/app/application/template.hbs

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<div class="container navbar">
22
<div class="row">
33
<div class="ten columns">
4-
<h3>ember-concurrency</h3>
4+
<h3 style="float:left;">
5+
ember-concurrency
6+
7+
<span style="font-size: 0.5em;">
8+
(v {{addonVersion}})
9+
</span>
10+
</h3>
511
</div>
612
<div class="one columns">
713
<div class="nav-bar-link-outer">
@@ -19,4 +25,3 @@
1925
{{outlet}}
2026

2127
{{ember-notify}}
22-

tests/dummy/app/styles/app.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ a {
1616
}
1717

1818
.navbar {
19-
a {
19+
.nav-bar-link-outer a {
20+
text-decoration: none;
2021
color: black;
2122
line-height: 6rem;
2223
padding: 2rem 2rem;

0 commit comments

Comments
 (0)