Merge pull request #5 from swcarpentry/join-site-lesson

Join CSS from site and lessons

css/badge.css

@@ -0,0 +1,18 @@
+.badges-section {
+  margin-bottom:30px;
+}
+.badges-section .media {
+  margin-top: 30px;
+}
+h1.badge-title{
+  margin-top: 10px;
+}
+#modal-badge-img {
+  position:absolute;
+  right: 25px;
+  bottom: 25px;
+  opacity: 0.5;
+}
+#assertion-modal.in {
+  color: black;
+}

css/lesson.css

@@ -1,33 +1,3 @@
-/* pre blocks inherit color from parent */
-pre {
-    color: inherit;
-}
-
-/* Work around to issue when create EPUB with pandoc for IPython Notebook
- * template.
- */
-div.out {
-  display: block;
-  padding: 9.5px;
-  margin-bottom: 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-div.out pre {
-    padding: 0px;
-    margin: 0px;
-    border: 0px;
-}
-
 /* Comments in code. */
 .comment {
     color: purple;
@@ -41,42 +11,37 @@ div.out pre {
 /* Manual input. */
 .in {
     color: darkgreen;
-    margin-left: 20px;
 }
 
 /* Program output. */
 .out {
     color: darkblue;
-    margin-left: 20px;
+    font-style: italic;
 }
 
 /* Error output. */
 .err {
     color: darkred;
-    margin-left: 20px;
     font-style: italic;
     font-weight: bold;
 }
 
-/* Files. */
-.file {
-    margin-left: 20px;
-}
-
 /* Explanatory call-out boxes. */
 div.box {
     background-color: lightgray;
 }
 
 /* Challenge questions. */
-div.challenge {
-    border-style: solid;
-    border-width: thin;
-    border-color: gray;
-}
+div.challenges {}
 
 /* Key points in summary. */
 div.keypoints {}
 
+/* Main lesson. */
+div.lesson {}
+
 /* Learning objectives. */
 div.objectives {}
+
+/* Continuation paragraph. */
+p.continue {}