diff --git a/.gitignore b/.gitignore index d0174fb..335a261 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ Thumbs.db .rbenv-version .rvmrc + +.idea diff --git a/_config.yml b/_config.yml index cb62001..1693fcf 100644 --- a/_config.yml +++ b/_config.yml @@ -1,10 +1,9 @@ # This is the default format. # For more see: https://github.com/mojombo/jekyll/wiki/Permalinks permalink: /:categories/:year/:month/:day/:title - exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"] auto: true -pygments: true +highlighter: pygments # Themes are encouraged to use these universal variables # so be sure to set them if your theme uses them. @@ -58,7 +57,7 @@ JB : BASE_PATH : false # By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme. - # ex: [BASE_PATH]/assets/themes/[THEME-NAME] + # ex: [BASE_PATH]/assets/themes/[THEME_NAME] # # Override this by defining an absolute path to assets here. # ex: @@ -122,5 +121,4 @@ JB : # Setting any helper's provider to 'custom' will bypass the helper code # and include your custom code. Your custom file must be defined at: # ./_includes/custom/[HELPER] - # where [HELPER] is the name of the helper you are overriding. - + # where [HELPER] is the name of the helper you are overriding. \ No newline at end of file diff --git a/_includes/JB/setup b/_includes/JB/setup index efcd84b..b17f493 100644 --- a/_includes/JB/setup +++ b/_includes/JB/setup @@ -16,7 +16,7 @@ {% if site.JB.ASSET_PATH %} {% assign ASSET_PATH = site.JB.ASSET_PATH %} {% else %} - {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %} + {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{% if page.theme.name %}{{ page.theme.name }}{% else if %}{{ layout.theme.name }}{% endif %}{% endcapture %} {% endif %} {% endif %} {% endcapture %}{% assign jbcache = nil %} \ No newline at end of file diff --git a/_includes/themes/metromongo/frontpage.html b/_includes/themes/metromongo/frontpage.html index 1a9b6f7..3cacdb6 100644 --- a/_includes/themes/metromongo/frontpage.html +++ b/_includes/themes/metromongo/frontpage.html @@ -74,7 +74,7 @@

Tutorial

Help wanted

-

We're always looking for help on any aspect of mongoengine.

+

We're always looking for help on any aspect of Mongoengine.

@@ -135,7 +135,7 @@

tutorial. You can find help by joining the MongoEngine - Users mailing list or by chatting with other users on the #mongoengine IRC channel. + Users mailing list.

@@ -156,7 +156,7 @@

mongoengine

Community

- You can find help by joining the MongoEngine Users mailing list or by chatting with other users on the #mongoengine IRC channel. + You can find help by joining the MongoEngine Users mailing list.

Contributing

@@ -172,7 +172,7 @@

Contributing

  • MongoEngine website!
  • - To contribute to the project contact me @RossC0 or fork any repository from the mongoengine organisation on github and send a pull request, all contributions and suggestions are welcome! + To contribute to the project, fork any repository from the mongoengine organisation on github and send a pull request, all contributions and suggestions are welcome!

    If you or your company is doing something cool / interesting on mongoengine then we want to know about it!

    diff --git a/_includes/themes/metromongo/settings.yml b/_includes/themes/metromongo/settings.yml index 260f82e..2ffddbb 100644 --- a/_includes/themes/metromongo/settings.yml +++ b/_includes/themes/metromongo/settings.yml @@ -1,2 +1,2 @@ theme : - name : mongoengine \ No newline at end of file + name : metromongo \ No newline at end of file diff --git a/_includes/themes/mongoengine/frontpage.html b/_includes/themes/mongoengine/frontpage.html index 1aa5399..a81effe 100644 --- a/_includes/themes/mongoengine/frontpage.html +++ b/_includes/themes/mongoengine/frontpage.html @@ -142,7 +142,7 @@

    Getting Started

    and a tutorial. You can find help by joining the MongoEngine - Users mailing list or by chatting with other users on the #mongoengine IRC channel. + Users mailing list.

    If you are interested in contributing, join the @@ -186,8 +186,6 @@

    Contributing

    Community

    -

    IRC

    -

    irc.freenode.net #mongoengine

    Github