Merge github.com:swcarpentry/styles into upgrade-bootstrap

Conflicts: css/swc-bootstrap.css css/swc.css
HPC-workshops · Jan 31, 2015 · 95b0f4c · 95b0f4c
2 parents 2f93d5c + ea5a11d
commit 95b0f4c
Show file tree

Hide file tree

Showing 3 changed files with 10,528 additions and 87 deletions.
diff --git a/css/deckjs-js/deckjs-custom.js b/css/deckjs-js/deckjs-custom.js
diff --git a/css/lesson.css b/css/lesson.css
diff --git a/css/swc.css b/css/swc.css
@@ -45,6 +45,16 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
 .challenge {
     background-color: #CCFFCC;
     border: 5px solid #CCFFCC;
+
+/* Comments in code. */
+.comment {
+    color: purple;
+}
+
+/* Error messages. */
+.err {
+    color: darkred;
+    font-style: italic;
 }
 
 /* Things to fix. */
@@ -54,6 +64,22 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
     background-color: lightgray;
 }
 
+/* Highlighted changes in code. */
+.highlight {
+    background-color: mistyrose;
+}
+
+/* Manual input. */
+.in {
+    color: darkgreen;
+}
+
+/* Program output. */
+.out {
+    color: darkblue;
+    font-style: italic;
+}
+
 /* Putting shadows around things. */
 .shadow {
     -moz-box-shadow: 0 0 30px 5px #999;
@@ -80,7 +106,7 @@ blockquote.testimonial cite {
 
 /* Main body of pages. */
 body {
-    font-family: "Open Sans", "Helvetica", "Arial", "sans-serif";
+    font-family: "Open Sans", "Helvetica", "Arial", sans-serif;
     color: rgb(03, 03, 03);
 }
 
@@ -97,6 +123,7 @@ body.stylesheet {
 }
 
 
+
 /* Code sample */
 pre.sourceCode,
 pre.input {
@@ -218,7 +245,6 @@ div.banner a img {
 	padding: 20px 25px;
 }
 
-
 /* Explanatory call-out boxes. */
 div.box {
     width: 54em;
@@ -534,8 +560,6 @@ div.chapter h2 {
 }
 
 
-
-
 /* For the Request a Workshop form */
 #ss-form .ss-q-title {
     display: block;
@@ -584,7 +608,6 @@ div.chapter h2 {
 }
 
 
-
 /* GitHub Ribbon */
 #github-ribbon a {
     background: #000;