From eb598772c788470fe3072e5c604965f4f8533408 2014-01-29 03:43:14 From: Brian E. Granger Date: 2014-01-29 03:43:14 Subject: [PATCH] Formatting cleanup of renderedhtml.less. --- diff --git a/IPython/html/static/notebook/less/renderedhtml.less b/IPython/html/static/notebook/less/renderedhtml.less index 7955cae..6a4471c 100644 --- a/IPython/html/static/notebook/less/renderedhtml.less +++ b/IPython/html/static/notebook/less/renderedhtml.less @@ -1,11 +1,11 @@ .rendered_html { - color: black; + color: @textColor; em {font-style: italic;} strong {font-weight: bold;} u {text-decoration: underline;} - :link { text-decoration: underline } - :visited { text-decoration: underline } + :link {text-decoration: underline;} + :visited {text-decoration: underline;} // For a 14px base font size this goes as: // font-size = 26, 22, 18, 14, 12, 12 @@ -14,16 +14,16 @@ h2 {font-size: 157.1%; margin: 1.27em 0 0 0; font-weight: bold; line-height: 1.0;} h3 {font-size: 128.6%; margin: 1.55em 0 0 0; font-weight: bold; line-height: 1.0;} h4 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0;} - h5 {font-size: 100; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0; font-style: italic} - h6 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0; font-style: italic} + h5 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0; font-style: italic;} + h6 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0; font-style: italic;} // Reduce the top margins by 14px compared to above - h1:first-child {margin-top: 0.538em} - h2:first-child {margin-top: 0.636em} - h3:first-child {margin-top: 0.777em} - h4:first-child {margin-top: 1em} - h5:first-child {margin-top: 1em} - h6:first-child {margin-top: 1em} + h1:first-child {margin-top: 0.538em;} + h2:first-child {margin-top: 0.636em;} + h3:first-child {margin-top: 0.777em;} + h4:first-child {margin-top: 1em;} + h5:first-child {margin-top: 1em;} + h6:first-child {margin-top: 1em;} ul {list-style:disc; margin: 0em 2em;} ul ul {list-style:square; margin: 0em 2em;} @@ -34,23 +34,15 @@ ol ol ol ol {list-style:lower-roman; margin: 0em 2em;} /* any extras will just be numbers: */ ol ol ol ol ol {list-style:decimal; margin: 0em 2em;} - - * + ul { - margin-top: 1em; - } - - * + ol { - margin-top: 1em; - } + * + ul {margin-top: 1em;} + * + ol {margin-top: 1em;} hr { color: black; background-color: black; } - pre { - margin: 1em 2em; - } + pre {margin: 1em 2em;} pre, code { border: 0; @@ -60,54 +52,35 @@ padding: 0px; } - blockquote { - margin: 1em 2em; - } + blockquote {margin: 1em 2em;} table { - // Center tables horizontally margin-left: auto; margin-right: auto; border: 1px solid black; border-collapse: collapse; } - tr, th, td { border: 1px solid black; border-collapse: collapse; margin: 1em 2em; } - - td,th { + td, th { text-align: left; vertical-align: middle; padding: 4px; } + th {font-weight: bold;} + * + table {margin-top: 1em;} - th { - font-weight: bold; - } - - * + table { - margin-top: 1em; - } - - p { - text-align: justify; - } - - * + p { - margin-top: 1em; - } + p {text-align: justify;} + * + p {margin-top: 1em;} img { display: block; margin-left: auto; margin-right: auto; } - - * + img { - margin-top: 1em; - } + * + img {margin-top: 1em;} } diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index 2cddc98..42397ab 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -127,7 +127,7 @@ p.p-space{margin-bottom:10px} .rendered_html h2{font-size:157.1%;margin:1.27em 0 0 0;font-weight:bold;line-height:1} .rendered_html h3{font-size:128.6%;margin:1.55em 0 0 0;font-weight:bold;line-height:1} .rendered_html h4{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1} -.rendered_html h5{font-size:100;margin:2em 0 0 0;font-weight:bold;line-height:1;font-style:italic} +.rendered_html h5{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1;font-style:italic} .rendered_html h6{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1;font-style:italic} .rendered_html h1:first-child{margin-top:.538em} .rendered_html h2:first-child{margin-top:.636em} diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 707d341..8b6c29e 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1341,7 +1341,7 @@ p.p-space{margin-bottom:10px} .rendered_html h2{font-size:157.1%;margin:1.27em 0 0 0;font-weight:bold;line-height:1} .rendered_html h3{font-size:128.6%;margin:1.55em 0 0 0;font-weight:bold;line-height:1} .rendered_html h4{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1} -.rendered_html h5{font-size:100;margin:2em 0 0 0;font-weight:bold;line-height:1;font-style:italic} +.rendered_html h5{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1;font-style:italic} .rendered_html h6{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1;font-style:italic} .rendered_html h1:first-child{margin-top:.538em} .rendered_html h2:first-child{margin-top:.636em}