Skip to content

Commit

Permalink
Starting to incorporate Library Carpentry materials
Browse files Browse the repository at this point in the history
  • Loading branch information
gvwilson committed Oct 7, 2016
1 parent 7f8e13d commit 0a8b55c
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 7 deletions.
9 changes: 7 additions & 2 deletions _includes/lesson_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.dc_site }}">Library Carpentry</a>
{% endif %}
</h4>
</div>
<div class="col-md-6" align="right">
Expand Down
8 changes: 8 additions & 0 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.dc_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" />
Expand All @@ -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.dc_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 %}
Expand Down
5 changes: 3 additions & 2 deletions _layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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:// -->
Expand Down
5 changes: 3 additions & 2 deletions _layouts/workshop.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,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:// -->
Expand Down
76 changes: 76 additions & 0 deletions assets/img/lc-icon-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bin/lesson_initialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
# Values for this lesson.
#------------------------------------------------------------
# Which carpentry is this ("swc" or "dc")?
# Which carpentry is this ("swc", "dc", or "lc")?
carpentry: "swc"
# Overall title for pages.
Expand Down
Binary file added favicon-lc.ico
Binary file not shown.

0 comments on commit 0a8b55c

Please sign in to comment.