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.

Sign up for GitHub

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

Jump to bottom

Fix #1656 #1664

Merged
merged 1 commit into from
Apr 22, 2015
Merged

Fix #1656 #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Features
Bugfixes
--------

* Don't default to any swatch in bootswatch_theme (Issue #1656)
* Fix ``nikola check -l`` for absolute and full-path URL styles
(Issue #1650)
* Really add missing trailing slashes in ``BASE_URL`` (Issue #1651)
Expand Down
2 changes: 1 addition & 1 deletion nikola/conf.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ REDIRECTIONS = ${REDIRECTIONS}
# vim
# vs
# xcode
$ This list MAY be incomplete since pygments adds styles every now and then.
# This list MAY be incomplete since pygments adds styles every now and then.
# CODE_COLOR_SCHEME = 'default'

# If you use 'site-reveal' theme you can select several subthemes
Expand Down
6 changes: 5 additions & 1 deletion nikola/plugins/command/bootswatch_theme.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

from __future__ import print_function
import os
import sys

try:
import requests
Expand Down Expand Up @@ -57,7 +58,7 @@ class CommandBootswatchTheme(Command):
{
'name': 'swatch',
'short': 's',
'default': 'slate',
'default': '',
'type': str,
'help': 'Name of the swatch from bootswatch.com.'
},
Expand All @@ -77,6 +78,9 @@ def _execute(self, options, args):

name = options['name']
swatch = options['swatch']
if not swatch:
LOGGER.error('The -s option is mandatory')
sys.exit(1)
parent = options['parent']
version = ''

Expand Down