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

Jump to bottom

Fix pageNav in tweaking the page structure #1127

Merged
merged 11 commits into from
Mar 24, 2020
Merged

Fix pageNav in tweaking the page structure #1127

merged 11 commits into from
Mar 24, 2020

Conversation

Tejas2805
Copy link
Contributor

@Tejas2805 Tejas2805 commented Mar 15, 2020 •
edited
Loading

Fixes #1097
What is the purpose of this pull request? (put "X" next to an item, remove the rest)

• [X] Documentation update
• [X] Bug fix

What is the rationale for this request?
The pageNav is missing filter tags.

What changes did you make? (Give an overview)
Updated the pageNav for tweaking the page structure to show filter tags too.

Provide some example code that this change will affect:
N.A.

Is there anything you'd like reviewers to focus on?
N.A.

Testing instructions:
Check the preview.

Proposed commit message: (wrap lines at 72 characters)

The pageNav for tweaking the page structure is missing filter tags.

Let's fix the headings in filter tags and the pageNav so that pageNav
display filter tags appropriately.

@Tejas2805
add _site to ignore list
538ff88
@Tejas2805
update highlighted text bg color
52e1afa
@Tejas2805
Merge branch 'master' of https://github.com/MarkBind/markbind
f3d3f34 
* 'master' of https://github.com/MarkBind/markbind:
  Update tests
  Allow using 'none' footer attribute in frontmatter (MarkBind#1002)
  Support line numbers for code blocks (MarkBind#991)
  2.11.0
  Update test files due to changes in PR MarkBind#982
  Update vue-strap version to v2.0.1-markbind.36
  Make highlighting bold (MarkBind#1045)
  Support markdown for header attr in dropdown (MarkBind#1029)
  Add '_site' to the ignored folders in site.json (MarkBind#1046)
  Use path.join instead of string interpolation (MarkBind#1052)
  Implement box markdown header attributes parsing (MarkBind#1025)
  Make the position of top navbar fixed (MarkBind#982)
  Exclude *.md files from being copied over on build (MarkBind#1010)

# Conflicts:
#	docs/css/main.css
@Tejas2805
Merge branch 'master' of https://github.com/MarkBind/markbind
31d0325 
* 'master' of https://github.com/MarkBind/markbind:
  2.12.0
  Update outdated test files
  Update vue-strap version to v2.0.1-markbind.37
  Fix refactor to processDynamicResources (MarkBind#1092)
  Implement lazy page building for markbind serve (MarkBind#1038)
  Add warnings for conflicting/deprecated component attribs (MarkBind#1057)
  Allow changing parameter properties (MarkBind#1075)
  Custom timezone for built-in timestamp (MarkBind#1073)
  Fix reload inconsistency when updating frontmatter (MarkBind#1068)
  Implement an api to ignore content in certain tags (MarkBind#1047)
  Enable AppVeyor CI (MarkBind#1040)
  Add heading and line highlighting to code blocks (MarkBind#1034)
  Add dividers and fix bug in siteNav (MarkBind#1063)
  Fixed navbar no longer covers modals (MarkBind#1070)
  Add copy code-block plugin (MarkBind#1043)
  Render plugins on dynamic resources (MarkBind#1051)
  Documentation for Implement no-* attributes for <box>  (MarkBind#1042)
  Migrate to bootstrap-vue popovers (MarkBind#1033)
  Refactor preprocess and url processing functions (MarkBind#1026)
  Add pageNav to Using Plugins Page (MarkBind#1062)
@Tejas2805
Merge branch 'master' of https://github.com/MarkBind/markbind
d86bf69 
* 'master' of https://github.com/MarkBind/markbind:
  Add example for using multiple features in code-blocks (MarkBind#1102)
@Tejas2805
Update headings
4830d54
@Tejas2805
update pageNav
6733f12
@Tejas2805 Tejas2805 changed the title Fix page nav Fix pageNav in tweaking the page structure Mar 15, 2020
@Tejas2805 Tejas2805 marked this pull request as ready for review March 16, 2020 07:31
@Tejas2805
Copy link
Contributor Author

@damithc Can I get your review on this?

damithc
damithc reviewed Mar 16, 2020
View reviewed changes
docs/userGuide/plugins/filterTags.mbdf Outdated
@@ -1,7 +1,9 @@
#### `filterTags`: Toggling alternative contents in a page
## Filter tags
Copy link
Contributor

Choose a reason for hiding this comment

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

Filter tags is a new term that is not mentioned anywhere else and not a standard term either.

Perhaps Tags?

@Tejas2805 Tejas2805 requested a review from damithc March 17, 2020 08:46
@Tejas2805
Copy link
Contributor Author

@marvinchin Can I get your review on this?

@marvinchin marvinchin self-requested a review March 21, 2020 09:37
marvinchin
marvinchin reviewed Mar 21, 2020
View reviewed changes
Copy link
Contributor

@marvinchin marvinchin left a comment

Choose a reason for hiding this comment

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

Good catch! I think we should change the filename as well since filterTags isn't officially a markbind thing anymore.

docs/userGuide/plugins/filterTags.mbdf
@@ -1,7 +1,9 @@
#### `filterTags`: Toggling alternative contents in a page
## Tags
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we rename the file as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes! Will do.

@Tejas2805
rename filterTags to tags
e2713ef
@Tejas2805
Merge branch 'master' of https://github.com/MarkBind/markbind into fi…
2d9534a 
…x-pageNav

* 'master' of https://github.com/MarkBind/markbind:
  Update test files (MarkBind#1138)
  Remove OK button from modals (MarkBind#1134)
  Add start from line number functionality to code blocks (MarkBind#1115)
  Allow special tags to be self-closing (MarkBind#1101)
  Simplify baseUrl resolving process (MarkBind#1087)
  Remove redundant file writing (MarkBind#1090)
  Bump acorn from 5.7.3 to 5.7.4 (MarkBind#1121)
  Bump acorn from 7.1.0 to 7.1.1 in /src/lib/markbind (MarkBind#1120)
  Unify markdown-it parser variants (MarkBind#1056)
  Remove dynamic include feature (MarkBind#1037)
  Fix flex shrink not applying in content wrapper (MarkBind#1135)
  Escape Nunjucks for special tags (MarkBind#1049)
  Update documentation on icon slot for boxes (MarkBind#1123)
  Convert code in boxes to code block (MarkBind#1086)
marvinchin
marvinchin approved these changes Mar 24, 2020
View reviewed changes
Copy link
Contributor

@marvinchin marvinchin left a comment

Choose a reason for hiding this comment

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

LGTM

@marvinchin marvinchin added this to the v2.12.1 milestone Mar 24, 2020
@marvinchin marvinchin merged commit d5a4473 into MarkBind:master Mar 24, 2020
Tejas2805 added a commit to Tejas2805/markbind that referenced this pull request Mar 25, 2020
@Tejas2805
Merge branch 'master' of https://github.com/MarkBind/markbind
60a44fa 
* 'master' of https://github.com/MarkBind/markbind:
  Fix pageNav in tweaking the page structure (MarkBind#1127)
marvinchin pushed a commit that referenced this pull request Apr 10, 2020
@Tejas2805
Fix pageNav in tweaking the page structure (#1127)
ac31304 
The pageNav for tweaking the page structure is missing filter tags.

Let's fix the headings in filter tags and the pageNav so that pageNav
display filter tags appropriately.
@Tejas2805 Tejas2805 deleted the fix-pageNav branch April 11, 2020 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damithc damithc damithc approved these changes

@marvinchin marvinchin marvinchin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.13.0
Development

Successfully merging this pull request may close these issues.

Incomplete pageNav in tweaking the page structure page
3 participants
@Tejas2805 @damithc @marvinchin