Merge pull request #250 from fmichonneau/favicons (f30cc4e0) · Commits · NDIP / Nova Packages / Nova Carpentry Tutorial

_includes/favicons.html

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		{% assign favicon_url = site.baseurl \| append: '/assets/favicons/' \| append: site.carpentry \| prepend: site.url %}

		{% if site.carpentry == 'swc' %}
		{% assign carpentry = 'Software Carpentry' %}
		{% elsif site.carpentry == 'dc' %}
		{% assign carpentry = 'Data Carpentry' %}
		{% elsif site.carpentry == 'lc' %}
		{% assign carpentry = 'Library Carpentry' %}
		{% elsif site.carpentry == 'cp' %}
		{% assign carpentry = 'The Carpentries' %}
		{% endif %}

		<!-- Favicons for everyone -->
		<link rel="apple-touch-icon-precomposed" sizes="57x57" href="{{ favicon_url }}/apple-touch-icon-57x57.png" />
		<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ favicon_url }}/apple-touch-icon-114x114.png" />
		<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ favicon_url }}/apple-touch-icon-72x72.png" />
		<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ favicon_url }}/apple-touch-icon-144x144.png" />
		<link rel="apple-touch-icon-precomposed" sizes="60x60" href="{{ favicon_url }}/apple-touch-icon-60x60.png" />
		<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ favicon_url }}/apple-touch-icon-120x120.png" />
		<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ favicon_url }}/apple-touch-icon-76x76.png" />
		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ favicon_url }}/apple-touch-icon-152x152.png" />
		<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-196x196.png" sizes="196x196" />
		<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-96x96.png" sizes="96x96" />
		<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-32x32.png" sizes="32x32" />
		<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-16x16.png" sizes="16x16" />
		<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-128.png" sizes="128x128" />
		<meta name="application-name" content="{{ carpentry }} - {{ site.title }}"/>
		<meta name="msapplication-TileColor" content="#FFFFFF" />
		<meta name="msapplication-TileImage" content="{{ favicon_url }}/mstile-144x144.png" />
		<meta name="msapplication-square70x70logo" content="{{ favicon_url }}/mstile-70x70.png" />
		<meta name="msapplication-square150x150logo" content="{{ favicon_url }}/mstile-150x150.png" />
		<meta name="msapplication-wide310x150logo" content="{{ favicon_url }}/mstile-310x150.png" />
		<meta name="msapplication-square310x310logo" content="{{ favicon_url }}/mstile-310x310.png" />

_includes/lesson_footer.html

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@
		{% elsif site.carpentry == "lc" %}
		Copyright © 2016–{{ 'now' \| date: "%Y" }}
		<a href="{{ site.lc_site }}">Library Carpentry</a>
		{% elsif site.carpentry == "cp" %}
		Copyright © 2018–{{ 'now' \| date: "%Y" }}
		<a href="{{ site.carpentries_site }}">The Carpentries</a>
		{% endif %}
		</div>
		<div class="col-md-6 help-links" align="right">

_includes/navbar.html

+8 −4

Original line number	Diff line number	Diff line
		@@ -12,17 +12,21 @@
		</button>

		{% comment %} Select what logo to display. {% endcomment %}
		{% if page.carpentry == "swc" %}
		{% if 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" />
		</a>
		{% elsif page.carpentry == "dc" %}
		{% elsif site.carpentry == "dc" %}
		<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" %}
		{% elsif site.carpentry == "lc" %}
		<a href="{{ site.lc_site }}" class="pull-left">
		<img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.png" alt="Library Carpentry logo" />
		<img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />
		</a>
		{% elsif site.carpentry == "cp" %}
		<a href="{{ site.carpentries_site }}" class="pull-left">
		<img class="navbar-logo" src="{{ page.root }}/assets/img/cp-logo-blue.svg" alt="The Carpentries logo" />
		</a>
		{% endif %}

_includes/workshop_footer.html

+3 −1

Original line number	Diff line number	Diff line
		@@ -7,11 +7,13 @@
		<h4>
		Copyright © 2016–{{ 'now' \| date: "%Y" }}
		{% if site.carpentry == "swc" %}
		<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
		<a href="{{ site.swc_site }}">Software Carpentry</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>
		{% elsif site.carpentry == "cp" %}
		<a href="{{ site.carpentries_site }}">The Carpentries</a>
		{% endif %}
		</h4>
		</div>

_layouts/base.html

+3 −7

Original line number	Diff line number	Diff line
		@@ -13,13 +13,9 @@
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/syntax.css" />
		{% if site.carpentry == "swc" %}
		<link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/favicon-swc.ico" />
		{% elsif site.carpentry == "dc" %}
		<link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/favicon-dc.ico" />
		{% elsif site.carpentry == "lc" %}
		<link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/favicon-lc.ico" />
		{% endif %}

		{% include favicons.html %}

		<!-- 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:// -->
		<!--[if lt IE 9]>