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/coil
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d34c72057afd
Choose a base ref
...
head repository: getnikola/coil
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cecb8c2ee617
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 3, 2017

  1. Strip path components when looking for themes 

    Fix #49.

Fix search for parent themes by stripping leading path components, which may result in false negatives.
    @dpaleino
    dpaleino authored Oct 3, 2017
    Copy the full SHA
    221fcb2 View commit details

  2. Merge pull request #50 from dpaleino/master 

    Strip path components when looking for themes
    @Kwpolska
    Kwpolska authored Oct 3, 2017
    Copy the full SHA
    cecb8c2 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 coil/web.py
5 changes: 3 additions & 2 deletions coil/web.py
View file
Original file line number Diff line number Diff line change
@@ -167,8 +167,9 @@ def configure_site():
_site.config['TRANSLATIONS'])

# Theme must inherit from bootstrap3, because we have hardcoded HTML.
bs3 = (('bootstrap3' in _site.THEMES) or
('bootstrap3-jinja' in _site.THEMES))
themes = [os.path.basename(x) for x in _site.THEMES]
bs3 = (('bootstrap3' in themes) or
('bootstrap3-jinja' in themes))
if not bs3:
app.logger.notice("THEME does not inherit from 'bootstrap3' or "
"'bootstrap3-jinja', using 'bootstrap3' instead.")