Merge pull request #5075 from jdfreder/flex-model-2

More flexible box model fixes
ipython · Feb 11, 2014 · 4f1fc22 · 4f1fc22
2 parents 2ce9eb8 + 2565521
commit 4f1fc22
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 52 deletions.
diff --git a/IPython/html/static/base/less/flexbox.less b/IPython/html/static/base/less/flexbox.less
@@ -2,7 +2,24 @@
 /* Flexible box model classes */
 /* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
 
+/* This file is a compatability layer.  It allows the usage of flexible box 
+model layouts accross multiple browsers, including older browsers.  The newest,
+universal implementation of the flexible box model is used when available (see
+`Modern browsers` comments below).  Browsers that are known to implement this 
+new spec completely include:
+
+    Firefox 28.0+
+    Chrome 29.0+
+    Internet Explorer 11+ 
+    Opera 17.0+
+
+Browsers not listed, including Safari, are supported via the styling under the
+`Old browsers` comments below.
+*/
+
+
 .hbox {
+    /* Old browsers */
     display: -webkit-box;
     -webkit-box-orient: horizontal;
     -webkit-box-align: stretch;
@@ -15,19 +32,24 @@
     box-orient: horizontal;
     box-align: stretch;
 
+    /* Modern browsers */
     display: flex;
     flex-direction: row;
     align-items: stretch;
 }
 
 .hbox > * {
+    /* Old browsers */
     -webkit-box-flex: 0;
     -moz-box-flex: 0;
     box-flex: 0;
-    flex: auto;
+
+    /* Modern browsers */
+    flex: none;
 }
 
 .vbox {
+    /* Old browsers */
     display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-box-align: stretch;
@@ -42,108 +64,138 @@
     /* width must be 100% to force FF to behave like webkit */
     width: 100%;
 
+    /* Modern browsers */
     display: flex;
     flex-direction: column;
     align-items: stretch;
 }
 
 .vbox > * {
+    /* Old browsers */
     -webkit-box-flex: 0;
     -moz-box-flex: 0;
     box-flex: 0;
-    flex: auto;
+
+    /* Modern browsers */
+    flex: none;
 }
 
 .reverse {
+    /* Old browsers */
     -webkit-box-direction: reverse;
     -moz-box-direction: reverse;
     box-direction: reverse;
-    flex-direction: column-reverse;
+
+    /* Modern browsers */
+    flex-direction: row-reverse;
 }
 
 .box-flex0 {
+    /* Old browsers */
     -webkit-box-flex: 0;
     -moz-box-flex: 0;
     box-flex: 0;
-    flex: auto;
+
+    /* Modern browsers */
+    flex: none;
+    width: auto;
 }
 
 .box-flex1 {
+    /* Old browsers */
     -webkit-box-flex: 1;
     -moz-box-flex: 1;
     box-flex: 1;
+
+    /* Modern browsers */
     flex: 1;
 }
 
 .box-flex {
+    /* Old browsers */
     .box-flex1();
 }
 
 .box-flex2 {
+    /* Old browsers */
     -webkit-box-flex: 2;
     -moz-box-flex: 2;
     box-flex: 2;
+
+    /* Modern browsers */
     flex: 2;
 }
 
 .box-group1 {
-    /* 
-    Deprecated
-        Grouping isn't supported in http://dev.w3.org/csswg/css-flexbox/
-    */
+    /*  Deprecated */
     -webkit-box-flex-group: 1;
     -moz-box-flex-group: 1;
     box-flex-group: 1;
 }
 
 .box-group2 {
-    /* 
-    Deprecated
-        Grouping isn't supported in http://dev.w3.org/csswg/css-flexbox/
-    */
+    /* Deprecated */
     -webkit-box-flex-group: 2;
     -moz-box-flex-group: 2;
     box-flex-group: 2;
 }
 
 .start {
+    /* Old browsers */
     -webkit-box-pack: start;
     -moz-box-pack: start;
     box-pack: start;
+
+    /* Modern browsers */
     justify-content: flex-start;
 }
 
 .end {
+    /* Old browsers */
     -webkit-box-pack: end;
     -moz-box-pack: end;
     box-pack: end;
+
+    /* Modern browsers */
     justify-content: flex-end;
 }
 
 .center {
+    /* Old browsers */
     -webkit-box-pack: center;
     -moz-box-pack: center;
     box-pack: center;
+
+    /* Modern browsers */
     justify-content: center;
 }
 
 .align-start {
+    /* Old browsers */
     -webkit-box-align: start;
     -moz-box-align: start;
     box-align: start;
-    align-content: flex-start;
+
+    /* Modern browsers */
+    align-items: flex-start;
 }
 
 .align-end {
+    /* Old browsers */
     -webkit-box-align: end;
     -moz-box-align: end;
     box-align: end;
-    align-content: flex-end;
+
+    /* Modern browsers */
+    align-items: flex-end;
 }
 
 .align-center {
+    /* Old browsers */
     -webkit-box-align: center;
     -moz-box-align: center;
     box-align: center;
-    align-content: center;
+
+    /* Modern browsers */
+    align-items: center;
 }
