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

Update and strip base #2815

Merged
merged 2 commits into from Jun 7, 2017
Merged

Update and strip base #2815

merged 2 commits into from Jun 7, 2017

Conversation

@gwax
Copy link
Contributor

@gwax gwax commented Jun 3, 2017

Pull Request Checklist

  • I’ve read the guidelines for contributing.
  • I updated AUTHORS.txt and CHANGES.txt (if the change is non-trivial) and documentation (if applicable).
  • I tested my changes.

Description

Updated assets and removed extraneous code from base. This is an alternative to #2810 for solving #2744

Copy link
Member

@Kwpolska Kwpolska left a comment

👍 but there are a few things that are not yet perfect.

@@ -6,10 +6,10 @@ ${ui.bar(crumbs)}
%if folders or files:
<ul>
% for name in folders:
<li><a href="${name|u}"><i class="icon-folder-open"></i> ${name|h}</a>
<li><a href="${name|u}">${name|h}</a>
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

To make styling possible, please add classes to links, eg. "listing-folder" and "listing-file".

<p class="feedlink"><a href="${_link('section_index_atom', posts[0].section_slug())}" type="application/atom+xml">${messages('Updates')}</a></p>
% endif
</header>
${feed.link(posts[0].section_slug())}
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

I think section will work here (and in the above section_index link) instead.

Copy link
Contributor Author

@gwax gwax Jun 4, 2017

It wasn't working for me in 7.8.5 but works in master and 7.8.6

Copy link
Member

@Kwpolska Kwpolska Jun 4, 2017

That was added recently, so no wonder it failed.

@@ -47,51 +63,23 @@ div.abstract p.topic-title {
text-align: center }

div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning, div.sidebar {
/* stolen from Boostrap 3 (.panel .panel-default) */
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

I’d like those bootstrap-esque styles to appear in bootstrap3 (eg. theme.css or in an override of rst.css)

Copy link
Contributor Author

@gwax gwax Jun 4, 2017

Will do.

{"version":3,"sources":["/Users/grant/Sites/jupyter/notebook/notebook/static/base/less/variables.less","/Users/grant/Sites/jupyter/notebook/notebook/static/components/bootstrap/less/mixins/vendor-prefixes.less","/Users/grant/Sites/jupyter/notebook/notebook/static/base/less/mixins.less","/Users/grant/Sites/jupyter/notebook/notebook/static/base/less/flexbox.less","/Users/grant/Sites/jupyter/notebook/notebook/static/base/less/error.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/ansicolors.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/cell.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/codecell.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/codemirror.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/highlight.less","/Users/grant/Sites/jupyter/notebook/notebook/static/components/codemirror/lib/codemirror.css","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/outputarea.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/renderedhtml.less","/Users/grant/Sites/jupyter/notebook/notebook/static/notebook/less/textcell.less","/Users/grant/Sites/jupyter/notebook/notebook/static/components/bootstrap/less/variables.less"],"names":[],"mappings":"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","file":"ipython.min.css"}
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

Delete that file. It’s not really necessary, and here it leaks some local fs paths of yours.

Copy link
Contributor Author

@gwax gwax Jun 3, 2017

Amusingly, those are not my paths, but rather the paths of someone on the ipython project.

Will remove.

@@ -90,32 +93,14 @@ lang="{{ lang }}">
{% endif %}
{% endif %}
{% if needs_ipython_css %}
<link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/ipython.css" rel="stylesheet" type="text/css">
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

I’d still prefer a minified version to be sourced on pages.

CHANGES.txt Outdated
@@ -5,6 +5,7 @@ Features
--------

* Support for YAML and TOML metadata (Issue #2801)
* Update assets in the ``base`` and ``base-jinja`` themes and remove extra code ()#2744)
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

(Issue #2744)

@@ -36,15 +36,15 @@
<ul>
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li>
<li class="active"><a href="{{ permalink }}" aria-label="{{ messages('(active)', lang) }}">{{ text }}</a></li>
Copy link
Member

@Kwpolska Kwpolska Jun 3, 2017

This won’t work as expected.

This HTML snippet:

    Menu:
    <a href="https://getbootstrap.com/">SR <span class="sr-only">(active)</span></a> or
    <a href="https://w3.org/" aria-label="(active)">ARIA</a>.

is read out by Safari with VoiceOver like this:

Menu: link, SR (active) or link, ARIA.

And when you use Tab to highlight the link in question,

SR (active), link
(active), link

To make it work in the first case, you need sr-only or equivalent. To fix the second case, you need to duplicate link text inside of aria-label.

Copy link
Contributor Author

@gwax gwax Jun 4, 2017

👍

@gwax
Copy link
Contributor Author

@gwax gwax commented Jun 4, 2017

Ok, requested changes made but I'm not entirely sure why travis is so unhappy.

bower.json Outdated
"jquery": "<2.0.0",
"jquery-colorbox": "~1",
"moment": "~2",
"katex": "^0.7.1",
Copy link
Member

@Kwpolska Kwpolska Jun 4, 2017

We can’t afford to ship KaTeX as a bower component (also, the install was botched). Please drop this, KaTeX stuff from base/assets and bower_components, and any non-CDN references to KaTeX.

Copy link
Contributor Author

@gwax gwax Jun 4, 2017

What is the reason we "can't afford to ship KaTeX"?

If I look at what we're already loading via bower, it's less than half the size of moment and roughly comparable to bootstrap. MathJax is >100MB but KaTeX is relatively small.

$ du -sh *
112K	baguettebox.js
2.5M	bootstrap
 88K	html5shiv
1.2M	jquery
360K	jquery-colorbox
2.6M	katex
 72K	livereload-js
6.5M	moment

Maybe the thing to do is open an issue to create a task for asset retrieval and not store them in the repo at all.

Copy link
Member

@Kwpolska Kwpolska Jun 4, 2017

KaTeX is a very optional feature. And we can’t make users download all the node crap themselves just to get bower going. Or yarn and webpack, because bower is now deprecated. Or whatever they come up with in 6 months.

Copy link
Contributor Author

@gwax gwax Jun 4, 2017

I'll take katex out and think on this.

We might be able to structure things to default to USE_CDN = True and only download/install node and the like if people specify USE_CDN = False. I'll think on that separately.

@Kwpolska
Copy link
Member

@Kwpolska Kwpolska commented Jun 7, 2017

I fixed a handful of bugs and glitches. If this builds, I’ll merge as-is (after squashing).

gwax and others added 2 commits Jun 7, 2017
Duplicate base to core

modify metadata and remove duplicate messages

trim and update assets

strip things down in core and remove from base

update rss files

typo

feed consolidation

feed_helper fixes

do not pre-minify

carve down base a bit

fix translations

temporarily move things around to facilitate diffs

add some links to fix diffs

add some links to fix diffs

rst.css

diverge less

back to the new names

readd cz

fix bundle

unremove annotation_helper

remove unneeded assets

fix translation messages

modify jinjify to handle core and possible bootstrap deletion

use minified assets

jinjify and fix metadata for jinja themes

Update changelog

resynchronize base with core

ipython.min.css

html5shiv from bower

bring core back into the fold

jinjify

fix import_po

update changelist

A whole bunch of review feedback

more review fixes

cdn support for katex

upgrade mathjax and note the always cdn nature

jinjify

alphabetize bower.json

change less

Always serve katex from a cdn

Add missing html5shiv assets

Add html5shiv and fix .gitignore glitch

Jinjify

Do not copy ipython.css

Update changelog

Document kind in classification indexes

Update bundles in bootstrap3 theme
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska Kwpolska merged commit 78ef22b into getnikola:master Jun 7, 2017
0 of 2 checks passed
@Kwpolska
Copy link
Member

@Kwpolska Kwpolska commented Jun 7, 2017

@gwax, Thanks for this huge contribution to Nikola! You’ve been granted commit rights for the Nikola repositories. You can accept the invitation you received via e-mail. (If you don’t want them, you can of course refuse.)

@Kwpolska
Copy link
Member

@Kwpolska Kwpolska commented Jun 7, 2017

@gwax, one more thing: please disable gwax/nikola on Travis if you don’t plan to modify our Travis architecture, that generates some useless builds.

@gwax gwax deleted the update_and_strip_base branch Jun 7, 2017
@remram44
Copy link

@remram44 remram44 commented Jun 20, 2017

FYI this breaks custom themes

@gwax
Copy link
Contributor Author

@gwax gwax commented Jun 20, 2017

@remram44 my apologies. Could you open an issue, assign it to me, and include some details about which themes are broken and how?

@remram44
Copy link

@remram44 remram44 commented Jun 20, 2017

Basically, the theme had parent=bootstrap3 and a custom assets/css/bootstrap.css, which is now silently ignored as you removed it from bootstrap3. It probably affects custom themes with different parents from which you also removed files.

This might be a consequence of a missing bundle file in the derived theme? (however Nikola never complained about it)

@Kwpolska
Copy link
Member

@Kwpolska Kwpolska commented Jun 20, 2017

Apologies for that. I’ll bring those back in a v7.8.9 bugfix release. They will probably be gone in v8 though.

@Kwpolska
Copy link
Member

@Kwpolska Kwpolska commented Jun 20, 2017

v7.8.9 is out with this and some other bugs fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants