Skip to content
This repository was archived by the owner on Mar 22, 2022. It is now read-only.

Reconcile dir-index.html and dir-index-uncat.html#39

Merged
jessicaschilling merged 5 commits intomasterfrom
chore/reconcile-uncat
Jul 24, 2020
Merged

Reconcile dir-index.html and dir-index-uncat.html#39
jessicaschilling merged 5 commits intomasterfrom
chore/reconcile-uncat

Conversation

@jessicaschilling
Copy link
Contributor

@jessicaschilling jessicaschilling commented Jul 23, 2020 •
edited
Loading

Background

In this PR

  • Cosmetic tweak to to dir-index.html from [BOUNTY] Directory page UI improvements #38 (comment): Extend/reuse ipfs-hash class to make all hashes appear as gray monospace type
  • Update dir-index-uncat.html to match dir-index.html, BUT:
    • Move <style> items out of the <head> of dir-index.html and into existing gw-assets/style.css (replacing that file's existing content)
    • (Note: no need to update gw-assets/icons.css as the icons haven't changed)
  • Pin content of gw-assets/style.css to public gateway and update link in dir-index-uncat.html accordingly

Next steps

Note

@ribasushi
Copy link
Contributor

ribasushi commented Jul 23, 2020

@jessicaschilling do we really need to maintain both files...? Can't there be just one?

@jessicaschilling
Copy link
Contributor Author

jessicaschilling commented Jul 23, 2020 •
edited
Loading

@ribasushi We should use some sort of build tool to generate an uncat version automatically, but that's a matter for another issue: #6
This is just a quick fix to unblock ipfs/kubo#7536 (review)

@jessicaschilling jessicaschilling requested a review from lidel July 23, 2020 23:24
@jessicaschilling
Copy link
Contributor Author

jessicaschilling commented Jul 23, 2020

@lidel - see first note in this PR for a more complete (probably overkill) description of the situation. Do you mind reviewing at your leisure? Feel free to merge and/or cut a new release, or I can do.

@neatonk - I'm afraid I can't add you as a reviewer to this, but name-checking you here so you know current status.

@jessicaschilling jessicaschilling mentioned this pull request Jul 23, 2020
Merged
@jessicaschilling jessicaschilling changed the title [WIP] Reconcile dir-index.html and dir-index-uncat.html Reconcile dir-index.html and dir-index-uncat.html Jul 23, 2020
lidel
lidel approved these changes Jul 24, 2020
View reviewed changes
Copy link
Member

@lidel lidel left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thank you @jessicaschilling, tested against real go-ipfs and LGTM:

Screen Shot 2020-07-24 at 11 38 52

Do you mind merging & releasing dir-index-html v1.1.0?

@ribasushi I agree current setup is tedious. Removing the need for editing two files is tracked in #6

@jessicaschilling jessicaschilling merged commit 92c9126 into master Jul 24, 2020
@jessicaschilling jessicaschilling deleted the chore/reconcile-uncat branch July 24, 2020 13:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@lidel lidel lidel approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jessicaschilling @ribasushi @lidel