diff --git a/IPython/html/static/notebook/less/outputarea.less b/IPython/html/static/notebook/less/outputarea.less
@@ -14,6 +14,7 @@ div.output_scroll {
     overflow: auto;
     .corner-all;
     .box-shadow(inset 0 2px 8px rgba(0, 0, 0, .8));
+    display: block;
 }
 
 /* output div while it is collapsed */

diff --git a/IPython/html/static/notebook/less/widgets.less b/IPython/html/static/notebook/less/widgets.less
@@ -24,6 +24,7 @@
         .border-box-sizing();
         .vbox();
         .box-flex2();
+        .align-start();
     }
 }
 
@@ -256,6 +257,7 @@
 .widget-container {
     /* ContainerWidget */
     .border-box-sizing();
+    .align-start();
 }
 
 .docked-widget-modal {

diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css
@@ -5,11 +5,11 @@
 .border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
 .corner-all{border-radius:4px}
 .hbox{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;display:flex;flex-direction:row;align-items:stretch}
-.hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:auto}
+.hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}
 .vbox{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%;display:flex;flex-direction:column;align-items:stretch}
-.vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:auto}
-.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:column-reverse}
-.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:auto}
+.vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}
+.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:row-reverse}
+.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none;width:auto}
 .box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
 .box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
 .box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}
@@ -18,9 +18,9 @@
 .start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start}
 .end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end}
 .center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center}
-.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-content:flex-start}
-.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-content:flex-end}
-.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-content:center}
+.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
+.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-items:flex-end}
+.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-items:center}
 div.error{margin:2em;text-align:center}
 div.error>h1{font-size:500%;line-height:normal}
 div.error>p{font-size:200%;line-height:normal}
@@ -105,7 +105,7 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
 .cm-s-ipython span.cm-meta{color:#a2f}
 .cm-s-ipython span.cm-tab{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);background-position:right;background-repeat:no-repeat}
 div.output_wrapper{position:relative;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%;display:flex;flex-direction:column;align-items:stretch}
-div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8)}
+div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);display:block}
 div.output_collapsed{margin:0;padding:0;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%;display:flex;flex-direction:column;align-items:stretch}
 div.out_prompt_overlay{height:100%;padding:0 .4em;position:absolute;border-radius:4px}
 div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000;-moz-box-shadow:inset 0 0 1px #000;box-shadow:inset 0 0 1px #000;background:rgba(240,240,240,0.5)}
@@ -171,7 +171,7 @@ 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}
-.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;display:flex;flex-direction:row;align-items: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%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}
+.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;display:flex;flex-direction:row;align-items: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%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
 .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}
 .widget-hreadout{padding-left:8px;padding-top:3px;text-align:left;vertical-align:text-top}
@@ -184,12 +184,12 @@ div.cell.text_cell.rendered{padding:0}
 .widget-numeric-text{width:150px}
 .widget-progress{width:363px}.widget-progress .bar{-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none}
 .widget-combo-btn{min-width:138px;}
-.widget-box{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
-.widget-hbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;display:flex;flex-direction:row;align-items:stretch}
-.widget-hbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;display:flex;flex-direction:row;align-items:stretch;height:30px}
-.widget-vbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;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%;display:flex;flex-direction:column;align-items:stretch}
-.widget-vbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;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%;display:flex;flex-direction:column;align-items:stretch;width:30px}
+.widget-box{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
+.widget-hbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start;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;display:flex;flex-direction:row;align-items:stretch}
+.widget-hbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start;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;display:flex;flex-direction:row;align-items:stretch;height:30px}
+.widget-vbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start;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%;display:flex;flex-direction:column;align-items:stretch}
+.widget-vbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start;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%;display:flex;flex-direction:column;align-items:stretch;width:30px}
 .widget-modal{overflow:hidden;position:absolute !important;top:0;left:0;margin-left:0 !important}
 .widget-modal-body{max-height:none !important}
-.widget-container{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
+.widget-container{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
 .docked-widget-modal{overflow:hidden;position:relative !important;top:0 !important;left:0 !important;margin-left:0 !important}