From 4acf97338f14b9476fe0e321e5d019b227435532 2013-02-05 00:24:22 From: Min RK Date: 2013-02-05 00:24:22 Subject: [PATCH] Merge pull request #2877 from Carreau/minor-css-fixes minor css fixes, forgotten ";" and remove commented rules. --- diff --git a/IPython/frontend/html/notebook/static/css/style.min.css b/IPython/frontend/html/notebook/static/css/style.min.css index 80b04e5..5195aa1 100644 --- a/IPython/frontend/html/notebook/static/css/style.min.css +++ b/IPython/frontend/html/notebook/static/css/style.min.css @@ -942,12 +942,12 @@ p{margin-bottom:0;} .rendered_html h1{font-size:197%;margin:.65em 0;font-weight:bold;} .rendered_html h2{font-size:153.9%;margin:.75em 0;font-weight:bold;} .rendered_html h3{font-size:123.1%;margin:.85em 0;font-weight:bold;} -.rendered_html h4{font-size:100% margin: 0.95em 0;font-weight:bold;} +.rendered_html h4{font-size:100%;margin:0.95em 0;font-weight:bold;} .rendered_html h5{font-size:85%;margin:1.5em 0;font-weight:bold;} .rendered_html h6{font-size:77%;margin:1.65em 0;font-weight:bold;} .rendered_html ul{list-style:disc;margin:1em 2em;} .rendered_html ul ul{list-style:square;margin:0em 2em;} -.rendered_html ul ul ul{list-style:circle;margin-left:0em 2em;} +.rendered_html ul ul ul{list-style:circle;margin:0em 2em;} .rendered_html ol{list-style:decimal;margin:1em 2em;} .rendered_html ol ol{list-style:upper-alpha;margin:0em 2em;} .rendered_html ol ol ol{list-style:lower-alpha;margin:0em 2em;} diff --git a/IPython/frontend/html/notebook/static/less/renderedhtml.less b/IPython/frontend/html/notebook/static/less/renderedhtml.less index d091f2b..e706c5d 100644 --- a/IPython/frontend/html/notebook/static/less/renderedhtml.less +++ b/IPython/frontend/html/notebook/static/less/renderedhtml.less @@ -9,12 +9,12 @@ h1 {font-size: 197%; margin: .65em 0; font-weight: bold;} h2 {font-size: 153.9%; margin: .75em 0; font-weight: bold;} h3 {font-size: 123.1%; margin: .85em 0; font-weight: bold;} - h4 {font-size: 100% margin: 0.95em 0; font-weight: bold;} + h4 {font-size: 100%; margin: 0.95em 0; font-weight: bold;} h5 {font-size: 85%; margin: 1.5em 0; font-weight: bold;} h6 {font-size: 77%; margin: 1.65em 0; font-weight: bold;} ul {list-style:disc; margin: 1em 2em;} ul ul {list-style:square; margin: 0em 2em;} - ul ul ul {list-style:circle; margin-left: 0em 2em;} + ul ul ul {list-style:circle; margin: 0em 2em;} ol {list-style:decimal; margin: 1em 2em;} ol ol {list-style:upper-alpha; margin: 0em 2em;} ol ol ol {list-style:lower-alpha; margin: 0em 2em;} diff --git a/IPython/frontend/html/notebook/static/less/tooltip.less b/IPython/frontend/html/notebook/static/less/tooltip.less index 13635b8..297d8a9 100644 --- a/IPython/frontend/html/notebook/static/less/tooltip.less +++ b/IPython/frontend/html/notebook/static/less/tooltip.less @@ -49,11 +49,6 @@ to {opacity:0;} } -//@keyframes fadeOut { -// from {opacity:1;} -// to {opacity:0;} -//} - @-moz-keyframes fadeIn { from {opacity:0;} to {opacity:1;} @@ -64,11 +59,6 @@ to {opacity:1;} } -//@keyframes fadeIn { -// from {opacity:0;} -// to {opacity:1;} -//} - /*properties of tooltip after "expand"*/ .bigtooltip { overflow: auto; @@ -129,7 +119,6 @@ } - .pretooltiparrow { left: 0px; margin: 0px;