Merge branch 'feature/tweak-layout' into master

This commit is contained in:
Leonard Smith 2020-12-18 09:33:47 -06:00
commit 8326a5cb1a
5 changed files with 6 additions and 18 deletions

View File

@ -1,7 +1,6 @@
import Component from '@glimmer/component';
import { inject as service } from '@ember/service';
import { tracked } from "@glimmer/tracking";
import showdown from 'showdown';
export default class LexiconEntryComponent extends Component {
@service('word-select') selectedWord;

View File

@ -1,5 +1,5 @@
<tr {{on "click" (fn this.select @model)}} class="{{this.selected}}" ...attributes>
<td>{{@model.greek}}</td>
<td>{{@model.ulb}}</td>
<td>{{@model.greek}}</td>
<td>{{@model.morph}}</td>
</tr>

View File

@ -5,10 +5,12 @@ import { action } from '@ember/object';
export default class WordsWordRowComponent extends Component {
@service('word-select') selectWord;
@service router;
@action
select(word) {
this.selectWord.select(word);
this.router.transitionTo('verse.word', word.strongsNumber);
}
get

View File

@ -1,8 +1,8 @@
<h4>Word Details</h4>
<table class="word-details" ...attributes>
<thead>
<th>Greek</th>
<th>ULB</th>
<th>Greek</th>
<th>Morphology</th>
</thead>
{{#each @model as |word|}}

View File

@ -1,24 +1,11 @@
<div class="container">
<h1>{{model.reference}}</h1>
<BsNav
@type="tabs"
@justified={{true}}
@stacked={{false}}
@fill={{true}} as |nav|
>
<nav.item>
<nav.link-to @route="index">Verse Details</nav.link-to>
</nav.item>
<nav.item>
<nav.link-to @route="verse">Commentary</nav.link-to>
</nav.item>
</BsNav>
<div class="row">
<div class="col-12">
<h4>Greek</h4>
<p><Words::GreekText @model={{model.words}} /></p>
<h4>ULB</h4>
<p>{{model.ulbText}}</p>
<h4>Greek</h4>
<p><Words::GreekText @model={{model.words}} /></p>
</div>
</div>
<div class="row">