More changes to the heading spacing. Good first draft...

IPython/html/static/notebook/less/notebook.less

@@ -25,7 +25,7 b' div#notebook {'
     overflow-x: auto;
     width: 100%;
     /* This spaces the cell away from the edge of the notebook area */
-    padding: 5px 5px 15px 5px;
+    padding: 1em 0 1em 0;
     margin: 0px;
     border-top: 1px solid @border_color;
     outline: none;

IPython/html/static/notebook/less/renderedhtml.less

@@ -6,22 +6,43 b''
     u {text-decoration: underline;}
     :link { text-decoration: underline }
     :visited { text-decoration: underline }
-    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;}
-    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;}
+
+    // For a 14px base font size this goes as:
+    // font-size = 26, 22, 18, 14, 12, 12
+    // margin-top = 14, 14, 14, 14, 8, 8
+    h1 {font-size: 185.7%; margin: 1.08em 0 0 0; font-weight: bold; line-height: 1.0;}
+    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: 85.7%; margin: 1.83em 0 0 0; font-weight: bold; line-height: 1.0;}
+    h6 {font-size: 85.7%; margin: 1.83em 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: 1.16em}
+    h6:first-child {margin-top: 1.16em}
+
+    ul {list-style:disc; margin: 0em 2em;}
     ul ul {list-style:square; margin: 0em 2em;}
     ul ul ul {list-style:circle; margin: 0em 2em;}
-    ol {list-style:decimal; margin: 1em 2em;}
+    ol {list-style:decimal; margin: 0em 2em;}
     ol ol {list-style:upper-alpha; margin: 0em 2em;}
     ol ol ol {list-style:lower-alpha; margin: 0em 2em;}
     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;
+    }
+
     hr {
         color: black;
         background-color: black;
@@ -67,22 +88,22 b''
         font-weight: bold;
     }
 
