Commit 95b0f4c7 authored by Francois Michonneau's avatar Francois Michonneau
Browse files

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

Conflicts:
	css/swc-bootstrap.css
	css/swc.css
parents 2f93d5c1 ea5a11d1

css/deckjs-js/deckjs-custom.js

0 → 100644
+10500 −0

File added.

Preview size limit exceeded, changes collapsed.

css/lesson.css

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
/* 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;

}



/* Highlighted changes in code. */

.highlight {

    background-color: mistyrose;

}



/* Manual input. */

.in {

    color: darkgreen;

    margin-left: 20px;

}



/* Program output. */

.out {

    color: darkblue;

    margin-left: 20px;

}



/* 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;

}



/* Key points in summary. */

div.keypoints {}



/* Learning objectives. */

div.objectives {}

css/swc.css

+28 −5
Original line number Diff line number Diff line
@@ -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;