Skip to content

Commit 1541bf9

Browse files
authored
Merge pull request #871 from ember-learn/edit-pencil
Fix styling of title and pencil
2 parents 4ed6555 + c66eb65 commit 1541bf9

File tree

6 files changed

+49
-13
lines changed

6 files changed

+49
-13
lines changed

app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{content-for "head"}}
1111

1212
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/app.css">
13+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-api-docs.css">
1414
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet">
1515

1616
{{content-for "head-footer"}}

app/styles/app.css

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.article-title-wrapper {
2+
display: flex;
3+
justify-content: space-between;
4+
align-items: center;
5+
}
6+
7+
.module-name {
8+
display: inline-block;
9+
margin-bottom: 0;
10+
}
11+
12+
.access {
13+
color: #fff;
14+
background-color: var(--color-gray-600);
15+
margin-left: var(--spacing-1);
16+
padding: 0.25rem var(--spacing-1);
17+
font-size: var(--font-size-md);
18+
border-radius: var(--radius);
19+
vertical-align: middle;
20+
}
21+
22+
main a.edit-icon {
23+
height: 1rem;
24+
width: 16px;
25+
display: inline-block;
26+
background: none;
27+
}

app/templates/project-version/classes/class.hbs

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{{! template-lint-disable no-action }}
22
<article class="chapter">
3-
{{#if (and @model.project.id @model.file @model.line (is-latest version=@model.projectVersion.version allVersions=this.allVersions))}}
4-
<a data-tooltip="Edit on Github" class="heading__link__edit" href="{{github-link @model.project.id @model.projectVersion.version @model.file @model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "fa-pencil"}}</a>
5-
{{/if}}
6-
<h1 class="module-name">Class {{@model.name}}</h1>
7-
{{#if @model.access}}<span class="access">{{@model.access}}</span>{{/if}}
3+
<div class="article-title-wrapper">
4+
<h1 class="module-name">Class {{@model.name}}
5+
{{#if @model.access}}
6+
<span class="access">{{@model.access}}</span>
7+
{{/if}}
8+
</h1>
9+
{{#if (and @model.project.id @model.file @model.line (is-latest version=@model.projectVersion.version allVersions=this.allVersions))}}
10+
<a data-tooltip="Edit on Github" class="edit-icon" href="{{github-link @model.project.id @model.projectVersion.version @model.file @model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "pen"}}</a>
11+
{{/if}}
12+
</div>
813
<hr>
914
<div class="attributes">
1015
{{#if @model.extends}}

app/templates/project-version/modules/module.hbs

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<article class="chapter">
2-
{{#if (eq this.model.name 'ember-data-overview')}}
3-
<h1 class="module-name">EmberData Overview</h1>
4-
{{else}}
5-
<h1 class="module-name">Package {{this.model.name}}</h1>
6-
{{/if}}
7-
{{#if this.model.access}}<span class="access">{{this.model.access}}</span>{{/if}}
2+
<div class="article-title-wrapper">
3+
{{#if (eq this.model.name 'ember-data-overview')}}
4+
<h1 class="module-name">EmberData Overview</h1>
5+
{{else}}
6+
<h1 class="module-name">Package {{this.model.name}}
7+
{{#if this.model.access}}<span class="access">{{this.model.access}}</span>{{/if}}
8+
</h1>
9+
{{/if}}
10+
</div>
811
<hr>
912

1013
<p class="attributes">

public/assets/images/pen.svg

+1
Loading

tests/acceptance/release-url-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ module('Acceptance | release URL', function (hooks) {
77

88
test('specifying release instead of specific version in URL should go to the latest release', async function (assert) {
99
await visit('ember/release/classes/Application');
10-
assert.dom('h1.module-name').hasText('Class Application');
10+
assert.dom('h1.module-name').includesText('Class Application');
1111
});
1212
});

0 commit comments

Comments
 (0)