Commit 72aed7b2 authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch 'variables' of github.com:swcarpentry/styles into variables

parents 9cf0c6d1 8748a80b

Makefile

+2 −3
Original line number Diff line number Diff line
@@ -17,17 +17,16 @@ commands : 


## serve            : run a local server.

serve : lesson-rmd

	${JEKYLL} serve --config _config.yml,_config_dev.yml

	${JEKYLL} serve



## site             : build files but do not run a server.

site : lesson-rmd

	${JEKYLL} build --config _config.yml,_config_dev.yml

	${JEKYLL} build



# repo-check        : check repository settings.

repo-check :

	@bin/repo_check.py -s .





## clean            : clean up junk files.

clean :

	@rm -rf ${DST}

_config_dev.yml

deleted100644 → 0
+0 −9
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

# both configuration files:

#

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

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



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.root }}{{ episode.url }}">{{ episode.title }}</a>

        <a href="{{ site.github.url }}{{ 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.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>

    <a href="{{ site.swc_site }}"><img src="{{ site.github.url }}/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.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>

    <a href="{{ site.dc_site }}"><img src="{{ site.github.url }}/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.root }}{{ prev_episode.url }}"><span class="glyphicon glyphicon-menu-left"></span></a>

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

      {% else %}

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

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

      {% endif %}

    </h3>

  </div>

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

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

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

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

  </div>

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

    <h3>

      {% if next_episode %}

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

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

      {% else %}

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

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

      {% endif %}

    </h3>

  </div>