From 2f0cc6b2cb7ca47f2b19b1b56ce24fbd598e22d3 2013-03-25 02:37:29 From: Min RK <benjaminrk@gmail.com> Date: 2013-03-25 02:37:29 Subject: [PATCH] Merge pull request #3051 from minrk/vbox-ff-fail add width:100% to vbox for webkit / FF consistency closes #3049 --- diff --git a/IPython/frontend/html/notebook/static/css/style.min.css b/IPython/frontend/html/notebook/static/css/style.min.css index 18f18c7..563f76f 100644 --- a/IPython/frontend/html/notebook/static/css/style.min.css +++ b/IPython/frontend/html/notebook/static/css/style.min.css @@ -849,7 +849,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .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;} .hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;} -.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;} +.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%;} .vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;} .reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;} .box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;} diff --git a/IPython/frontend/html/notebook/static/less/flexible-box-model.less b/IPython/frontend/html/notebook/static/less/flexible-box-model.less index 5578475..53988ed 100644 --- a/IPython/frontend/html/notebook/static/less/flexible-box-model.less +++ b/IPython/frontend/html/notebook/static/less/flexible-box-model.less @@ -34,6 +34,8 @@ display: box; box-orient: vertical; box-align: stretch; + /* width must be 100% to force FF to behave like webkit */ + width: 100%; } .vbox > * {