Commit b447fbcf authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch 'gh-pages' of github.com:swcarpentry/styles into gh-pages

parents 607e1022 c8f6fdc8

LICENSE.md

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 


## Trademark



"Software Carpentry" an "Data Carpentry" and their respective logos

"Software Carpentry" and "Data Carpentry" and their respective logos

are registered trademarks of [NumFOCUS][numfocus].



[cc-by-human]: https://creativecommons.org/licenses/by/4.0/

_includes/lesson_footer.html

+10 −3
Original line number Diff line number Diff line
@@ -3,8 +3,13 @@ 
    <div class="col-md-6" align="left">

      <h4>

	Copyright &copy; 2016

	{% if site.carpentry == "swc" %}<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>{% endif %}

	{% if site.carpentry == "dc" %}<a href="{{ site.dc_site }}">Data Carpentry</a>{% endif %}

	{% if site.carpentry == "swc" %}

	<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>

	{% elsif site.carpentry == "dc" %}

	<a href="{{ site.dc_site }}">Data Carpentry</a>

	{% elsif site.carpentry == "lc" %}

	<a href="{{ site.lc_site }}">Library Carpentry</a>

	{% endif %}

      </h4>

    </div>

    <div class="col-md-6" align="right">
@@ -13,7 +18,9 @@ 
	/

	<a href="{{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md">Contributing</a>

	/

	<a href="mailto:{{ site.email }}">Contact</a>

	<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>

	/

	<a href="{{ site.contact }}">Contact</a>

      </h4>

    </div>

  </div>

_includes/navbar.html

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
      <a href="{{ site.dc_site }}" class="pull-left">

        <img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />

      </a>

      {% elsif page.carpentry == "lc" %}

      <a href="{{ site.lc_site }}" class="pull-left">

        <img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />

      </a>

      {% elsif site.carpentry == "swc" %}

      <a href="{{ site.swc_site }}" class="pull-left">

        <img class="navbar-logo" src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />
@@ -25,6 +29,10 @@ 
      <a href="{{ site.dc_site }}" class="pull-left">

        <img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />

      </a>

      {% elsif site.carpentry == "lc" %}

      <a href="{{ site.lc_site }}" class="pull-left">

        <img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />

      </a>

      {% endif %}



      {% comment %} Always show link to home page. {% endcomment %}

_includes/syllabus.html

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 
  {% assign current = site.start_time %}



  <table class="table table-striped">

  <tr>

    <td class="col-md-1"></td>

    <td class="col-md-3"><a href="{{ page.root }}/setup">Setup</a></td>

    <td class="col-md-7">Dowload files used on the lesson.</td>

  </tr>

  {% for episode in site.episodes %}

    {% if episode.start %} {% comment %} Starting a new day? {% endcomment %}

      {% assign day = day | plus: 1 %}

_layouts/base.html

+3 −2
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />

    {% if site.carpentry == "swc" %}

    <link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />

    {% endif %}

    {% if site.carpentry == "dc" %}

    {% elsif site.carpentry == "dc" %}

    <link rel="shortcut icon" type="image/x-icon" href="/favicon-dc.ico" />

    {% elsif site.carpentry == "lc" %}

    <link rel="shortcut icon" type="image/x-icon" href="/favicon-lc.ico" />

    {% endif %}

    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->

    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->