Commit 2e8a6b0c authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch '2016-06' into building-r

parents 08d224ae 7c21775e

_config_dev.yml

+3 −8
Original line number Diff line number Diff line 
#------------------------------------------------------------

# This config-file is only needed for development. Instead of changing

# the url everytime you work locally on the project, run a server with

# This config file is only needed for development. Instead of changing

# the URL everytime you work locally on the project, run a server with

# both configuration files:

#

#    jekyll serve --config _config.yml,_config_dev.yml

#------------------------------------------------------------



# Is this production or development? (Overrides _config.yml.)

is_production: false



# Override root so that CSS and other resources will load locally.

github:

  url: http://0.0.0.0:4000
 
root: http://localhost:4000

_includes/all_keypoints.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  {% unless episode.break %}

    <tr>

      <td class="col-md-3">

        <a href="{{ site.github.url }}{{ episode.url }}">{{ episode.title }}</a>

        <a href="{{ site.root }}{{ episode.url }}">{{ episode.title }}</a>

      </td>

      <td class="col-md-9">

        <ul>

_includes/carpentries.html

+2 −2
Original line number Diff line number Diff line 
<div class="row">

  <div class="col-md-2" align="center">

    <a href="{{ site.swc_site }}"><img src="{{ site.github.url }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>

    <a href="{{ site.swc_site }}"><img src="{{ site.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>

  </div>

  <div class="col-md-8">

    Since 1998,
@@ -14,7 +14,7 @@ 
<br/>

<div class="row">

  <div class="col-md-2" align="center">

    <a href="{{ site.dc_site }}"><img src="{{ site.github.url }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>

    <a href="{{ site.dc_site }}"><img src="{{ site.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>

  </div>

  <div class="col-md-8">

    <a href="{{ site.dc_site }}">Data Carpentry</a> develops and teaches workshops on the fundamental data skills needed to conduct research.

_includes/episode_title.html

+5 −5
Original line number Diff line number Diff line
@@ -3,22 +3,22 @@ 
  <div class="col-md-1">

    <h3>

      {% if prev_episode %}

      <a href="{{ site.github.url }}{{ prev_episode.url }}"><span class="glyphicon glyphicon-menu-left"></span></a>

      <a href="{{ site.root }}{{ prev_episode.url }}"><span class="glyphicon glyphicon-menu-left"></span></a>

      {% else %}

      <a href="{{ site.github.url }}"><span class="glyphicon glyphicon-menu-up"></span></a>

      <a href="{{ site.root }}"><span class="glyphicon glyphicon-menu-up"></span></a>

      {% endif %}

    </h3>

  </div>

  <div class="col-md-10">

    <h3 class="maintitle"><a href="{{ site.github.url }}/">{{ site.title }}</a></h3>

    <h3 class="maintitle"><a href="{{ site.root }}/">{{ site.title }}</a></h3>

    <h1 class="maintitle">{{ page.title }}</h1>

  </div>

  <div class="col-md-1">

    <h3>

      {% if next_episode %}

      <a href="{{ site.github.url }}{{ next_episode.url }}"><span class="glyphicon glyphicon-menu-right"></span></a>

      <a href="{{ site.root }}{{ next_episode.url }}"><span class="glyphicon glyphicon-menu-right"></span></a>

      {% else %}

      <a href="{{ site.github.url }}"><span class="glyphicon glyphicon-menu-up"></span></a>

      <a href="{{ site.root }}"><span class="glyphicon glyphicon-menu-up"></span></a>

      {% endif %}

    </h3>

  </div>

_includes/javascript.html

+3 −3
Original line number Diff line number Diff line 
<script src="{{ site.github.url }}/assets/js/jquery.min.js"></script>

<script src="{{ site.github.url }}/assets/js/bootstrap.min.js"></script>

<script src="{{ site.github.url }}/assets/js/lesson.js"></script>
 
<script src="{{ site.root }}/assets/js/jquery.min.js"></script>

<script src="{{ site.root }}/assets/js/bootstrap.min.js"></script>

<script src="{{ site.root }}/assets/js/lesson.js"></script>