Skip to content

Commit 9a1ad6a

Browse files
author
minjk-bl
committed
Fixed Apps > Frame - inner popup component styles
1 parent 0863eb3 commit 9a1ad6a

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎css/m_apps/frame.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249
}
250250
.vp-inner-popup-addtype {
251251
width: 153px;
252-
margin-top: 5px;
253252
}
254253
.vp-inner-popup-delete {
255254
padding-bottom: 20px;
@@ -261,11 +260,8 @@
261260
max-height: 350px;
262261
}
263262
.vp-inner-popup-replace-add {
264-
margin-top: 30px
263+
margin-top: 10px
265264
}
266265
.vp-inner-popup-apply-column {
267266
width: 153px;
268-
}
269-
.vp-inner-popup-apply-lambda{
270-
margin-top: 5px;
271267
}

‎css/popupComponent.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,11 @@
347347
.vp-inner-popup-box {
348348
position: absolute;
349349
left: calc(50% - 200px);
350-
top: calc(50% - 150px);
350+
top: calc(50% - 200px);
351351
min-width: 400px;
352352
min-height: 150px;
353-
width: 30%;
354-
height: 300px;
353+
width: 400px;
354+
height: 400px;
355355
background-color: white;
356356
z-index: 200;
357357
border: 0.25px solid var(--border-gray-color);

‎css/root.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ hr.vp-extra-menu-line {
312312
border-spacing: 5px;
313313
border-collapse: separate;
314314
}
315+
.vp-tbl-gap10 {
316+
border-spacing: 10px;
317+
border-collapse: separate;
318+
}
315319
/* Table Layout */
316320
.vp-option-vertical-table-layout {
317321
/* width: 100%; */

‎js/m_apps/Frame.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ define([
593593
var content = new com_String();
594594
content.appendFormatLine('<div class="{0}">', 'vp-inner-popup-addpage');
595595
content.appendLine('<div>');
596-
content.appendLine('<table><colgroup><col width="80px"><col width="*"></colgroup>');
596+
content.appendLine('<table class="vp-tbl-gap5"><colgroup><col width="80px"><col width="*"></colgroup>');
597597
content.appendFormatLine('<tr><th class="{0}">{1}</th>', 'vp-orange-text', targetLabel);
598598
var target = '';
599599
if (type == 'replace') {
@@ -617,7 +617,7 @@ define([
617617

618618
// tab 1. value
619619
content.appendFormatLine('<div class="{0} {1}">', 'vp-inner-popup-tab', 'value');
620-
content.appendLine('<table><colgroup><col width="80px"><col width="*"></colgroup><tr>');
620+
content.appendLine('<table class="vp-tbl-gap5"><colgroup><col width="80px"><col width="*"></colgroup><tr>');
621621
content.appendLine('<th><label>Value</label></th>');
622622
content.appendFormatLine('<td><input type="text" class="{0}"/>', 'vp-inner-popup-input2');
623623
content.appendFormatLine('<label><input type="checkbox" class="{0}" checked/><span>{1}</span></label>', 'vp-inner-popup-istext2','Text');
@@ -626,16 +626,16 @@ define([
626626

627627
// tab 2. calculation
628628
content.appendFormatLine('<div class="{0} {1}" style="display: none;">', 'vp-inner-popup-tab', 'calculation');
629-
content.appendLine('<table><colgroup><col width="80px"><col width="*"></colgroup>');
629+
content.appendLine('<table class="vp-tbl-gap5"><colgroup><col width="80px"><col width="*"></colgroup>');
630630
// calc - variable 1
631631
content.appendLine('<tr>');
632632
content.appendLine('<th><label>Variable 1</label></th>');
633633
var dataTypes = ['DataFrame', 'Series', 'nparray', 'list', 'str'];
634634
var varSelector1 = new VarSelector(dataTypes, 'DataFrame', true, true);
635-
varSelector1.addBoxClass('vp-inner-popup-var1box');
635+
varSelector1.addBoxClass('vp-inner-popup-var1box mb5');
636636
varSelector1.addClass('vp-inner-popup-var1');
637-
content.appendFormatLine('<td>{0}</td>', varSelector1.render());
638-
content.appendFormatLine('<td><select class="{0}"></select></td>', 'vp-inner-popup-var1col');
637+
content.appendFormatLine('<td>{0}', varSelector1.render());
638+
content.appendFormatLine('<select class="{0}"></select></td>', 'vp-inner-popup-var1col');
639639
content.appendLine('</tr>');
640640
// calc -operator
641641
content.appendLine('<tr>');
@@ -651,10 +651,10 @@ define([
651651
content.appendLine('<tr>');
652652
content.appendLine('<th><label>Variable 2</label></th>');
653653
var varSelector2 = new VarSelector(dataTypes, 'DataFrame', true, true);
654-
varSelector2.addBoxClass('vp-inner-popup-var2box');
654+
varSelector2.addBoxClass('vp-inner-popup-var2box mb5');
655655
varSelector2.addClass('vp-inner-popup-var2');
656-
content.appendFormatLine('<td>{0}</td>', varSelector2.render());
657-
content.appendFormatLine('<td><select class="{0}"></select></td>', 'vp-inner-popup-var2col');
656+
content.appendFormatLine('<td>{0}', varSelector2.render());
657+
content.appendFormatLine('<select class="{0}"></select></td>', 'vp-inner-popup-var2col');
658658
content.appendLine('</tr>');
659659
content.appendLine('</table>');
660660
content.appendLine('</div>'); // end of vp-inner-popup-tab calculation
@@ -666,7 +666,7 @@ define([
666666

667667
// tab 4. apply
668668
content.appendFormatLine('<div class="{0} {1}" style="display: none;">', 'vp-inner-popup-tab', 'apply');
669-
content.appendLine('<table><colgroup><col width="80px"><col width="*"></colgroup>');
669+
content.appendLine('<table class="vp-tbl-gap5"><colgroup><col width="80px"><col width="*"></colgroup>');
670670
content.appendLine('<tr><th><label>column</label></th>');
671671
content.appendFormatLine('<td>{0}</td></tr>', this.renderColumnList(this.state.columnList));
672672
content.appendLine('<tr><th><label>function</label></th>');
@@ -760,7 +760,7 @@ define([
760760
return content.toString();
761761
}
762762

763-
openInputPopup = function(type, width=400, height=300) {
763+
openInputPopup = function(type, width=400, height=400) {
764764
var title = '';
765765
var content = '';
766766
let size = { width: width, height: height };

0 commit comments

Comments
 (0)