Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d60e346b441f
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e7c01e87d4b2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 13, 2017

  1. Copy the full SHA
    c95e707 View commit details
  2. Copy the full SHA
    e7c01e8 View commit details
Showing with 1 addition and 21 deletions.
  1. +1 −17 nikola/conf.py.in
  2. +0 −4 nikola/nikola.py
18 changes: 1 addition & 17 deletions nikola/conf.py.in
Original file line number Diff line number Diff line change
@@ -214,7 +214,7 @@ COMPILERS = ${COMPILERS}

# Use date-based path when creating posts?
# Can be enabled on a per-post basis with `nikola new_post -d`.
# The setting is ignored when creating pages (`-d` still works).
# The setting is ignored when creating pages.
# NEW_POST_DATE_PATH = False

# What format to use when creating posts with date paths?
@@ -225,7 +225,6 @@ COMPILERS = ${COMPILERS}
# untranslated posts.
# If this is set to False, then posts that are not translated to a language
# LANG will not be visible at all in the pages in that language.
# Formerly known as HIDE_UNTRANSLATED_POSTS (inverse)
# SHOW_UNTRANSLATED_POSTS = True

# Nikola supports logo display. If you have one, you can put the URL here.
@@ -649,20 +648,6 @@ GITHUB_COMMIT_SOURCE = True
# return partial content of another representation for these resources. Do not
# use this feature if you do not understand what this means.

# Compiler to process LESS files.
# LESS_COMPILER = 'lessc'

# A list of options to pass to the LESS compiler.
# Final command is: LESS_COMPILER LESS_OPTIONS file.less
# LESS_OPTIONS = []

# Compiler to process Sass files.
# SASS_COMPILER = 'sass'

# A list of options to pass to the Sass compiler.
# Final command is: SASS_COMPILER SASS_OPTIONS file.s(a|c)ss
# SASS_OPTIONS = []

# #############################################################################
# Image Gallery Options
# #############################################################################
@@ -1043,7 +1028,6 @@ MARKDOWN_EXTENSIONS = ['markdown.extensions.fenced_code', 'markdown.extensions.c
# """

# Show link to source for the posts?
# Formerly known as HIDE_SOURCELINK (inverse)
# SHOW_SOURCELINK = True
# Copy the source files for your pages?
# Setting it to False implies SHOW_SOURCELINK = False
4 changes: 0 additions & 4 deletions nikola/nikola.py
Original file line number Diff line number Diff line change
@@ -532,8 +532,6 @@ def __init__(self, **config):
'INDEX_PATH': '',
'IPYNB_CONFIG': {},
'KATEX_AUTO_RENDER': '',
'LESS_COMPILER': 'lessc',
'LESS_OPTIONS': [],
'LICENSE': '',
'LINK_CHECK_WHITELIST': [],
'LISTINGS_FOLDERS': {'listings': 'listings'},
@@ -575,8 +573,6 @@ def __init__(self, **config):
'GENERATE_RSS': True,
'RSS_LINK': None,
'RSS_PATH': '',
'SASS_COMPILER': 'sass',
'SASS_OPTIONS': [],
'SEARCH_FORM': '',
'SHOW_BLOG_TITLE': True,
'SHOW_INDEX_PAGE_NAVIGATION': False,