Skip to content

Commit

Permalink
Merge pull request #643 from iranzo/elegant-to-master
Browse files Browse the repository at this point in the history
pelican_elegant: Link submodule to master branch
  • Loading branch information
justinmayer authored Apr 16, 2019
2 parents 74be1a6 + f9e3a0b commit 2946d4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
[submodule "elegant"]
path = elegant
url = https://github.com/Pelican-Elegant/elegant.git
branch = master
[submodule "niu-x2"]
path = niu-x2
url = https://github.com/wilbur-ma/niu-x2.git
Expand Down
2 changes: 1 addition & 1 deletion elegant
Submodule elegant updated 56 files
+3 −0 .gitignore
+20 −0 .hound.yml
+334 −0 .hound/eslintrc.json
+1 −0 .hound/ignoredfiles
+1,038 −0 .hound/rubocop.yml
+47 −0 .hound/stylelintrc.json
+154 −0 .hound/tslint.json
+37 −0 .travis.yml
+11 −0 AUTHORS.md
+2 −0 CHANGELOG.md
+115 −45 CONTRIBUTING.md
+21 −0 LICENSE
+0 −7 LICENSE.md
+51 −10 README.md
+60 −64 THANKS.md
+27 −0 setup.cfg
+46 −0 setup.py
+101 −0 static/css/admonition.css
+8 −1 static/css/elegant.css
+ static/tipuesearch/img/loader.gif
+ static/tipuesearch/img/search.png
+287 −83 static/tipuesearch/tipuesearch.css
+418 −193 static/tipuesearch/tipuesearch.js
+181 −12 static/tipuesearch/tipuesearch.min.js
+18 −0 static/tipuesearch/tipuesearch_content.js
+72 −40 static/tipuesearch/tipuesearch_set.js
+6 −1 templates/_includes/_defaults.html
+29 −0 templates/_includes/analytics.html
+10 −0 templates/_includes/article_author.html
+3 −3 templates/_includes/comments.html
+5 −5 templates/_includes/disqus_scripts.html
+1 −1 templates/_includes/favicon_links.html
+2 −2 templates/_includes/feeds_categories.html
+2 −2 templates/_includes/feeds_tags.html
+1 −1 templates/_includes/footer.html
+27 −0 templates/_includes/freelists.html
+1 −2 templates/_includes/minify_css.html
+0 −20 templates/_includes/multi_parts.html
+4 −0 templates/_includes/post_stats.html
+20 −0 templates/_includes/series.html
+1 −1 templates/_includes/smo_metadata.html
+1 −1 templates/_includes/stat_counter.html
+27 −22 templates/archives.html
+11 −4 templates/article.html
+14 −10 templates/base.html
+6 −6 templates/categories.html
+7 −4 templates/index.html
+1 −0 templates/page.html
+65 −62 templates/search.html
+3 −3 templates/tags.html
+150 −0 tests/pelicanconf.py
+72 −0 tests/peru.yaml
+20 −0 tests/publishconf.py
+0 −0 tests/requirements.txt
+12 −0 tests/test-requirements.txt
+35 −0 tests/trigger-build.js

0 comments on commit 2946d4c

Please sign in to comment.