Skip to content
Permalink
Browse files
Merge branch 'master' into hackerthemes
  • Loading branch information
ralsina committed Apr 25, 2018
2 parents bc55b5a + 6621ed2 commit 29e1c6fe2035d72770663166494186468aa1d959
@@ -7,7 +7,7 @@ If you are reporting a bug:
* provide information about your environment (below)
* include all the output you get, and any other information related to your problem
Nikola v7.6.4, as provided by Debian/Ubuntu, is NOT SUPPORTED.
Nikola v7.6.4, as provided by Ubuntu, is NOT SUPPORTED.
If you are using this version, you should upgrade: https://getnikola.com/getting-started.html
-->

@@ -70,6 +70,7 @@
* `Mario Pozzo <https://github.com/camboris>`_
* `Mark Eichin <https://github.com/eichin>`_
* `Martin Bless <https://github.com/marble>`_
* `Martin Michlmayr <https://github.com/tbm>`_
* `Martin Wimpress <https://github.com/wimpr1m>`_
* `Martín Gaitán <https://github.com/mgaitan>`_
* `Matias Novoa <https://github.com/mattgaviota>`_
@@ -5,6 +5,8 @@ Features
--------

* Support hackerthemes.com themes and renamed bootswatch_theme command subtheme (Issue #3049)
* Produce a better error message when a template referenced in another
template is missing (Issue #3055)
* Support captioned images and image ordering in galleries (Issue #3017)
* New ``ATOM_PATH`` setting (Issue #2971)
* Make ``crumbs`` available to all pages
@@ -127,7 +129,7 @@ Other changes
-------------

* Rename ``crumbs.tmpl`` to ``ui_helper.tmpl`` and the breadcrumbs
function to ``breadcrumbs``
``bar`` function to ``breadcrumbs``

New in v7.8.8
=============
@@ -52,9 +52,9 @@ configuration file:
POSTS = ()
# remove destination directory to generate pages in the root directory
PAGES = (
("pages/*.rst", "", "story.tmpl"),
("pages/*.txt", "", "story.tmpl"),
("pages/*.html", "", "story.tmpl"),
("pages/*.rst", "", "page.tmpl"),
("pages/*.txt", "", "page.tmpl"),
("pages/*.html", "", "page.tmpl"),
)
# And to avoid a conflict because blogs try to generate /index.html
@@ -12,7 +12,7 @@ Extending Nikola
:Version: 7.8.8
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>

.. class:: alert alert-info float-md-right
.. class:: alert alert-primary float-md-right

.. contents::

@@ -11,7 +11,7 @@ The Nikola Handbook

:Version: 7.8.8

.. class:: alert alert-info float-md-right
.. class:: alert alert-primary float-md-right

.. contents::

@@ -384,7 +384,7 @@ template

.. code:: restructuredtext

.. template: story.tmpl
.. template: foobar.tmpl
updated
The last time this post was updated, defaults to the post’s ``date``
@@ -672,8 +672,8 @@ options. The exact mechanism is explained above the config options in the
# Finally, note that destination can be translated, i.e. you can
# specify a different translation folder per language. Example:
# PAGES = (
# ("pages/*.rst", {"en": "pages", "de": "seiten"}, "story.tmpl"),
# ("pages/*.md", {"en": "pages", "de": "seiten"}, "story.tmpl"),
# ("pages/*.rst", {"en": "pages", "de": "seiten"}, "page.tmpl"),
# ("pages/*.md", {"en": "pages", "de": "seiten"}, "page.tmpl"),
# )
POSTS = (
@@ -682,9 +682,9 @@ options. The exact mechanism is explained above the config options in the
("posts/*.html", "posts", "post.tmpl"),
)
PAGES = (
("pages/*.rst", "pages", "story.tmpl"),
("pages/*.txt", "pages", "story.tmpl"),
("pages/*.html", "pages", "story.tmpl"),
("pages/*.rst", "pages", "page.tmpl"),
("pages/*.txt", "pages", "page.tmpl"),
("pages/*.html", "pages", "page.tmpl"),
)
.. admonition:: POSTS and PAGES are not flat!
@@ -1028,7 +1028,7 @@ Pages are the same as posts, except that:

* They are not added to the front page
* They don't appear on the RSS feed
* They use the ``story.tmpl`` template instead of ``post.tmpl`` by default
* They use the ``page.tmpl`` template instead of ``post.tmpl`` by default

The default configuration expects the page's metadata and text files to be on the
``pages`` folder, but that can be changed (see ``PAGES`` option above).
@@ -11,7 +11,7 @@ Using Alternative Social Buttons with Nikola

:Version: 7.8.8

.. class:: alert alert-info float-md-right
.. class:: alert alert-primary float-md-right

.. contents::

@@ -6,7 +6,7 @@
:Version: 7.8.8

.. class:: alert alert-info float-md-right
.. class:: alert alert-primary float-md-right

.. contents::

@@ -24,7 +24,7 @@ Variables and functions come from three places:
* the local context of a page
* the templates themselves and the templates they import

.. class:: alert alert-info
.. class:: alert alert-primary
.. contents::

Global variables
@@ -135,8 +135,8 @@ Name Type Description

__ https://getnikola.com/theming.html#identifying-and-customizing-different-kinds-of-pages-with-a-shared-template

Variables available in post pages (``post.tmpl``, ``story.tmpl`` etc.)
----------------------------------------------------------------------
Variables available in post pages (``post.tmpl``, ``page.tmpl`` etc.)
---------------------------------------------------------------------

.. class:: table table-bordered table-striped

@@ -256,7 +256,7 @@ Name Type Description
``other_languages`` list<tuple> List of triples ``(other_lang, other_classification, title)``
=================== ============== =============================================================

Index-style classification pages have ``kind`` in addtion to the usual index variables.
Index-style classification pages have ``kind`` in addition to the usual index variables.

Subclassification page
~~~~~~~~~~~~~~~~~~~~~~
@@ -12,7 +12,7 @@ Theming Nikola
:Version: 7.8.8
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>

.. class:: alert alert-info float-md-right
.. class:: alert alert-primary float-md-right

.. contents::

@@ -284,7 +284,7 @@ These are the templates that come with the included themes:
Used to display section indexes, if ``POST_SECTIONS_ARE_INDEXES`` is True.
By default, it just inherits ``index.tmpl``, with added feeds.

``story.tmpl``
``page.tmpl``
Used for pages that are not part of a blog, usually a cleaner, less
intrusive layout than ``post.tmpl``, but same parameters.

@@ -8,7 +8,7 @@
.. raw:: html

<div class="alert alert-info pull-right" style="margin-left: 2em;">
<div class="alert alert-primary float-md-right" style="margin-left: 2em;">
<h2><a name="contents">Contents</a></h2>

<ul>
@@ -23,10 +23,13 @@ nikola/data/themes/base/assets/js/html5shiv-printshiv.min.js
nikola/data/themes/base/assets/js/justified-layout.min.js
nikola/data/themes/base/assets/js/moment-with-locales.min.js
nikola/data/themes/base/messages/messages_cz.py
nikola/data/themes/bootblog4-jinja/assets/css/bootblog.css
nikola/data/themes/bootblog4-jinja/bundles
nikola/data/themes/bootstrap4-jinja/assets/css/bootstrap.min.css
nikola/data/themes/bootstrap4-jinja/assets/js/bootstrap.min.js
nikola/data/themes/bootstrap4-jinja/assets/js/jquery.min.js
nikola/data/themes/bootstrap4-jinja/assets/js/popper.min.js
nikola/data/themes/bootstrap4-jinja/bundles
nikola/data/themes/bootstrap4/assets/css/bootstrap.min.css
nikola/data/themes/bootstrap4/assets/js/bootstrap.min.js
nikola/data/themes/bootstrap4/assets/js/jquery.min.js

This file was deleted.

@@ -78,27 +78,29 @@ lang="{{ lang }}">
{% if use_bundles %}
{% if use_cdn %}
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" integrity="sha256-pS96pU17yq+gVu4KBQJi38VpSuKN7otMrDQprzf/DWY=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha256-98vAGjEDGN79TjHkYWVD4s87rvWkdWLHPs5MC3FvFX4=" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.js" integrity="sha256-lQrWH6UPtNlJURtEYCgKDqLyBscHa/uF/nFle9bx3tI=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.0/moment-with-locales.min.js" integrity="sha256-RD4uaXz3KfJR/tER2O0FDpPftthhg8kJih3adpCUkUU=" crossorigin="anonymous"></script>
<script src="/assets/js/all.js"></script>
{% else %}
<script src="/assets/js/all-nocdn.js"></script>
{% endif %}
{% else %}
{% if use_cdn %}
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" integrity="sha256-pS96pU17yq+gVu4KBQJi38VpSuKN7otMrDQprzf/DWY=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha256-98vAGjEDGN79TjHkYWVD4s87rvWkdWLHPs5MC3FvFX4=" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.js" integrity="sha256-lQrWH6UPtNlJURtEYCgKDqLyBscHa/uF/nFle9bx3tI=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.0/moment-with-locales.min.js" integrity="sha256-RD4uaXz3KfJR/tER2O0FDpPftthhg8kJih3adpCUkUU=" crossorigin="anonymous"></script>
{% else %}
<script src="/assets/js/jquery.min.js"></script>
<script src="/assets/js/popper.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
<script src="/assets/js/baguetteBox.min.js"></script>
<script src="/assets/js/moment-with-locales.min.js"></script>
<script src="/assets/js/fancydates.js"></script>
{% endif %}
<script src="/assets/js/fancydates.js"></script>
{% endif %}
{{ social_buttons_code }}
{% endmacro %}
@@ -107,15 +109,15 @@ lang="{{ lang }}">
{% macro html_stylesheets() %}
{% if use_bundles %}
{% if use_cdn %}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css" integrity="sha256-FqCzNnnyXl5HxHMdb+RQ/RV/X7fqfPcQYy+G2gFL3Xk=" crossorigin="anonymous" />
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
{% else %}
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
{% endif %}
{% else %}
{% if use_cdn %}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css" integrity="sha256-FqCzNnnyXl5HxHMdb+RQ/RV/X7fqfPcQYy+G2gFL3Xk=" crossorigin="anonymous" />
{% else %}
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
@@ -1,29 +1,11 @@
#container {
width: 960px;
margin: 0 auto;
}

#contentcolumn {
max-width: 760px;
}
#q {
width: 150px;
}

img {
max-width: 90%;
}

.postbox {
border-bottom: 2px solid darkgrey;
margin-bottom: 12px;
max-width: 100%;
}

.titlebox {
text-align: right;
}

#addthisbox {margin-bottom: 12px;}

td.label {
/* Issue #290 */
@@ -36,7 +18,6 @@ td.label {
font-size: xx-small;
}


.caption {
/* Issue 292 */
text-align: center;
@@ -67,10 +48,6 @@ ul.bricks > li {
margin: 3px;
}

.at300b, .stMainServices, .stButton, .stButton_gradient {
box-sizing: content-box;
}

pre, pre code {
white-space: pre;
word-wrap: normal;
@@ -86,10 +63,6 @@ article.post-micro {
display: inline-block;
}

.flowr_row {
width: 100%;
}

.tags {
padding-left: 0;
margin-left: -5px;
@@ -100,6 +73,9 @@ article.post-micro {

.tags > li {
display: inline-block;
}
.tags > li a {
display: inline-block;
padding: .25em .4em;
font-size: 75%;
font-weight: 700;
@@ -109,14 +85,9 @@ article.post-micro {
white-space: nowrap;
vertical-align: baseline;
border-radius: .25rem;
color: #fff;
background-color: #868e96;
}

.tags > li a {
color: #fff;
}

.tags > li a:hover {
color: #fff;
text-decoration: none;
@@ -243,8 +214,6 @@ ul.pager li a {
padding: .5rem .75rem;
margin-left: -1px;
line-height: 1.25;
color: #007bff;
background-color: #fff;
border: 1px solid #ddd;
border-radius: .25rem;
}

0 comments on commit 29e1c6f

Please sign in to comment.