-    p {
-        text-align: justify;
+    * + table {
+        margin-top: 1em;
     }
 
-    img {
-        display: block;
-        margin-left: auto;
-        margin-right: auto;
+    p {
+        text-align: justify;
     }
 
     * + p {
         margin-top: 1em;
     }
 
-    * + table {
-        margin-top: 1em;
+    img {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
     }
     
     * + img {

IPython/html/static/notebook/less/textcell.less

@@ -35,12 +35,3 b' h1,h2,h3,h4,h5,h6 {'
 div.cell.text_cell.rendered {
     padding: 0px;
 }
-
-div.text_cell_render.rendered_html {
-    h1 {font-size: 26px; margin: 14px 0 0 0; font-weight: bold; line-height: 1.0;}
-    h2 {font-size: 22px; margin: 14px 0 0 0; font-weight: bold; line-height: 1.0;}
-    h3 {font-size: 18px; margin: 14px 0 0 0; font-weight: bold; line-height: 1.0;}
-    h4 {font-size: 14px; margin: 14px 0 0 0; font-weight: bold; line-height: 1.0;}
-    h5 {font-size: 14px; margin: 6px 0 0 0; font-weight: bold; line-height: 1.0;}
-    h6 {font-size: 14px; margin: 6px 0 0 0; font-weight: bold; line-height: 1.0;}
-}
  No newline at end of file

IPython/html/static/style/ipython.min.css

@@ -123,20 +123,28 b' p.p-space{margin-bottom:10px}'
 .rendered_html u{text-decoration:underline}
 .rendered_html :link{text-decoration:underline}
 .rendered_html :visited{text-decoration:underline}
-.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:.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 h1{font-size:185.7%;margin:1.08em 0 0 0;font-weight:bold;line-height:1}
+.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:85.7%;margin:1.83em 0 0 0;font-weight:bold;line-height:1}
+.rendered_html h6{font-size:85.7%;margin:1.83em 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}
+.rendered_html h3:first-child{margin-top:.777em}
+.rendered_html h4:first-child{margin-top:1em}
+.rendered_html h5:first-child{margin-top:1.16em}
+.rendered_html h6:first-child{margin-top:1.16em}
+.rendered_html ul{list-style:disc;margin:0 2em}
 .rendered_html ul ul{list-style:square;margin:0 2em}
 .rendered_html ul ul ul{list-style:circle;margin:0 2em}
-.rendered_html ol{list-style:decimal;margin:1em 2em}
+.rendered_html ol{list-style:decimal;margin:0 2em}
 .rendered_html ol ol{list-style:upper-alpha;margin:0 2em}
 .rendered_html ol ol ol{list-style:lower-alpha;margin:0 2em}
 .rendered_html ol ol ol ol{list-style:lower-roman;margin:0 2em}
 .rendered_html ol ol ol ol ol{list-style:decimal;margin:0 2em}
+.rendered_html *+ul{margin-top:1em}
+.rendered_html *+ol{margin-top:1em}
 .rendered_html hr{color:#000;background-color:#000}
 .rendered_html pre{margin:1em 2em}
 .rendered_html pre,.rendered_html code{border:0;background-color:#fff;color:#000;font-size:100%;padding:0}
@@ -145,10 +153,10 b' p.p-space{margin-bottom:10px}'
 .rendered_html tr,.rendered_html th,.rendered_html td{border:1px solid #000;border-collapse:collapse;margin:1em 2em}
 .rendered_html td,.rendered_html th{text-align:left;vertical-align:middle;padding:4px}
 .rendered_html th{font-weight:bold}
+.rendered_html *+table{margin-top:1em}
 .rendered_html p{text-align:justify}
-.rendered_html img{display:block;margin-left:auto;margin-right:auto}
 .rendered_html *+p{margin-top:1em}
-.rendered_html *+table{margin-top:1em}
+.rendered_html img{display:block;margin-left:auto;margin-right:auto}
 .rendered_html *+img{margin-top:1em}
 div.text_cell{padding:5px 5px 5px 0;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch}
 div.text_cell_input{color:#000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
@@ -156,12 +164,6 b' div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;pa'
 a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden}
 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible}
 div.cell.text_cell.rendered{padding:0}
-div.text_cell_render.rendered_html h1{font-size:26px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h2{font-size:22px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h3{font-size:18px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h4{font-size:14px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h5{font-size:14px;margin:6px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h6{font-size:14px;margin:6px 0 0 0;font-weight:bold;line-height:1}
 .widget-area{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch}.widget-area .widget-subarea{padding:.44em .4em .4em 1px;margin-left:6px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2}
 .widget-hlabel{min-width:10ex;padding-right:8px;padding-top:3px;text-align:right;vertical-align:text-top}
 .widget-vlabel{padding-bottom:5px;text-align:center;vertical-align:text-bottom}

IPython/html/static/style/style.min.css

@@ -1337,20 +1337,28 b' p.p-space{margin-bottom:10px}'
 .rendered_html u{text-decoration:underline}
 .rendered_html :link{text-decoration:underline}
 .rendered_html :visited{text-decoration:underline}
-.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:.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 h1{font-size:185.7%;margin:1.08em 0 0 0;font-weight:bold;line-height:1}
+.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:85.7%;margin:1.83em 0 0 0;font-weight:bold;line-height:1}
+.rendered_html h6{font-size:85.7%;margin:1.83em 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}
+.rendered_html h3:first-child{margin-top:.777em}
+.rendered_html h4:first-child{margin-top:1em}
+.rendered_html h5:first-child{margin-top:1.16em}
+.rendered_html h6:first-child{margin-top:1.16em}
+.rendered_html ul{list-style:disc;margin:0 2em}
 .rendered_html ul ul{list-style:square;margin:0 2em}
 .rendered_html ul ul ul{list-style:circle;margin:0 2em}
-.rendered_html ol{list-style:decimal;margin:1em 2em}
+.rendered_html ol{list-style:decimal;margin:0 2em}
 .rendered_html ol ol{list-style:upper-alpha;margin:0 2em}
 .rendered_html ol ol ol{list-style:lower-alpha;margin:0 2em}
 .rendered_html ol ol ol ol{list-style:lower-roman;margin:0 2em}
 .rendered_html ol ol ol ol ol{list-style:decimal;margin:0 2em}
+.rendered_html *+ul{margin-top:1em}
+.rendered_html *+ol{margin-top:1em}
 .rendered_html hr{color:#000;background-color:#000}
 .rendered_html pre{margin:1em 2em}
 .rendered_html pre,.rendered_html code{border:0;background-color:#fff;color:#000;font-size:100%;padding:0}
@@ -1359,10 +1367,10 b' p.p-space{margin-bottom:10px}'
 .rendered_html tr,.rendered_html th,.rendered_html td{border:1px solid #000;border-collapse:collapse;margin:1em 2em}
 .rendered_html td,.rendered_html th{text-align:left;vertical-align:middle;padding:4px}
 .rendered_html th{font-weight:bold}
+.rendered_html *+table{margin-top:1em}
 .rendered_html p{text-align:justify}
-.rendered_html img{display:block;margin-left:auto;margin-right:auto}
 .rendered_html *+p{margin-top:1em}
-.rendered_html *+table{margin-top:1em}
+.rendered_html img{display:block;margin-left:auto;margin-right:auto}
 .rendered_html *+img{margin-top:1em}
 div.text_cell{padding:5px 5px 5px 0;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch}
 div.text_cell_input{color:#000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
@@ -1370,12 +1378,6 b' div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;pa'
 a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden}
 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible}
 div.cell.text_cell.rendered{padding:0}
-div.text_cell_render.rendered_html h1{font-size:26px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h2{font-size:22px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h3{font-size:18px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h4{font-size:14px;margin:14px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h5{font-size:14px;margin:6px 0 0 0;font-weight:bold;line-height:1}
-div.text_cell_render.rendered_html h6{font-size:14px;margin:6px 0 0 0;font-weight:bold;line-height:1}
 .widget-area{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch}.widget-area .widget-subarea{padding:.44em .4em .4em 1px;margin-left:6px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2}
 .widget-hlabel{min-width:10ex;padding-right:8px;padding-top:3px;text-align:right;vertical-align:text-top}
 .widget-vlabel{padding-bottom:5px;text-align:center;vertical-align:text-bottom}
@@ -1399,7 +1401,7 b' body{background-color:#fff}'
 body.notebook_app{overflow:hidden}
 span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%}
 div#notebook_panel{margin:0 0 0 0;padding:0;-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}
-div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0;border-top:1px solid #ababab;outline:none;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
+div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:1em 0 1em 0;margin:0;border-top:1px solid #ababab;outline:none;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
 div.ui-widget-content{border:1px solid #ababab;outline:none}
 pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:.4em;padding-left:2em}
 p.dialog{padding:.2em}