Merge pull request #2107 from SylvainCorlay/gridbox

Grid layout
jupyter-widgets · Jul 5, 2018 · 446d608 · 446d608
2 parents d3cd77a + 40c7387
commit 446d608
Show file tree

Hide file tree

Showing 20 changed files with 31,841 additions and 906 deletions.
diff --git a/docs/source/examples/Widget Styling.ipynb b/docs/source/examples/Widget Styling.ipynb
diff --git a/docs/source/examples/images/grid-area.png b/docs/source/examples/images/grid-area.png
diff --git a/docs/source/examples/images/grid-cell.png b/docs/source/examples/images/grid-cell.png
diff --git a/docs/source/examples/images/grid-justify-self-center.png b/docs/source/examples/images/grid-justify-self-center.png
diff --git a/docs/source/examples/images/grid-justify-self-end.png b/docs/source/examples/images/grid-justify-self-end.png
diff --git a/docs/source/examples/images/grid-justify-self-start.png b/docs/source/examples/images/grid-justify-self-start.png
diff --git a/docs/source/examples/images/grid-justify-self-stretch.png b/docs/source/examples/images/grid-justify-self-stretch.png
diff --git a/docs/source/examples/images/grid-line.png b/docs/source/examples/images/grid-line.png
diff --git a/docs/source/examples/images/grid-start-end-a.png b/docs/source/examples/images/grid-start-end-a.png
diff --git a/docs/source/examples/images/grid-start-end-b.png b/docs/source/examples/images/grid-start-end-b.png
diff --git a/docs/source/examples/images/grid-start-end-d.png b/docs/source/examples/images/grid-start-end-d.png
diff --git a/docs/source/examples/images/grid-track.png b/docs/source/examples/images/grid-track.png
diff --git a/ipywidgets/widgets/__init__.py b/ipywidgets/widgets/__init__.py
@@ -10,7 +10,7 @@
 from .widget_core import CoreWidget
 from .widget_bool import Checkbox, ToggleButton, Valid
 from .widget_button import Button, ButtonStyle
-from .widget_box import Box, HBox, VBox
+from .widget_box import Box, HBox, VBox, GridBox
 from .widget_float import FloatText, BoundedFloatText, FloatSlider, FloatProgress, FloatRangeSlider, FloatLogSlider
 from .widget_image import Image
 from .widget_int import IntText, BoundedIntText, IntSlider, IntProgress, IntRangeSlider, Play, SliderStyle

diff --git a/ipywidgets/widgets/widget_box.py b/ipywidgets/widgets/widget_box.py
@@ -107,3 +107,10 @@ class HBox(Box):
     """
     _model_name = Unicode('HBoxModel').tag(sync=True)
     _view_name = Unicode('HBoxView').tag(sync=True)
+
+
+@register
+class GridBox(Box):
+    _model_name = Unicode('GridBoxModel').tag(sync=True)
+    _view_name = Unicode('GridBoxView').tag(sync=True)
+
diff --git a/ipywidgets/widgets/widget_layout.py b/ipywidgets/widgets/widget_layout.py
@@ -61,6 +61,17 @@ class Layout(Widget):
     visibility = CaselessStrEnum(['visible', 'hidden']+CSS_PROPERTIES, allow_none=True, help="The visibility CSS attribute.").tag(sync=True)
     width = Unicode(None, allow_none=True, help="The width CSS attribute.").tag(sync=True)
 
+    grid_auto_columns = Unicode(None, allow_none=True, help="The grid-auto-columns CSS attribute.").tag(sync=True)
+    grid_auto_flow = CaselessStrEnum(['column','row','row dense','column dense']+ CSS_PROPERTIES, allow_none=True, help="The grid-auto-flow CSS attribute.").tag(sync=True)
+    grid_auto_rows = Unicode(None, allow_none=True, help="The grid-auto-rows CSS attribute.").tag(sync=True)
+    grid_gap = Unicode(None, allow_none=True, help="The grid-gap CSS attribute.").tag(sync=True)
+    grid_template_rows = Unicode(None, allow_none=True, help="The grid-template-rows CSS attribute.").tag(sync=True)
+    grid_template_columns = Unicode(None, allow_none=True, help="The grid-template-columns CSS attribute.").tag(sync=True)
+    grid_template_areas = Unicode(None, allow_none=True, help="The grid-template-areas CSS attribute.").tag(sync=True)
+    grid_row = Unicode(None, allow_none=True, help="The grid-row CSS attribute.").tag(sync=True)
+    grid_column = Unicode(None, allow_none=True, help="The grid-column CSS attribute.").tag(sync=True)
+    grid_area = Unicode(None, allow_none=True, help="The grid-area CSS attribute.").tag(sync=True)
+
 
 class LayoutTraitType(Instance):