Commit 0a321c76 authored by Raniere Silva's avatar Raniere Silva
Browse files

Merge styles 'v9.1.1'

parents 0fb70020 bb2b6119

_includes/lesson_footer.html

+10 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  <div class="row">

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

      <h4>

	Copyright &copy; 2016

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

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

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

	{% elsif site.carpentry == "dc" %}
@@ -17,10 +17,18 @@ 
    </div>

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

      <h4>

	<a href="{{ site.github.repository_url }}/">Source</a>

	{% 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>

	{% endif %}

	{% else %}

	<a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Edit on GitHub</a>

	{% endif %}

	/

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

	/

	<a href="{{ site.github.repository_url }}/">Source</a>

	/

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

	/

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

_includes/navbar.html

+8 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
	{% comment %} Show setup instructions, reference guide, and lesson episodes for lessons. {% endcomment %}

        {% if site.kind == "lesson" %}

        <li><a href="{{ page.root }}/setup/">Setup</a></li>

        <li><a href="{{ page.root }}/reference/">Reference</a></li>

        <li class="dropdown">

          <a href="{{ page.root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>

          <ul class="dropdown-menu">
@@ -67,6 +66,7 @@ 
        <li class="dropdown">

          <a href="{{ page.root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>

          <ul class="dropdown-menu">

            <li><a href="{{ page.root }}/reference/">Reference</a></li>

            {% for extra in site.extras %}

            <li><a href="{{ page.root }}{{ extra.url }}">{{ extra.title }}</a></li>

            {% endfor %}
@@ -76,6 +76,13 @@ 


	{% comment %} Always show license. {% endcomment %}

        <li><a href="{{ page.root }}/license/">License</a></li>

	{% if page.source %}

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

	<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>

	{% endif %}

	{% else %}

	<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>

	{% endif %}

      </ul>

      <form class="navbar-form navbar-right" role="search" id="search" onsubmit="google_search(); return false;">

        <div class="form-group">

_includes/syllabus.html

+10 −8
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
<div class="syllabus">

  <h2 id="schedule">Schedule</h2>



  {% assign lesson_number = 0 %}

  {% assign day = 0 %}

  {% assign multiday = false %}

  {% for episode in site.episodes %}
@@ -14,8 +15,8 @@ 


  <table class="table table-striped">

  <tr>

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

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

    {% if multiday %}<td class="col-md-1"></td>{% endif %}

    <td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}"></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>
@@ -26,8 +27,8 @@ 
        {% assign hours = current | divided_by: 60 %}

        {% assign minutes = current | modulo: 60 %}

        <tr>

          {% if multiday %}<td></td>{% endif %}

          <td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>

          {% if multiday %}<td class="col-md-1"></td>{% endif %}

          <td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>

          <td class="col-md-3">Finish</td>

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

        </tr>
@@ -38,9 +39,10 @@ 
    {% assign minutes = current | modulo: 60 %}

    <tr>

      {% if multiday %}<td class="col-md-1">{% if episode.start %}Day {{ day }}{% endif %}</td>{% endif %}

      <td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>

      <td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>

      <td class="col-md-3">

        <a href="{{ page.root }}{{ episode.url }}">{{ episode.title }}</a>

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

	{{ lesson_number }}. <a href="{{ page.root }}{{ episode.url }}">{{ episode.title }}</a>

      </td>

      <td class="col-md-7">

        {% if episode.break %}
@@ -62,8 +64,8 @@ 
  {% assign hours = current | divided_by: 60 %}

  {% assign minutes = current | modulo: 60 %}

  <tr>

    {% if multiday %}<td></td>{% endif %}

    <td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>

    {% if multiday %}<td class="col-md-1"></td>{% endif %}

    <td class="{% if multiday %}col-md-1{% else %}col-md-2{% endif %}">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>

    <td class="col-md-3">Finish</td>

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

  </tr>

assets/css/bootstrap.css

+1 −1
Original line number Diff line number Diff line
@@ -2263,7 +2263,7 @@ th { 
  text-align: left;

}

.table {

  /* width: 100%; -- CHANGE -- */

  width: 100%;

  max-width: 100%;

  margin-bottom: 20px;

}

assets/css/lesson.scss

+16 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ $color-testimonial: #fc8dc1 !default; 
  color: $color;

  border-left: solid 5px $color;

  margin-bottom: 0px;

  border-radius: 4px 0 0 4px;

}



.error  { @include cdSetup($color-error); }
@@ -45,6 +46,18 @@ $color-testimonial: #fc8dc1 !default; 
.r      { @include cdSetup($color-source); }

.sql    { @include cdSetup($color-source); }



.error pre,

.output pre,

.source pre,

.bash pre,

.make pre,

.matlab pre,

.python pre,

.r pre,

.sql pre {

  border-radius: 0 4px 4px 0;

}



//----------------------------------------

// Specialized blockquote environments for learning objectives, callouts, etc.

//----------------------------------------
@@ -100,9 +113,9 @@ $codeblock-padding: 5px !default; 
//----------------------------------------



code {

  padding: 0 0;

  color: inherit;

  background-color: inherit;

  padding: 2px 5px;

  color: #3d90d9;

  background-color: #e7e7e7;

}



img {