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-themes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 62f56a41e205
Choose a base ref
...
head repository: getnikola/nikola-themes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f9fdc77bd32
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 15, 2017

  1. Fix bootstrap4 README

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Apr 15, 2017
    Copy the full SHA
    8ee6c47 View commit details

Commits on Apr 17, 2017

  1. Update carpet and mdl themes

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Apr 17, 2017
    Copy the full SHA
    7e55801 View commit details
  2. Stop using THEME_REVEAL_* variables in the theme

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Apr 17, 2017
    Copy the full SHA
    3f9fdc7 View commit details
Showing with 18 additions and 3 deletions.
  1. +1 −1 site/state_data.json
  2. +1 −0 v7/bootstrap4/README.md
  3. +1 −1 v7/carpet
  4. +1 −1 v7/mdl
  5. +7 −0 v7/reveal-jinja/conf.py.sample
  6. +7 −0 v7/reveal/conf.py.sample
2 changes: 1 addition & 1 deletion site/state_data.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"last_deploy": "2017-04-14T12:36:42.667279"
"last_deploy": "2017-04-17T18:37:01.339939"
}
1 change: 1 addition & 0 deletions v7/bootstrap4/README.md
Original file line number Diff line number Diff line change
@@ -13,4 +13,5 @@ With issues:
* galleries (errors in console, requires non-slim jQuery, icons replaced by emoji)

Broken:

* slides
2 changes: 1 addition & 1 deletion v7/mdl
Submodule mdl updated 2 files
+3 −0 CHANGES.rst
+10 −16 README.md
7 changes: 7 additions & 0 deletions v7/reveal-jinja/conf.py.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Settings for the Reveal theme must be added to the global context.
# subtheme selection: beige/serif/simple/sky/night/default
# transition selection: cube/page/concave/linear/none/default
GLOBAL_CONTEXT.update({
'subtheme': 'sky',
'transition': 'cube'
})
7 changes: 7 additions & 0 deletions v7/reveal/conf.py.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Settings for the Reveal theme must be added to the global context.
# subtheme selection: beige/serif/simple/sky/night/default
# transition selection: cube/page/concave/linear/none/default
GLOBAL_CONTEXT.update({
'subtheme': 'sky',
'transition': 'cube'
})