getnikola · Mar 17, 2018
diff --git a/‎CHANGES.txt
+2-1 b/‎CHANGES.txt
+2-1
diff --git a/‎docs/theming.txt
+4-3 b/‎docs/theming.txt
+4-3
diff --git a/‎nikola/data/themes/base/assets/js/flowr.js
-307 b/‎nikola/data/themes/base/assets/js/flowr.js
-307
diff --git a/‎nikola/data/themes/base/assets/js/flowr.plugin.js
-307 b/‎nikola/data/themes/base/assets/js/flowr.plugin.js
-307
diff --git a/‎nikola/data/themes/base/assets/js/justified-layout.min.js
+1 b/‎nikola/data/themes/base/assets/js/justified-layout.min.js
+1
diff --git a/‎npm_assets/node_modules/justified-layout/LICENSE
+20 b/‎npm_assets/node_modules/justified-layout/LICENSE
+20
diff --git a/‎npm_assets/node_modules/justified-layout/README.md
+66 b/‎npm_assets/node_modules/justified-layout/README.md
+66
diff --git a/‎npm_assets/node_modules/justified-layout/demo.html
+80 b/‎npm_assets/node_modules/justified-layout/demo.html
+80
diff --git a/‎npm_assets/node_modules/justified-layout/dist/justified-layout.js
+765 b/‎npm_assets/node_modules/justified-layout/dist/justified-layout.js
+765
diff --git a/‎npm_assets/node_modules/justified-layout/dist/justified-layout.min.js
+11 b/‎npm_assets/node_modules/justified-layout/dist/justified-layout.min.js
+11
diff --git a/‎npm_assets/node_modules/justified-layout/lib/index.js
+249 b/‎npm_assets/node_modules/justified-layout/lib/index.js
+249
diff --git a/‎npm_assets/node_modules/justified-layout/lib/row.js
+335 b/‎npm_assets/node_modules/justified-layout/lib/row.js
+335
diff --git a/‎npm_assets/node_modules/justified-layout/package.json
+80 b/‎npm_assets/node_modules/justified-layout/package.json
+80
diff --git a/‎npm_assets/node_modules/merge/.npmignore
+1 b/‎npm_assets/node_modules/merge/.npmignore
+1
diff --git a/‎npm_assets/node_modules/merge/LICENSE
+21 b/‎npm_assets/node_modules/merge/LICENSE
+21
diff --git a/‎npm_assets/node_modules/merge/README.md
+58 b/‎npm_assets/node_modules/merge/README.md
+58
diff --git a/‎npm_assets/node_modules/merge/bower.json
+22 b/‎npm_assets/node_modules/merge/bower.json
+22
diff --git a/‎npm_assets/node_modules/merge/merge.js
+175 b/‎npm_assets/node_modules/merge/merge.js
+175
diff --git a/‎npm_assets/node_modules/merge/merge.min.js
+3 b/‎npm_assets/node_modules/merge/merge.min.js
+3
diff --git a/‎npm_assets/node_modules/merge/package.json
+55 b/‎npm_assets/node_modules/merge/package.json
+55
diff --git a/‎npm_assets/package-lock.json
+13 b/‎npm_assets/package-lock.json
+13
diff --git a/‎npm_assets/package.json
+2 b/‎npm_assets/package.json
+2
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* Replace ``flowr.js`` with ``justified-layout`` by Flickr
 * ``bootblog4`` is the new default theme (Issue #2964)
 * New ``bootstrap4`` and ``bootblog4`` themes (Issue #2964)
 * New PRESERVE_ICC_PROFILES option to control whether ICC profiles are
@@ -28,7 +29,7 @@ Features
 * Use ``PRETTY_URLS`` by default on all sites (Issue #1838)
 * Feed link generation is completely refactored (Issue #2844)
 * Let path handlers return absolute URLs (Issue #2876)
-* Add ``BLOG_EMAIL`` to global context to make it available for 
+* Add ``BLOG_EMAIL`` to global context to make it available for
   templates (Issue #2968)
 
 Bugfixes
 
@@ -37,8 +37,8 @@ assets
     and ``fonts`` (Bootstrap).
 
     The included themes use `Bootstrap <https://getbootstrap.com/>`_, `Colorbox
-    <http://www.jacklmoore.com/colorbox>`_, `Flowr.js
-    <https://github.com/kalyan02/flowr-js>`_ and `Moment.js
+    <http://www.jacklmoore.com/colorbox>`_, `Justified Layout by Flickr
+    <http://flickr.github.io/justified-layout/>`_ and `Moment.js
     <https://momentjs.com/>`_, so they are in assets, along with CSS files for
     syntax highlighting, reStructuredText and Jupyter, as well as a minified
     copy of jQuery.
@@ -259,7 +259,8 @@ These are the templates that come with the included themes:
       + ``title``: The title of the image.
       + ``size``: A dict containing ``w`` and ``h``, the real size of the thumbnail.
 
-    * ``photo_array_json``: a JSON dump of photo_array, used in the bootstrap theme by flowr.js
+    * ``photo_array_json``: a JSON dump of photo_array, used by the
+      ``justified-layout`` script
 
 ``list.tmpl``
     Template used to display generic lists of links, which it gets in ``items``,
 
@@ -0,0 +1 @@
+../../../../../../npm_assets/node_modules/justified-layout/dist/justified-layout.min.js
@@ -9,8 +9,10 @@
         "bootstrap": "^4.0.0",
         "html5shiv": "^3.7.3",
         "jquery": "^3.3.1",
+        "justified-layout": "^2.1.1",
         "livereload-js": "^2.3.0",
         "moment": "^2.20.1",
+        "npm": "^5.7.1",
         "popper.js": "^1.13.0"
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../../npm_assets/node_modules/justified-layout/dist/justified-layout.min.js`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,10 @@`
`9`	`9`	`"bootstrap": "^4.0.0",`
`10`	`10`	`"html5shiv": "^3.7.3",`
`11`	`11`	`"jquery": "^3.3.1",`
	`12`	`+ "justified-layout": "^2.1.1",`
`12`	`13`	`"livereload-js": "^2.3.0",`
`13`	`14`	`"moment": "^2.20.1",`
	`15`	`+ "npm": "^5.7.1",`
`14`	`16`	`"popper.js": "^1.13.0"`
`15`	`17`	`}`
`16`	`18`	`}`