From 1fbbda5a14319aedabb19102f72b056a557fdbe5 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Wed, 25 Feb 2015 14:48:02 -0800 Subject: [PATCH 1/5] Pad interact widgets. --- IPython/html/static/widgets/less/widgets.less | 7 +++++++ IPython/html/widgets/interaction.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/IPython/html/static/widgets/less/widgets.less b/IPython/html/static/widgets/less/widgets.less index 08a920e05..42f385384 100644 --- a/IPython/html/static/widgets/less/widgets.less +++ b/IPython/html/static/widgets/less/widgets.less @@ -1,6 +1,13 @@ @widget-width: 350px; @widget-width-short: 150px; +// Pad interact widgets by default. +.widget-interact { + div, input { + padding: 2.5px; + } +} + .widget-area { /* LESS file that styles IPython notebook widgets and the area they sit in. diff --git a/IPython/html/widgets/interaction.py b/IPython/html/widgets/interaction.py index 76d63f524..b9e37defc 100644 --- a/IPython/html/widgets/interaction.py +++ b/IPython/html/widgets/interaction.py @@ -181,7 +181,7 @@ def interactive(__interact_f, **kwargs): co = kwargs.pop('clear_output', True) manual = kwargs.pop('__manual', False) kwargs_widgets = [] - container = Box() + container = Box(_dom_classes=['widget-interact']) container.result = None container.args = [] container.kwargs = dict() From 78d6a5023daab464284fbbbdd146c975ef3c6ec0 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Wed, 25 Feb 2015 20:20:10 +0000 Subject: [PATCH 2/5] fix padding issue --- IPython/html/widgets/widget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/widgets/widget.py b/IPython/html/widgets/widget.py index fcb76c0a4..062b6716b 100644 --- a/IPython/html/widgets/widget.py +++ b/IPython/html/widgets/widget.py @@ -435,7 +435,7 @@ class DOMWidget(Widget): width = CUnicode(sync=True) height = CUnicode(sync=True) # A default padding of 2.5 px makes the widgets look nice when displayed inline. - padding = CUnicode("2.5px", sync=True) + padding = CUnicode(sync=True) margin = CUnicode(sync=True) color = Unicode(sync=True) From b822a9f1912dbdc12f683cf372970a470780da49 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Wed, 25 Feb 2015 14:48:48 -0800 Subject: [PATCH 3/5] invoke css --- IPython/html/static/style/ipython.min.css | 4 ++++ IPython/html/static/style/style.min.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index 20a2c464f..e736d8518 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -1195,6 +1195,10 @@ h6:hover .anchor-link { font-size: 100%; font-style: italic; } +.widget-interact div, +.widget-interact input { + padding: 2.5px; +} .widget-area { /* LESS file that styles IPython notebook widgets and the area they sit in. diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index a36c23633..f2f9b3e95 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -9978,6 +9978,10 @@ h6:hover .anchor-link { font-size: 100%; font-style: italic; } +.widget-interact div, +.widget-interact input { + padding: 2.5px; +} .widget-area { /* LESS file that styles IPython notebook widgets and the area they sit in. From 63b181a1a29d185fdbc72dd5ca4773d21931a40e Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Wed, 25 Feb 2015 15:07:21 -0800 Subject: [PATCH 4/5] Only style direct decendants. --- IPython/html/static/widgets/less/widgets.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/static/widgets/less/widgets.less b/IPython/html/static/widgets/less/widgets.less index 42f385384..ffe3decf8 100644 --- a/IPython/html/static/widgets/less/widgets.less +++ b/IPython/html/static/widgets/less/widgets.less @@ -3,7 +3,7 @@ // Pad interact widgets by default. .widget-interact { - div, input { + >div, >input { padding: 2.5px; } } From 100b4470f3d03e4e417bb8bf870bc58fad72f6bd Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Wed, 25 Feb 2015 15:07:36 -0800 Subject: [PATCH 5/5] invoke css --- IPython/html/static/style/ipython.min.css | 4 ++-- IPython/html/static/style/style.min.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index e736d8518..3e160b551 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -1195,8 +1195,8 @@ h6:hover .anchor-link { font-size: 100%; font-style: italic; } -.widget-interact div, -.widget-interact input { +.widget-interact > div, +.widget-interact > input { padding: 2.5px; } .widget-area { diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index f2f9b3e95..feface624 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -9978,8 +9978,8 @@ h6:hover .anchor-link { font-size: 100%; font-style: italic; } -.widget-interact div, -.widget-interact input { +.widget-interact > div, +.widget-interact > input { padding: 2.5px; } .widget-area {