From c5a9868d6c8dc8caec3fc15026f1d6a5faefedf0 2014-10-16 18:07:14 From: MinRK Date: 2014-10-16 18:07:14 Subject: [PATCH] require less >= 1.7.5 fixes bug where `vbox > *` style was applied to `vbox()` classes --- diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index b3ffe9e..2ae3b60 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -349,12 +349,6 @@ div.cell { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; border-radius: 4px; box-sizing: border-box; -moz-box-sizing: border-box; @@ -405,12 +399,6 @@ div.inner_cell { flex-direction: column; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; @@ -448,12 +436,6 @@ div.input { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } @media (max-width: 480px) { div.input { @@ -471,12 +453,6 @@ div.input { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } } /* input_area and input_prompt must match in top border and margin for alignment */ @@ -730,12 +706,6 @@ div.output_wrapper { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } /* class for the output area when it should be height-limited */ div.output_scroll { @@ -767,12 +737,6 @@ div.output_collapsed { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } div.out_prompt_overlay { height: 100%; @@ -807,12 +771,6 @@ div.output_area { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } div.output_area .MathJax_Display { text-align: left !important; @@ -842,12 +800,6 @@ div.output_area .rendered_html img { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } @media (max-width: 480px) { div.output_area { @@ -865,12 +817,6 @@ div.output_area .rendered_html img { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } } div.output_area pre { @@ -1130,12 +1076,6 @@ div.text_cell { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } @media (max-width: 480px) { div.text_cell > div.prompt { @@ -1235,12 +1175,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-area .widget-subarea { padding: 0.44em 0.4em 0.4em 1px; @@ -1263,12 +1197,6 @@ div.cell.text_cell.rendered { flex-direction: column; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 2; -moz-box-flex: 2; box-flex: 2; @@ -1342,12 +1270,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-hslider .ui-slider { /* Inner, invisible slide div */ @@ -1368,12 +1290,6 @@ div.cell.text_cell.rendered { flex-direction: row; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; @@ -1421,12 +1337,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-vslider .ui-slider { /* Inner, invisible slide div */ @@ -1449,12 +1359,6 @@ div.cell.text_cell.rendered { flex-direction: column; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; @@ -1521,12 +1425,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; margin-top: 0px !important; margin-bottom: 0px !important; margin-right: 5px; @@ -1565,12 +1463,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-vbox .widget-label { /* Vertical Label */ @@ -1624,12 +1516,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 72bdb5e..985eddb 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -7945,12 +7945,6 @@ span#login_widget > .button .badge, display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; min-height: 80%; } .modal_stretch .modal-dialog .modal-body { @@ -8224,12 +8218,6 @@ div.cell { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; border-radius: 4px; box-sizing: border-box; -moz-box-sizing: border-box; @@ -8280,12 +8268,6 @@ div.inner_cell { flex-direction: column; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; @@ -8323,12 +8305,6 @@ div.input { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } @media (max-width: 480px) { div.input { @@ -8346,12 +8322,6 @@ div.input { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } } /* input_area and input_prompt must match in top border and margin for alignment */ @@ -8605,12 +8575,6 @@ div.output_wrapper { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } /* class for the output area when it should be height-limited */ div.output_scroll { @@ -8642,12 +8606,6 @@ div.output_collapsed { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } div.out_prompt_overlay { height: 100%; @@ -8682,12 +8640,6 @@ div.output_area { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } div.output_area .MathJax_Display { text-align: left !important; @@ -8717,12 +8669,6 @@ div.output_area .rendered_html img { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } @media (max-width: 480px) { div.output_area { @@ -8740,12 +8686,6 @@ div.output_area .rendered_html img { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } } div.output_area pre { @@ -9005,12 +8945,6 @@ div.text_cell { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } @media (max-width: 480px) { div.text_cell > div.prompt { @@ -9110,12 +9044,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-area .widget-subarea { padding: 0.44em 0.4em 0.4em 1px; @@ -9138,12 +9066,6 @@ div.cell.text_cell.rendered { flex-direction: column; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 2; -moz-box-flex: 2; box-flex: 2; @@ -9217,12 +9139,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-hslider .ui-slider { /* Inner, invisible slide div */ @@ -9243,12 +9159,6 @@ div.cell.text_cell.rendered { flex-direction: row; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; @@ -9296,12 +9206,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-vslider .ui-slider { /* Inner, invisible slide div */ @@ -9324,12 +9228,6 @@ div.cell.text_cell.rendered { flex-direction: column; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; @@ -9396,12 +9294,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; margin-top: 0px !important; margin-bottom: 0px !important; margin-right: 5px; @@ -9440,12 +9332,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .widget-vbox .widget-label { /* Vertical Label */ @@ -9499,12 +9385,6 @@ div.cell.text_cell.rendered { display: flex; flex-direction: column; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -9634,12 +9514,6 @@ p { flex-direction: row; align-items: stretch; /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; - /* Old browsers */ -webkit-box-pack: end; -moz-box-pack: end; box-pack: end; @@ -10366,12 +10240,6 @@ div#pager pre { display: flex; flex-direction: row; align-items: stretch; - /* Old browsers */ - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; - /* Modern browsers */ - flex: none; } .shortcut_key { display: inline-block; diff --git a/IPython/html/tasks.py b/IPython/html/tasks.py index a384a6b..aae32ef 100644 --- a/IPython/html/tasks.py +++ b/IPython/html/tasks.py @@ -10,8 +10,8 @@ static_dir = 'static' components_dir = pjoin(static_dir, 'components') here = os.path.dirname(__file__) -min_less_version = '1.7.0' -max_less_version = '1.7.5' # exclusive +min_less_version = '1.7.5' +max_less_version = '1.8.0' # exclusive def _need_css_update(): """Does less need to run?"""