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.

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

GSoD2020 new Interactive Book structure #474

Merged
merged 33 commits into from
Oct 14, 2020

Conversation

danielluehr
Copy link
Contributor

This PR includes the proposed new structure of the book.

All chapters (directories) and sections (md files in each chapter directory) contain only minimal content:

  • Front matter
  • Main heading
  • Chapter TOC (pointing to sections, generated automatically using jeckyll's liquid and JTD structure)
  • Section TOC code ("internal" jekyll/JTD processing)

Also, a new utility directory was created. It includes a python script which can generate the chapter and sections directory and files from a chapter template written in yaml (examples are included). It also include some helper emacs' lisp code to use org-mode source files to generate the MD files. Org sources can also be created using the python script.

  • chapter creation script
  • chapter template yaml file
  • example yaml files (used to populate the new proposed structure of the book)
  • org-mode helper lisp code

Error occurred when yaml chapter description does not include all levels (basic, medium, advanced)
Also, add missing .no_toc property for the Table of contents header.
@@ -0,0 +1,3 @@
---
---
{% include css/just-the-docs.scss.liquid color_scheme="circuitversedark" %}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Invalid CSS after "...uitversedark" %": expected "{", was "}"

@@ -0,0 +1,3 @@
---
---
{% include css/just-the-docs.scss.liquid color_scheme="circuitverse" %}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Invalid CSS after "...circuitverse" %": expected "{", was "}"

display: inline;
}
&.active {
list-style: disc url('/assets/images/nav-marker-active.svg') inside;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

.nav-list-item {
.nav-list-link{
display: inline;
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rule declaration should be followed by an empty line

list-style: circle url('/assets/images/nav-marker-inactive.svg') inside;

.nav-list-item {
.nav-list-link{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opening curly brace { should be preceded by one space
Selector should have depth of applicability no greater than 2, but was 3


.main {
@include mq(md) {
position: relative;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered margin-left, max-width, position

min-width: $nav-width;
}
&.active {
display: none;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 4 spaces, but was indented 6 spaces

@include mq(lg) {
width: calc((100% - #{$nav-width + $content-width}) / 4 + #{$nav-width});
min-width: $nav-width;
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@include declaration should be followed by an empty line

}

@include mq(lg) {
width: calc((100% - #{$nav-width + $content-width}) / 4 + #{$nav-width});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered min-width, width

background-color: $sidebar-color;

@include mq(md) {
flex-wrap: nowrap;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered align-items, border-right, flex-direction, flex-wrap, height, position, width

Copy link
Member

@Shivansh2407 Shivansh2407 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danielluehr the changes look good to me. Nice work done 👍 .

Some Things that need to be fixed :

  1. The Alignment of Headings in Sidebar with down arrow and without down arrow is different.

  2. The Edit on CircuitVerse currently is shown at the Bottom, shouldn't it be the same as shown in the top right as a button. Let me know your views.

  3. The Conflicting files needs to fixed. I guess this has happened because Daniel has not pulled from the Master again after the first PR got merged in GSOD2020 branch.

  4. The previous and the next buttons have been removed. Any specific reasons?

For all the above things mentioned, we can open up new issues and put them in the slack channel so that the new/existing contributors can help us with this. This way Daniel can focus more on the Documentation work and creating New content for the Book 📖

@satu0king Please have a look and let me know your views

has_children: false
---

# IEEE Standar 754
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo fix: Standard

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same goes for utils/chapters/ch_binary_algebra.yml : Line 35

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

Sorry for creating the conflicts... I was so anxious to upload the changes that I forgot to merge upstream first...

I am submitting a new PR with the merge conflicts solved (I hope). Also, it includes the fix for the "Standard" typo.

Regarding the other comments I just want to provide complementary information:

  1. The current version (pre-GSoD2020) didn't use 2-level (i.e. chapters and sections), maybe it wasn't implemented in JTD at the time, but now it is a feature of JTD, but it needs proper styling in the navbar. Also the sections in the chapter (when the navbar is expanded) don't seem to have a consistent style (they are plain gray). It is the same in the current version (check the Flip-flops page and sub-pages, for an example). I will open an issue so anyone available and interested in fixing the styling can work on it.
  2. I kept the "original" JTD "edit on github" link (which goes at the bottom) and added a link to the github repository on top. The idea is to stop breaking things with the upstream JTD Gem. In any case the links at the top need to get proper styling.
    However, if you want to move the edit on github button to the top, I would recommend it to go in the same button bar as the sidebar button, and the code can be put in the corresponding include file.
  3. (already mentioned above)
  4. The Prev/Next buttons liquid code started failing with the current JTD theme. I haven't investigated the reason. And it completely failed (jekyll wouldn't generate the site) when I added the full new structure (with chapters and sections). I will also open an issue so someone can start working on it and fix the prev/next navigation buttons.

Thanks!

# Conflicts:
#	README.md
#	_config.yml
#	_includes/content_header.html
#	docs/binary-algebra/index.md
#	docs/binary-representation/index.md
It probably should go inside an "About" chapter together with other misc sections.
Copy link
Member

@Shivansh2407 Shivansh2407 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working Well @danielluehr 🎉. I agree with you that we can open issues for the GSOD 2020 branch so that other contributors can also fix them while you can focus on content creation.
#475 and #476 were opened earlier.
Another possible issue is, when the sidebar button is clicked all the elements get shifted to left, while only the breadcrumb navigation element remains there. This should also sync with other elements when shifting to the left is what I think. let me know your views.
@satu0king please review this and merge accordingly 👍

@danielluehr
Copy link
Contributor Author

Working Well @danielluehr tada. I agree with you that we can open issues for the GSOD 2020 branch so that other contributors can also fix them while you can focus on content creation.
#475 and #476 were opened earlier.
Another possible issue is, when the sidebar button is clicked all the elements get shifted to left, while only the breadcrumb navigation element remains there. This should also sync with other elements when shifting to the left is what I think. let me know your views.
@satu0king please review this and merge accordingly +1

About the sidebar alignment, you are right. I just copied the positioning calculations from the previous style to the new one and I think it needs double checking. Also, the breadcrumb was not used in the previous design, so its positioning was not updated, I think it is safe to style it accordingly and later it can be decided whether to keep or not the breadcrumbs.

Thanks!

@satu0king satu0king merged commit 6aa8c98 into CircuitVerse:GSoD2020 Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants