Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ead8ce7

Browse files
committedMar 17, 2018
Remove flowr (pre switch to justified-layout)
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
1 parent ab74332 commit ead8ce7

22 files changed

+1963
-618
lines changed
 

‎CHANGES.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ New in master
44
Features
55
--------
66

7+
* Replace ``flowr.js`` with ``justified-layout`` by Flickr
78
* ``bootblog4`` is the new default theme (Issue #2964)
89
* New ``bootstrap4`` and ``bootblog4`` themes (Issue #2964)
910
* New PRESERVE_ICC_PROFILES option to control whether ICC profiles are
@@ -28,7 +29,7 @@ Features
2829
* Use ``PRETTY_URLS`` by default on all sites (Issue #1838)
2930
* Feed link generation is completely refactored (Issue #2844)
3031
* Let path handlers return absolute URLs (Issue #2876)
31-
* Add ``BLOG_EMAIL`` to global context to make it available for
32+
* Add ``BLOG_EMAIL`` to global context to make it available for
3233
templates (Issue #2968)
3334

3435
Bugfixes

‎docs/theming.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ assets
3737
and ``fonts`` (Bootstrap).
3838

3939
The included themes use `Bootstrap <https://getbootstrap.com/>`_, `Colorbox
40-
<http://www.jacklmoore.com/colorbox>`_, `Flowr.js
41-
<https://github.com/kalyan02/flowr-js>`_ and `Moment.js
40+
<http://www.jacklmoore.com/colorbox>`_, `Justified Layout by Flickr
41+
<http://flickr.github.io/justified-layout/>`_ and `Moment.js
4242
<https://momentjs.com/>`_, so they are in assets, along with CSS files for
4343
syntax highlighting, reStructuredText and Jupyter, as well as a minified
4444
copy of jQuery.
@@ -259,7 +259,8 @@ These are the templates that come with the included themes:
259259
+ ``title``: The title of the image.
260260
+ ``size``: A dict containing ``w`` and ``h``, the real size of the thumbnail.
261261

262-
* ``photo_array_json``: a JSON dump of photo_array, used in the bootstrap theme by flowr.js
262+
* ``photo_array_json``: a JSON dump of photo_array, used by the
263+
``justified-layout`` script
263264

264265
``list.tmpl``
265266
Template used to display generic lists of links, which it gets in ``items``,

‎nikola/data/themes/base/assets/js/flowr.js

-307
This file was deleted.

‎nikola/data/themes/base/assets/js/flowr.plugin.js

-307
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../../npm_assets/node_modules/justified-layout/dist/justified-layout.min.js

‎npm_assets/node_modules/justified-layout/LICENSE

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/README.md

+66
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/demo.html

+80
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/dist/justified-layout.js

+765
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/dist/justified-layout.min.js

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/lib/index.js

+249
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/lib/row.js

+335
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/justified-layout/package.json

+80
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/.npmignore

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/LICENSE

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/README.md

+58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/bower.json

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/merge.js

+175
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/merge.min.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/node_modules/merge/package.json

+55
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/package-lock.json

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm_assets/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
"bootstrap": "^4.0.0",
1010
"html5shiv": "^3.7.3",
1111
"jquery": "^3.3.1",
12+
"justified-layout": "^2.1.1",
1213
"livereload-js": "^2.3.0",
1314
"moment": "^2.20.1",
15+
"npm": "^5.7.1",
1416
"popper.js": "^1.13.0"
1517
}
1618
}

0 commit comments

Comments
 (0)
Please sign in to comment.