Unverified Commit 3aff0b20 authored by Raniere Silva's avatar Raniere Silva Committed by GitHub
Browse files

Merge branch 'gh-pages' into 237

parents 1c0fabab 6f0df1dd

_includes/lesson_footer.html

+0 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
<footer>

  <div class="row">

    <div class="col-md-6" align="left">

      <h4>

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

	Copyright &copy; 2018–{{ 'now' | date: "%Y" }}

	<a href="{{ site.carpentries_site }}">The Carpentries</a>
@@ -21,10 +20,8 @@ 
	Copyright &copy; 2016–{{ 'now' | date: "%Y" }}

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

	{% endif %}

      </h4>

    </div>

    <div class="col-md-6" align="right">

      <h4>

	{% if page.source %}

	{% if page.source == "Rmd" %}

	<a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>
@@ -40,7 +37,6 @@ 
	<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>

	/

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

      </h4>

    </div>

  </div>

</footer>

_layouts/base.html

+4 −4
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 
    <meta http-equiv="last-modified" content="{{ site.time }}">

    <meta name="viewport" content="width=device-width, initial-scale=1">

    <!-- meta "search-domain" used for google site search function google_search() -->

    <meta name="search-domain" value="{{ site.github.html_url }}">

    <meta name="search-domain" value="{{ site.github.url }}">

    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />

    <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="/favicon-swc.ico" />

    <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="/favicon-dc.ico" />

    <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="/favicon-lc.ico" />

    <link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/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:// -->

assets/css/lesson.scss

+8 −0
Original line number Diff line number Diff line
@@ -140,6 +140,14 @@ img { 
  text-align: center;

}



footer {

    font-size: 18px;

    margin-top: 10px;

    margin-bottom: 10px;

    font-weight: 500;

    line-height: 1.1;

}



img.navbar-logo {

  height: 40px; // synchronize with height of navbar

  padding-top: 5px;