Commit 4a0ac26f authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch 'markdownify' into 2016-06

parents ae6d6f67 c3a16396

_includes/all_keypoints.html

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
      <td class="col-md-9">

        <ul>

        {% for keypoint in episode.keypoints %}

  	<li>{{ keypoint }}</li>

        <li>{{ keypoint|markdownify }}</li>

        {% endfor %}

        </ul>

      </td>

_includes/episode_keypoints.html

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  <h2>Key Points</h2>

  <ul>

    {% for keypoint in page.keypoints %}

    <li>{{ keypoint }}</li>

    <li>{{ keypoint|markdownify }}</li>

    {% endfor %}

  </ul>

</blockquote>

_includes/episode_overview.html

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
      <strong>Questions</strong>

      <ul>

	{% for question in page.questions %}

	<li>{{ question }}</li>

	<li>{{ question|markdownify }}</li>

	{% endfor %}

      </ul>

    </div>
@@ -27,7 +27,7 @@ 
      <strong>Objectives</strong>

      <ul>

	{% for objective in page.objectives %}

	<li>{{ objective }}</li>

	<li>{{ objective|markdownify }}</li>

	{% endfor %}

      </ul>

    </div>

_includes/syllabus.html

+6 −1
Original line number Diff line number Diff line
@@ -41,7 +41,12 @@ 
          Break

        {% else %}

          {% if episode.questions %}

            {{ episode.questions | join: '<br/>' }}

            {% for question in episode.questions %}

              {{question|markdownify|strip_html}}

              {% unless forloop.last %}

              <br/>

              {% endunless %}

            {% endfor %}

          {% endif %}

        {% endif %}

      </td>

assets/css/lesson.scss

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ ol { 
  padding-left: 1em;

}





span.fold-unfold {

  margin-left: 1em;

  opacity: 0.5;