diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index f17ad7c..d275e96 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -1534,18 +1534,6 @@ h6:hover .anchor-link { text-align: center; vertical-align: text-top; } -.widget-modal { - /* Box - ModalView */ - overflow: hidden; - position: absolute !important; - top: 0px; - left: 0px; - margin-left: 0px !important; -} -.widget-modal-body { - /* Box - ModalView Body */ - max-height: none !important; -} .widget-box { /* Box */ box-sizing: border-box; @@ -1582,12 +1570,4 @@ h6:hover .anchor-link { .widget-radio-box label { margin-top: 0px; } -.docked-widget-modal { - /* Horizontal Label */ - overflow: hidden; - position: relative !important; - top: 0px !important; - left: 0px !important; - margin-left: 0px !important; -} /*# sourceMappingURL=ipython.min.css.map */ \ No newline at end of file diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 7a062c8..60a6a75 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -9460,18 +9460,6 @@ h6:hover .anchor-link { text-align: center; vertical-align: text-top; } -.widget-modal { - /* Box - ModalView */ - overflow: hidden; - position: absolute !important; - top: 0px; - left: 0px; - margin-left: 0px !important; -} -.widget-modal-body { - /* Box - ModalView Body */ - max-height: none !important; -} .widget-box { /* Box */ box-sizing: border-box; @@ -9508,14 +9496,6 @@ h6:hover .anchor-link { .widget-radio-box label { margin-top: 0px; } -.docked-widget-modal { - /* Horizontal Label */ - overflow: hidden; - position: relative !important; - top: 0px !important; - left: 0px !important; - margin-left: 0px !important; -} /*! * * IPython notebook webapp diff --git a/IPython/html/static/widgets/js/widget.js b/IPython/html/static/widgets/js/widget.js index 6c8dad5..0938151 100644 --- a/IPython/html/static/widgets/js/widget.js +++ b/IPython/html/static/widgets/js/widget.js @@ -542,11 +542,11 @@ define(["widgets/js/manager", this.update_attr('border-style', this.model.get('border_style')); this.update_attr('font-style', this.model.get('font_style')); this.update_attr('font-weight', this.model.get('font_weight')); - this.update_attr('font-size', this.model.get('font_size')); + this.update_attr('font-size', this._default_px(this.model.get('font_size'))); this.update_attr('font-family', this.model.get('font_family')); this.update_attr('padding', this.model.get('padding')); - this.update_attr('margin', this.model.get('margin')); - this.update_attr('border-radius', this.model.get('border_radius')); + this.update_attr('margin', this._default_px(this.model.get('margin'))); + this.update_attr('border-radius', this._default_px(this.model.get('border_radius'))); this.update_css(this.model, this.model.get("_css")); }, this); diff --git a/IPython/html/static/widgets/js/widget_box.js b/IPython/html/static/widgets/js/widget_box.js index e7850ce..f31f40b 100644 --- a/IPython/html/static/widgets/js/widget_box.js +++ b/IPython/html/static/widgets/js/widget_box.js @@ -146,224 +146,8 @@ define([ }, }); - var PopupView = BoxView.extend({ - - render: function(){ - /** - * Called when view is rendered. - */ - var that = this; - - this.$el.on("remove", function(){ - that.$backdrop.remove(); - }); - this.$backdrop = $('
') - .appendTo($('#notebook-container')) - .addClass('modal-dialog') - .css('position', 'absolute') - .css('left', '0px') - .css('top', '0px'); - this.$window = $('
') - .appendTo(this.$backdrop) - .addClass('modal-content widget-modal') - .mousedown(function(){ - that.bring_to_front(); - }); - - // Set the elements array since the this.$window element is not child - // of this.$el and the parent widget manager or other widgets may - // need to know about all of the top-level widgets. The IPython - // widget manager uses this to register the elements with the - // keyboard manager. - this.additional_elements = [this.$window]; - - this.$title_bar = $('
') - .addClass('popover-title') - .appendTo(this.$window) - .mousedown(function(){ - that.bring_to_front(); - }); - this.$close = $('