-
Notifications
You must be signed in to change notification settings - Fork 3
Add support for HTML books #16
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
96 commits
Select commit
Hold shift + click to select a range
51ec5e6
Changed Materials and You to support rendering books with HTML
paypur 06f6608
Updated assets and styling
paypur d74bf08
Added linking between content
paypur e39fe95
Added styling to remaining elements
paypur 736b1ba
Updated resources
paypur 0d40a70
Updated resources
paypur afbaf04
Added puny melting HTMLs
paypur bd4e604
Renamed blank pages
paypur 99a6272
Added Mighty Melting and Encyclopedia resources
paypur 61f4e6c
Updated Resources
paypur 9b257cc
Updated resources
paypur 0ec9ed6
Added Tinkers Gadgetry
paypur 875251d
Added links for Tinkers Gadgetry
paypur a1decb6
Fixed normal books not showing
paypur 3f8016e
Reverted normal books to original style
paypur 9fe5dbb
Updated resources
paypur 9e493c9
Updated resources
paypur 454dc54
Compressed all images
paypur dc96f4d
Updated resources
paypur 2e3230d
Increased gap between materials stats
paypur 68848cb
Updated resources
paypur b8852ef
Renamed images
paypur 4146374
Added back image books alongside HTML books
paypur 3e54db7
Fixed linking between books
paypur 95f4851
Updated resources
paypur 9cc1416
Fixed books sections
paypur e772a7d
Updated resources
paypur e7e701f
Compressed font
paypur 2afada8
Updated resources
paypur a0564f2
Updated resources for 3.10.2
paypur 0da1a2c
Merge remote-tracking branch 'origin/master' into paypur
paypur 370d00c
Updated resources
paypur c4a2261
Dummy
paypur aa41786
Fixed link to image books
paypur f87f1f7
Worked on image rescaling
paypur 4018bf6
Moved html pages to individual paths
paypur faa6647
Added buttons between book pages
paypur ee05d1b
Unused
paypur d135c55
Added other covers and buttons
paypur 9f8543d
Oops
paypur 9a5e6eb
Updated resources
paypur 1659286
Moved HTML book pages into individual paths
paypur bf7a82d
Added linking between HTML books
paypur bed3fc1
Added back button
paypur 4d9dbde
Fixed missing FluidEffectContent
paypur bfbe95e
Moved cover to center
paypur f9ad57a
Fixed unnecessary redirects
paypur 10843cb
Recompressed images correctly hopefully
paypur 39bac8b
Fixed incorrect scale for normal images
paypur 72fa00d
Small changes
paypur 8cfc5f2
Added prefetching to HTML books
paypur 16f7788
Fixed puny smelting back button
paypur ee06631
Added prefetching between HTML books
paypur 226a2ab
Updated resources
paypur a8b947f
Fixed breadcrumbs
paypur dcf16a5
Added tooltips to icon links
paypur b42952b
Changed anchor style for html book pages
paypur 6530eeb
Deleted unused minecraft font
paypur 24acfd7
Added cross to 0
paypur 555ea61
Fixed link color outside of html book pages
paypur a2b5410
Fixed upside down characters
paypur 759f287
Added trait description as tooltips
paypur 7ebe5c4
Updated content
paypur bbeefc3
Mostly updated to new content
paypur ceebc91
Merge remote-tracking branch 'upstream/HEAD'
paypur 4f5003f
Finished update
paypur a70a5a3
Merge remote-tracking branch 'upstream/master'
paypur ac2b4b2
Merge remote-tracking branch 'origin/master'
paypur 6813d5a
Updated to tinkers 3.11.0
paypur 926a171
Fixed fluid effect lists
paypur 8b1f4f3
Fixed prefetching for different book versions
paypur 6eaa35d
Deleted 3.10.2 images
paypur 9910d3f
Reverted normal pages
paypur 42d3b63
Compressed all 3.11.0 images again
paypur 942748c
Reverted spacing
paypur 4fd0f6a
Fixed ContentListing overflowing
paypur 24c1c59
Merge remote-tracking branch 'upstream/HEAD'
paypur df66423
Reverted uikit css file
paypur 0d15c4d
Removed accidental symlink
paypur ee3e75a
Reverted images for older versions
paypur bc50040
Renamed css class
paypur 34778c3
Removed all autogenerated files
paypur 5f6d64b
Merge remote-tracking branch 'upstream/HEAD'
paypur 3e44b99
Style changes
paypur 72bc32b
Split up css and js files
paypur 40a05cc
Moved arrows
paypur e32cb1a
Separated html and image books
paypur 164f5af
Moved stuff
paypur 9cc43aa
Merged grid-icon-list
paypur f8ff859
Removed unused file
paypur 3ea97a9
Changed to scss
paypur 9327a70
Moved arrows and scss files again
paypur 5d9a039
Forgot to include minetip.js in html
paypur a066deb
Increased size of 3 wide icon list
paypur 05f847b
Removed script
paypur 144eb82
Added book arrows
paypur File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,3 +3,6 @@ _site | |
| .jekyll-cache | ||
| .jekyll-metadata | ||
| vendor | ||
|
|
||
| .idea | ||
| .bundle | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| Click a book below to read the contents. Note that addon content along with interactive elements such as animations and tooltips will not be available. The best source for book content is always the in game books. | ||
| Click a book below to read the contents. Note that addon content will not be available. Interactive elements such as navigation and tooltips are partially available in the HTML versions. The best source for book content is always the in game books. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,33 @@ | ||
| {% if include.html %} | ||
| {% assign prefix = "../" %} | ||
| {% assign suffix = " (HTML)" %} | ||
| {% assign link_suffix = "-html/cover" %} | ||
| {%- endif -%} | ||
| <nav class="navigation"> | ||
| <ul class="uk-pagination"> | ||
| {%- if include.previous -%} | ||
| <li> | ||
| {%- if include.previous.link -%} | ||
| <a href="../{{include.previous.link}}"> | ||
| <a href="../{{ prefix | append: include.previous.link | append: link_suffix }}/"> | ||
| {%- else -%} | ||
| <a href="../{{include.previous.title | slugify }}"> | ||
| <a href="../{{ prefix }}{{ include.previous.title | slugify | append: link_suffix }}/"> | ||
| {%- endif -%} | ||
| <span class="uk-margin-small-right" uk-pagination-previous></span> | ||
| {{ include.previous.title | default: include.previous.link }} | ||
| </a></li> | ||
| <span class="uk-margin-small-right" uk-pagination-previous></span> | ||
| {{ include.previous.title | default: include.previous.link | append: suffix }} | ||
| </a> | ||
| </li> | ||
| {%- endif -%} | ||
| {%- if include.next -%} | ||
| <li class="uk-margin-auto-left"> | ||
| {%- if include.next.link -%} | ||
| <a href="../{{include.next.link}}"> | ||
| <a href="../{{ prefix | append: include.next.link | append: link_suffix }}/"> | ||
| {%- else -%} | ||
| <li><a href="../{{include.next.title | slugify }}"> | ||
| <a href="../{{ prefix }}{{ include.next.title | slugify | append: link_suffix }}/"> | ||
| {%- endif -%} | ||
| {{ include.next.title | default: include.next.link }} | ||
| <span class="uk-margin-small-left" uk-pagination-next></span> | ||
| </a></li> | ||
| {{ include.next.title | default: include.next.link | append: suffix }} | ||
| <span class="uk-margin-small-left" uk-pagination-next></span> | ||
| </a> | ||
| </li> | ||
| {%- endif -%} | ||
| </ul> | ||
| </nav> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| --- | ||
| layout: page | ||
| --- | ||
| {%- assign book = site.data.books[page.book] -%} | ||
| {% if page.page_num == -1 %} | ||
| {% assign cover = "-1" %} | ||
| {% endif %} | ||
| {% if page.page_num == 0 %} | ||
| {% assign left_page = "cover" %} | ||
| {% else %} | ||
| {% assign sub = page.page_num | minus: 1 %} | ||
| {% assign left_page = "page-" | append: sub %} | ||
| {% endif %} | ||
| <div class="mc-font-black book-page-html"> | ||
| {% if page.page_num == -1 %} | ||
| <img src="/assets/images/book/{{ book.path }}/cover.png" alt="" style="padding-left: 206px; padding-right: 206px;"> | ||
| {% else %} | ||
| <img src="/assets/images/book/{{ book.path }}/clean_{{ page.page_num }}.png" alt=""> | ||
| {% endif %} | ||
| {{ content }} | ||
| {% unless page.page_num < 1 %} | ||
| <a href="../page-0/" class="back-arrow"><img src="/assets/images/book/arrows/{{ book.arrows }}/back.png" alt=""></a> | ||
| {% endunless %} | ||
| {% unless page.page_num == -1 %} | ||
| <a href="../{{ left_page }}/" class="left-arrow"><img src="/assets/images/book/arrows/{{ book.arrows }}/left.png" alt=""></a> | ||
| {% endunless %} | ||
| {% unless page.page_num == book.max_page %} | ||
| <a href="../page-{{ page.page_num | plus: 1 }}/" class="right-arrow{{ cover }}"><img src="/assets/images/book/arrows/{{ book.arrows }}/right.png" alt=""></a> | ||
| {% endunless %} | ||
| </div> | ||
| <p>Click on the arrows, icons, and links to navigate the book.</p> | ||
|
|
||
| <link rel="stylesheet" href="{{ "/assets/css/book-html.css" | relative_url }}{{cache_buster}}"/> | ||
| <script src="/assets/js/book-html.js"></script> | ||
| <script src="/assets/js/minetip.js" defer></script> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.