Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop verse table cells and fix tests #246

Merged
merged 2 commits into from
Mar 2, 2019
Merged

Drop verse table cells and fix tests #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51eead7
Upstream dropped verse table cells, fixing tests
obilodeau Mar 2, 2019
ff4eb9e
Dropping verse table cells support. Just like upstream in its 2.0
obilodeau Mar 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions templates/table.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ table(id=@id class=['tableblock',"frame-#{attr :frame, 'all'}","grid-#{attr :gri
- cell_content = cell.text
- else
- case cell.style
- when :verse, :literal
- when :literal
- cell_content = cell.text
- else
- cell_content = cell.content
Expand All @@ -35,8 +35,6 @@ table(id=@id class=['tableblock',"frame-#{attr :frame, 'all'}","grid-#{attr :gri
- case cell.style
- when :asciidoc
div=cell_content
- when :verse
.verse=cell_content
- when :literal
.literal: pre=cell_content
- when :header
Expand Down
4 changes: 2 additions & 2 deletions test/doctest/table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
<p class="tableblock"><strong>Strong text</strong></p>
</td>
<td class="tableblock halign-left valign-top">
<div class="verse">Verse block</div>
<p class="tableblock">Verse block</p>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -508,7 +508,7 @@
</tr>
<tr>
<td class="tableblock halign-left valign-top">
<div class="verse">This cell contains a verse that may one day expound on the wonders of tables in an epic sonnet.</div>
<p class="tableblock">This cell contains a verse that may one day expound on the wonders of tables in an epic sonnet.</p>
</td>
</tr>
</tbody>
Expand Down