Skip to content

Commit 6e43781

Browse files
SylvainCorlaySylvainCorlay
committed
Add 2px margin to all widgets but containers
1 parent e2a24c5 commit 6e43781

13 files changed

+90
-74
lines changed

‎ipywidgets/static/widgets/js/widget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ define(["nbextensions/widgets/widgets/js/utils",
99
"underscore",
1010
"backbone",
1111
"jquery"
12-
], function(utils, managerBase, _, Backbone, $){
12+
], function(utils, managerBase, _, Backbone, $) {
1313
"use strict";
1414

1515
var unpack_models = function unpack_models(value, model) {

‎ipywidgets/static/widgets/js/widget_bool.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ define([
1616
* Called when view is rendered.
1717
*/
1818
this.$el
19-
.addClass('widget-hbox widget-checkbox');
19+
.addClass('ipy-widget widget-hbox widget-checkbox');
2020
this.$label = $('<div />')
2121
.addClass('widget-label')
2222
.appendTo(this.$el)
@@ -158,7 +158,7 @@ define([
158158
/**
159159
* Called when view is rendered.
160160
*/
161-
this.$el.addClass("widget-valid");
161+
this.$el.addClass("ipy-widget widget-valid");
162162
this.listenTo(this.model, "change", this.update, this);
163163
this.update();
164164
},

‎ipywidgets/static/widgets/js/widget_box.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ define([
2929
initialize: function() {
3030
// Public constructor
3131
ProxyView.__super__.initialize.apply(this, arguments);
32+
this.$el.addClass("ipy-widget widget-container");
3233
this.$box = this.$el;
3334
this.child_promise = Promise.resolve();
3435
},
@@ -117,8 +118,8 @@ define([
117118
/**
118119
* Called when view is rendered.
119120
*/
121+
this.$el.addClass("ipy-widget widget-container widget-box");
120122
this.$box = this.$el;
121-
this.$box.addClass('widget-box');
122123
this.children_views.update(this.model.get('children'));
123124
this.update_overflow_x();
124125
this.update_overflow_y();

‎ipywidgets/static/widgets/js/widget_button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ define([
1616
* Called when view is rendered.
1717
*/
1818
this.setElement($("<button />")
19-
.addClass('widget-button btn btn-default'));
19+
.addClass('ipy-widget widget-button btn btn-default'));
2020
this.$el.attr("data-toggle", "tooltip");
2121
this.listenTo(this.model, 'change:button_style', function(model, value) {
2222
this.update_button_style();

‎ipywidgets/static/widgets/js/widget_color.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ define([
1010

1111
var ColorPicker = widget.DOMWidgetView.extend({
1212
render: function() {
13-
this.$el.addClass("widget-hbox widget-colorpicker");
13+
this.$el.addClass("ipy-widget widget-hbox widget-colorpicker");
1414

1515
this.$label = $("<div />")
1616
.addClass("widget-label")
1717
.appendTo(this.$el);
1818

1919
this.$color_container = $("<div />")
20-
.addClass("hbox")
20+
.addClass("widget-hbox")
2121
.appendTo(this.$el);
2222

2323
this.$textbox = $("<input type='text' />")

‎ipywidgets/static/widgets/js/widget_controller.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ define([
1515
var Button = widget.DOMWidgetView.extend({
1616
/* Very simple view for a gamepad button. */
1717

18-
render : function(){
18+
render : function() {
19+
this.$el.addClass('ipy-widget widget-controller-button');
20+
1921
this.$support = $('<div />').css({
2022
'position': 'relative',
2123
'margin': '1px',
@@ -50,6 +52,9 @@ define([
5052
/* Very simple view for a gamepad axis. */
5153

5254
render : function() {
55+
56+
this.$el.addClass('ipy-widget widget-controller-axis');
57+
5358
this.$el.css({
5459
'width': '16px',
5560
'padding': '4px',
@@ -262,6 +267,8 @@ define([
262267
},
263268

264269
render: function(){
270+
this.$el.addClass('ipy-widget widget-controller');
271+
265272
this.$box = this.$el;
266273

267274
this.$label = $('<div />')

‎ipywidgets/static/widgets/js/widget_image.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@ if (typeof define !== 'function') { var define = require('./requirejs-shim')(mod
77
define([
88
"nbextensions/widgets/widgets/js/widget",
99
"jquery",
10-
], function(widget, $){
10+
], function(widget, $) {
1111

1212
var ImageView = widget.DOMWidgetView.extend({
13-
render : function(){
13+
render : function() {
1414
/**
1515
* Called when view is rendered.
1616
*/
17-
this.setElement($("<img />"));
17+
this.setElement($("<img />"))
18+
.addClass('ipy-widget widget-image');
1819
this.update(); // Set defaults.
1920
},
2021

21-
update : function(){
22+
update : function() {
2223
/**
2324
* Update the contents of this view
2425
*

‎ipywidgets/static/widgets/js/widget_int.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ define([
99
"underscore",
1010
"jqueryui",
1111
"bootstrap"
12-
], function(widget, _, $){
12+
], function(widget, _, $) {
1313

1414
var IntSliderView = widget.DOMWidgetView.extend({
15-
render : function(){
15+
render : function() {
1616
/**
1717
* Called when view is rendered.
1818
*/
1919
this.$el
20-
.addClass('widget-hbox widget-slider');
20+
.addClass('ipy-widget widget-hbox widget-slider');
2121
this.$label = $('<div />')
2222
.appendTo(this.$el)
2323
.addClass('widget-label')
@@ -82,7 +82,7 @@ define([
8282
}
8383
},
8484

85-
update : function(options){
85+
update : function(options) {
8686
/**
8787
* Update the contents of this view
8888
*
@@ -141,7 +141,7 @@ define([
141141
if(value > max) {
142142
value = max;
143143
}
144-
else if(value < min){
144+
else if(value < min) {
145145
value = min;
146146
}
147147
this.$slider.slider('option', 'value', value);
@@ -339,12 +339,12 @@ define([
339339

340340

341341
var IntTextView = widget.DOMWidgetView.extend({
342-
render : function(){
342+
render : function() {
343343
/**
344344
* Called when view is rendered.
345345
*/
346346
this.$el
347-
.addClass('widget-hbox widget-numeric-text');
347+
.addClass('ipy-widget widget-hbox widget-numeric-text');
348348
this.$label = $('<div />')
349349
.appendTo(this.$el)
350350
.addClass('widget-label')
@@ -372,7 +372,7 @@ define([
372372
}
373373
},
374374

375-
update : function(options){
375+
update : function(options) {
376376
/**
377377
* Update the contents of this view
378378
*
@@ -467,13 +467,13 @@ define([
467467

468468

469469
var ProgressView = widget.DOMWidgetView.extend({
470-
render : function(){
470+
render : function() {
471471
/**
472472
* Called when view is rendered.
473473
*/
474474
this.$label = $('<div />')
475475
.appendTo(this.$el)
476-
.addClass('widget-label')
476+
.addClass('ipy-widget widget-label')
477477
.hide();
478478
this.$progress = $('<div />')
479479
.addClass('progress')
@@ -511,7 +511,7 @@ define([
511511
}
512512
},
513513

514-
update : function(){
514+
update : function() {
515515
/**
516516
* Update the contents of this view
517517
*

‎ipywidgets/static/widgets/js/widget_selection.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ define([
1010
"jquery",
1111
"underscore",
1212
"bootstrap",
13-
], function(widget, utils, $, _){
13+
], function(widget, utils, $, _) {
1414

1515
var DropdownView = widget.DOMWidgetView.extend({
16-
render : function(){
16+
render : function() {
1717
/**
1818
* Called when view is rendered.
1919
*/
2020
this.$el
21-
.addClass('widget-hbox widget-dropdown');
21+
.addClass('ipy-widget widget-hbox widget-dropdown');
2222
this.$label = $('<div />')
2323
.appendTo(this.$el)
2424
.addClass('widget-label')
@@ -52,7 +52,7 @@ define([
5252
this.update();
5353
},
5454

55-
update : function(options){
55+
update : function(options) {
5656
/**
5757
* Update the contents of this view
5858
*
@@ -167,12 +167,12 @@ define([
167167

168168

169169
var RadioButtonsView = widget.DOMWidgetView.extend({
170-
render : function(){
170+
render : function() {
171171
/**
172172
* Called when view is rendered.
173173
*/
174174
this.$el
175-
.addClass('widget-hbox widget-radio');
175+
.addClass('ipy-widget widget-hbox widget-radio');
176176
this.$label = $('<div />')
177177
.appendTo(this.$el)
178178
.addClass('widget-label')
@@ -183,7 +183,7 @@ define([
183183
this.update();
184184
},
185185

186-
update : function(options){
186+
update : function(options) {
187187
/**
188188
* Update the contents of this view
189189
*
@@ -284,7 +284,7 @@ define([
284284
* Called when view is rendered.
285285
*/
286286
this.$el
287-
.addClass('widget-hbox widget-toggle-buttons');
287+
.addClass('ipy-widget widget-hbox widget-toggle-buttons');
288288
this.$label = $('<div />')
289289
.appendTo(this.$el)
290290
.addClass('widget-label')
@@ -300,7 +300,7 @@ define([
300300
this.update();
301301
},
302302

303-
update : function(options){
303+
update : function(options) {
304304
/**
305305
* Update the contents of this view
306306
*
@@ -431,12 +431,12 @@ define([
431431

432432

433433
var SelectView = widget.DOMWidgetView.extend({
434-
render : function(){
434+
render : function() {
435435
/**
436436
* Called when view is rendered.
437437
*/
438438
this.$el
439-
.addClass('widget-hbox widget-select');
439+
.addClass('ipy-widget widget-hbox widget-select');
440440
this.$label = $('<div />')
441441
.appendTo(this.$el)
442442
.addClass('widget-label')
@@ -449,7 +449,7 @@ define([
449449
this.update();
450450
},
451451

452-
update : function(options){
452+
update : function(options) {
453453
/**
454454
* Update the contents of this view
455455
*
@@ -538,8 +538,8 @@ define([
538538

539539

540540
var SelectMultipleView = SelectView.extend({
541-
render: function(){
542-
/**
541+
render: function() {
542+
/**n
543543
* Called when view is rendered.
544544
*/
545545
SelectMultipleView.__super__.render.apply(this);
@@ -553,7 +553,7 @@ define([
553553
return this;
554554
},
555555

556-
update: function(){
556+
update: function() {
557557
/**
558558
* Update the contents of this view
559559
*
@@ -564,7 +564,7 @@ define([
564564
this.$listbox.val(this.model.get('selected_labels'));
565565
},
566566

567-
handle_click: function(){
567+
handle_click: function() {
568568
/**
569569
* Overload click from select
570570
*

‎ipywidgets/static/widgets/js/widget_selectioncontainer.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ define([
99
"nbextensions/widgets/widgets/js/utils",
1010
"jquery",
1111
"bootstrap",
12-
], function(widget, utils, $){
12+
], function(widget, utils, $) {
1313

1414
var AccordionView = widget.DOMWidgetView.extend({
1515
initialize: function(){
@@ -23,14 +23,14 @@ define([
2323
}, this);
2424
},
2525

26-
render: function(){
26+
render: function() {
2727
/**
2828
* Called when view is rendered.
2929
*/
3030
var guid = 'panel-group' + utils.uuid();
3131
this.$el
3232
.attr('id', guid)
33-
.addClass('panel-group');
33+
.addClass('ipy-widget panel-group');
3434
this.listenTo(this.model, 'change:selected_index', function(model, value, options) {
3535
this.update_selected_index(options);
3636
}, this);
@@ -132,7 +132,7 @@ define([
132132
.attr('data-toggle', 'collapse')
133133
.attr('data-parent', '#' + this.$el.attr('id'))
134134
.attr('href', '#' + uuid)
135-
.click(function(evt){
135+
.click(function(evt) {
136136

137137
// Calling model.set will trigger all of the other views of the
138138
// model to update.
@@ -192,7 +192,7 @@ define([
192192
}, this);
193193
},
194194

195-
render: function(){
195+
render: function() {
196196
/**
197197
* Called when view is rendered.
198198
*/

0 commit comments

Comments
 (0)