##// END OF EJS Templates
Merge pull request #3174 from Carreau/simple-class...
Min RK -
r10347:642ef9ed merge
parent child Browse files
Show More
@@ -853,7 +853,8 b' a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}'
853 .vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
853 .vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
854 .reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;}
854 .reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;}
855 .box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
855 .box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;}
856 .box-flex1,.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
856 .box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
857 .box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
857 .box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;}
858 .box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;}
858 .box-group1{-webkit-box-flex-group:1;-moz-box-flex-group:1;box-flex-group:1;}
859 .box-group1{-webkit-box-flex-group:1;-moz-box-flex-group:1;box-flex-group:1;}
859 .box-group2{-webkit-box-flex-group:2;-moz-box-flex-group:2;box-flex-group:2;}
860 .box-group2{-webkit-box-flex-group:2;-moz-box-flex-group:2;box-flex-group:2;}
@@ -887,10 +888,10 b' div#pager_splitter{height:8px;}'
887 #pager_container{position:relative;}
888 #pager_container{position:relative;}
888 div#pager{padding:15px;overflow:auto;display:none;}
889 div#pager{padding:15px;overflow:auto;display:none;}
889 div.ui-widget-content{border:1px solid #ababab;outline:none;}
890 div.ui-widget-content{border:1px solid #ababab;outline:none;}
890 .cell{border:1px solid transparent;}.cell.selected{border-radius:4px;border:thin #ababab solid;}
891 .cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;}.cell.selected{border-radius:4px;border:thin #ababab solid;}
891 div.cell{width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 0px;outline:none;}
892 div.cell{width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 0px;outline:none;}
892 div.prompt{width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231;}
893 div.prompt{width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231;}
893 div.input{page-break-inside:avoid;}
894 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
894 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
895 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
895 div.input_prompt{color:navy;border-top:1px solid transparent;}
896 div.input_prompt{color:navy;border-top:1px solid transparent;}
896 div.output_wrapper{margin-top:5px;margin-left:5px;width:100%;position:relative;}
897 div.output_wrapper{margin-top:5px;margin-left:5px;width:100%;position:relative;}
@@ -899,9 +900,9 b' div.output_collapsed{margin-right:5px;}'
899 div.out_prompt_overlay{height:100%;padding:0px;position:absolute;border-radius:4px;}
900 div.out_prompt_overlay{height:100%;padding:0px;position:absolute;border-radius:4px;}
900 div.out_prompt_overlay:hover{box-shadow:inset 0 0 1px #000;background:rgba(240, 240, 240, 0.5);}
901 div.out_prompt_overlay:hover{box-shadow:inset 0 0 1px #000;background:rgba(240, 240, 240, 0.5);}
901 div.output_prompt{color:darkred;margin:0 5px 0 -5px;}
902 div.output_prompt{color:darkred;margin:0 5px 0 -5px;}
902 div.output_area{padding:0px;page-break-inside:avoid;}
903 div.output_area{padding:0px;page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
903 div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;}
904 div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;}
904 div.output_subarea{padding:0.44em 0.4em 0.4em 1px;}
905 div.output_subarea{padding:0.44em 0.4em 0.4em 1px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
905 div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231;}
906 div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231;}
906 div.output_stream{padding-top:0.0em;padding-bottom:0.0em;}
907 div.output_stream{padding-top:0.0em;padding-bottom:0.0em;}
907 div.output_stderr{background:#fdd;}
908 div.output_stderr{background:#fdd;}
@@ -106,12 +106,12 b' var IPython = (function (IPython) {'
106 CodeCell.prototype.create_element = function () {
106 CodeCell.prototype.create_element = function () {
107 IPython.Cell.prototype.create_element.apply(this, arguments);
107 IPython.Cell.prototype.create_element.apply(this, arguments);
108
108
109 var cell = $('<div></div>').addClass('cell border-box-sizing code_cell vbox');
109 var cell = $('<div></div>').addClass('cell border-box-sizing code_cell');
110 cell.attr('tabindex','2');
110 cell.attr('tabindex','2');
111
111
112 this.celltoolbar = new IPython.CellToolbar(this);
112 this.celltoolbar = new IPython.CellToolbar(this);
113
113
114 var input = $('<div></div>').addClass('input hbox');
114 var input = $('<div></div>').addClass('input');
115 var vbox = $('<div/>').addClass('vbox box-flex1')
115 var vbox = $('<div/>').addClass('vbox box-flex1')
116 input.append($('<div/>').addClass('prompt input_prompt'));
116 input.append($('<div/>').addClass('prompt input_prompt'));
117 vbox.append(this.celltoolbar.element);
117 vbox.append(this.celltoolbar.element);
@@ -240,7 +240,7 b' var IPython = (function (IPython) {'
240
240
241
241
242 OutputArea.prototype.create_output_area = function () {
242 OutputArea.prototype.create_output_area = function () {
243 var oa = $("<div/>").addClass("hbox output_area");
243 var oa = $("<div/>").addClass("output_area");
244 if (this.prompt_area) {
244 if (this.prompt_area) {
245 oa.append($('<div/>').addClass('prompt'));
245 oa.append($('<div/>').addClass('prompt'));
246 }
246 }
@@ -345,7 +345,7 b' var IPython = (function (IPython) {'
345
345
346
346
347 OutputArea.prototype.append_html = function (html, element) {
347 OutputArea.prototype.append_html = function (html, element) {
348 var toinsert = $("<div/>").addClass("box-flex1 output_subarea output_html rendered_html");
348 var toinsert = $("<div/>").addClass("output_subarea output_html rendered_html");
349 toinsert.append(html);
349 toinsert.append(html);
350 element.append(toinsert);
350 element.append(toinsert);
351 };
351 };
@@ -353,7 +353,7 b' var IPython = (function (IPython) {'
353
353
354 OutputArea.prototype.append_javascript = function (js, container) {
354 OutputArea.prototype.append_javascript = function (js, container) {
355 // We just eval the JS code, element appears in the local scope.
355 // We just eval the JS code, element appears in the local scope.
356 var element = $("<div/>").addClass("box-flex1 output_subarea");
356 var element = $("<div/>").addClass("output_subarea");
357 container.append(element);
357 container.append(element);
358 // Div for js shouldn't be drawn, as it will add empty height to the area.
358 // Div for js shouldn't be drawn, as it will add empty height to the area.
359 container.hide();
359 container.hide();
@@ -376,7 +376,7 b' var IPython = (function (IPython) {'
376
376
377
377
378 OutputArea.prototype.append_text = function (data, element, extra_class) {
378 OutputArea.prototype.append_text = function (data, element, extra_class) {
379 var toinsert = $("<div/>").addClass("box-flex1 output_subarea output_text");
379 var toinsert = $("<div/>").addClass("output_subarea output_text");
380 // escape ANSI & HTML specials in plaintext:
380 // escape ANSI & HTML specials in plaintext:
381 data = utils.fixConsole(data);
381 data = utils.fixConsole(data);
382 data = utils.fixCarriageReturn(data);
382 data = utils.fixCarriageReturn(data);
@@ -390,7 +390,7 b' var IPython = (function (IPython) {'
390
390
391
391
392 OutputArea.prototype.append_svg = function (svg, element) {
392 OutputArea.prototype.append_svg = function (svg, element) {
393 var toinsert = $("<div/>").addClass("box-flex1 output_subarea output_svg");
393 var toinsert = $("<div/>").addClass("output_subarea output_svg");
394 toinsert.append(svg);
394 toinsert.append(svg);
395 element.append(toinsert);
395 element.append(toinsert);
396 };
396 };
@@ -424,7 +424,7 b' var IPython = (function (IPython) {'
424
424
425
425
426 OutputArea.prototype.append_png = function (png, element) {
426 OutputArea.prototype.append_png = function (png, element) {
427 var toinsert = $("<div/>").addClass("box-flex1 output_subarea output_png");
427 var toinsert = $("<div/>").addClass("output_subarea output_png");
428 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
428 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
429 this._dblclick_to_reset_size(img);
429 this._dblclick_to_reset_size(img);
430 toinsert.append(img);
430 toinsert.append(img);
@@ -433,7 +433,7 b' var IPython = (function (IPython) {'
433
433
434
434
435 OutputArea.prototype.append_jpeg = function (jpeg, element) {
435 OutputArea.prototype.append_jpeg = function (jpeg, element) {
436 var toinsert = $("<div/>").addClass("box-flex1 output_subarea output_jpeg");
436 var toinsert = $("<div/>").addClass("output_subarea output_jpeg");
437 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
437 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
438 this._dblclick_to_reset_size(img);
438 this._dblclick_to_reset_size(img);
439 toinsert.append(img);
439 toinsert.append(img);
@@ -444,7 +444,7 b' var IPython = (function (IPython) {'
444 OutputArea.prototype.append_latex = function (latex, element) {
444 OutputArea.prototype.append_latex = function (latex, element) {
445 // This method cannot do the typesetting because the latex first has to
445 // This method cannot do the typesetting because the latex first has to
446 // be on the page.
446 // be on the page.
447 var toinsert = $("<div/>").addClass("box-flex1 output_subarea output_latex");
447 var toinsert = $("<div/>").addClass("output_subarea output_latex");
448 toinsert.append(latex);
448 toinsert.append(latex);
449 element.append(toinsert);
449 element.append(toinsert);
450 };
450 };
@@ -71,7 +71,7 b' var IPython = (function (IPython) {'
71 */
71 */
72 TextCell.prototype.create_element = function () {
72 TextCell.prototype.create_element = function () {
73 IPython.Cell.prototype.create_element.apply(this, arguments);
73 IPython.Cell.prototype.create_element.apply(this, arguments);
74 var cell = $("<div>").addClass('cell text_cell border-box-sizing vbox');
74 var cell = $("<div>").addClass('cell text_cell border-box-sizing');
75 cell.attr('tabindex','2');
75 cell.attr('tabindex','2');
76
76
77 this.celltoolbar = new IPython.CellToolbar(this);
77 this.celltoolbar = new IPython.CellToolbar(this);
@@ -56,12 +56,18 b''
56 box-flex: 0;
56 box-flex: 0;
57 }
57 }
58
58
59 .box-flex1, .box-flex {
59 .box-flex1 {
60 -webkit-box-flex: 1;
60 -webkit-box-flex: 1;
61 -moz-box-flex: 1;
61 -moz-box-flex: 1;
62 box-flex: 1;
62 box-flex: 1;
63 }
63 }
64
64
65 .box-flex {
66 .box-flex1();
67 }
68
69
70
65 .box-flex2 {
71 .box-flex2 {
66 -webkit-box-flex: 2;
72 -webkit-box-flex: 2;
67 -moz-box-flex: 2;
73 -moz-box-flex: 2;
@@ -171,6 +171,7 b' div.ui-widget-content {'
171
171
172 .cell {
172 .cell {
173 border: 1px solid transparent;
173 border: 1px solid transparent;
174 .vbox();
174
175
175 &.selected {
176 &.selected {
176 .corner-all;
177 .corner-all;
@@ -207,6 +208,7 b' div.prompt {'
207
208
208 div.input {
209 div.input {
209 page-break-inside: avoid;
210 page-break-inside: avoid;
211 .hbox();
210 }
212 }
211
213
212 /* input_area and input_prompt must match in top border and margin for alignment */
214 /* input_area and input_prompt must match in top border and margin for alignment */
@@ -272,6 +274,7 b' div.output_prompt {'
272 div.output_area {
274 div.output_area {
273 padding: 0px;
275 padding: 0px;
274 page-break-inside: avoid;
276 page-break-inside: avoid;
277 .hbox();
275 }
278 }
276
279
277
280
@@ -291,6 +294,7 b' div.output_area pre {'
291 the prompt div. */
294 the prompt div. */
292 div.output_subarea {
295 div.output_subarea {
293 padding: 0.44em 0.4em 0.4em 1px;
296 padding: 0.44em 0.4em 0.4em 1px;
297 .box-flex1();
294 }
298 }
295
299
296 /* The rest of the output_* classes are for special styling of the different
300 /* The rest of the output_* classes are for special styling of the different
General Comments 0
You need to be logged in to leave comments. Login now