Skip to content

Commit f9dd6f6

Browse files
minjk-blminjk-bl
authored
Merge pull request #105 from visualpython/release
Release v1.2.0
2 parents 29d6fdd + bd9a8a9 commit f9dd6f6

File tree

19 files changed

+225
-96
lines changed

19 files changed

+225
-96
lines changed

‎css/api_block/index.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,11 @@
320320
flex-direction: column;
321321
margin-left: 14px;
322322
margin-bottom: 400px;
323-
width: calc(100% - 68px);
323+
width: calc(100% - 60px);
324324
}
325325
.vp-block {
326326
position: relative;
327-
min-width: 205px;
327+
width: 100%;
328328
min-height: 25px;
329329
z-index: 1;
330330
text-align: left;
@@ -822,7 +822,7 @@
822822
}
823823
.vp-apiblock-codeline-ellipsis {
824824
width: 100%;
825-
background-color: rgba(255, 255, 255, 0.5);
825+
/* background-color: rgba(255, 255, 255, 0.5); */
826826
color: var(--font-primary);
827827
font-size: 12px;
828828
text-indent: 0.5em;

‎css/common/frameEditor.css

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,13 @@
190190
top: 0;
191191
background: #FFFFFF;
192192
border-bottom: 1px solid #E4E4E4;
193+
194+
text-align: right;
195+
text-overflow: ellipsis;
196+
overflow: hidden;
197+
height: 30px !important;
198+
min-width: 80px;
199+
white-space: nowrap;
193200
}
194201
.vp-fe-table tbody tr:nth-child(odd) {
195202
background: #F5F5F5;
@@ -223,6 +230,10 @@
223230
width: 100%;
224231
z-index: -1;
225232
} */
233+
.vp-fe-table tr th:nth-child(1),
234+
.vp-fe-add-column {
235+
min-width: 30px !important;
236+
}
226237

227238
.vp-fe-table-more {
228239
margin-top: 10px;
@@ -364,7 +375,7 @@
364375
padding: 10px;
365376
}
366377
.vp-popup-addpage .vp-popup-tab.replace {
367-
height: calc(100% - 50px);
378+
height: calc(100% - 60px);
368379
}
369380
.vp-popup-addtype {
370381
width: 153px;
@@ -373,6 +384,12 @@
373384
.vp-popup-delete {
374385
padding-bottom: 20px;
375386
}
387+
.vp-popup-rename-page {
388+
max-height: 400px;
389+
}
390+
.vp-popup-replace-table {
391+
max-height: 350px;
392+
}
376393
.vp-popup-replace-add {
377394
margin-top: 30px
378395
}

‎css/component/common.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@
8484
.wp50 {
8585
width: 50px;
8686
}
87+
.wp60 {
88+
width: 60px;
89+
}
8790
.wp80 {
8891
width: 80px;
8992
}

‎css/component/fileNavigation.css

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
.fileNavigationPage-inner {
4848
float: right;
4949
display: grid;
50-
grid-template-rows: 30px auto min-content;
50+
/* grid-template-rows: 30px auto min-content; */
51+
grid-template-rows: min-content auto min-content;
5152
width: 80%;
5253
height: 100%;
5354
}
@@ -107,7 +108,8 @@
107108
}
108109
.fileNavigationPage-menu {
109110
min-height: 30px;
110-
height: 6%;
111+
/* height: 6%; */
112+
height: fit-content;
111113
padding-left: 10px;
112114
background-color: #EEE;
113115
border: 1px solid #ddd;;
@@ -127,7 +129,7 @@
127129
justify-content: center;
128130
}
129131
.fileNavigationPage-menu-block {
130-
margin-left: 10px;
132+
padding: 0 35px 0 10px;
131133
display: flex;
132134
flex-direction: column;
133135
justify-content: center;
@@ -192,11 +194,11 @@
192194
.fileNavigationPage-closedBtn {
193195
position: fixed;
194196
z-index: 3;
195-
right: 5px;
197+
right: 10px;
196198
width: 20px;
197199
height: 20px;
198200
line-height: 20px;
199-
top: 5px;
201+
top: 3px;
200202
text-align: center;
201203
}
202204
.fileNavigationPage-closedBtn:hover {

‎css/file_io/variables.css

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
:root {
22
--color: #525252;
33
}
4-
#vp_var_variableBox table tr:not(:first-child):hover,
5-
#vp_var_variableBox table tr.selected {
4+
#vp_var_variableBox table tbody tr:hover,
5+
#vp_var_variableBox table tbody tr.selected {
66
color: var(--font-hightlight);
77
background-color: #F5F5F5;
88
}
9-
#vp_var_variableBox table tr td:first-child:hover {
9+
#vp_var_variableBox table tbody tr td:hover {
1010
cursor: pointer;
1111
}
12+
#vp_var_variableBox table thead {
13+
position: sticky;
14+
top: 0;
15+
background: white;
16+
}
17+
1218
#vp_varDetailTable table th,
1319
#vp_varDetailTable table td {
1420
padding: 5px;
@@ -25,7 +31,6 @@
2531
#vp_var_variableBox {
2632
width: 100%;
2733
height: 150px;
28-
overflow: hidden;
2934
}
3035
#vp_varDetailTable:empty::after {
3136
content: '(Select variables to preview the data.)';

‎src/api_block/block.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,9 +1487,9 @@ define([
14871487

14881488
if (isColor == true) {
14891489
if (this.getBlockType() == BLOCK_CODELINE_TYPE.TEXT) {
1490-
$(this.getBlockMainDom()).css(STR_BORDER_LEFT, '2px solid var(--highlight-color');
1490+
$(this.getBlockMainDom()).css(STR_BORDER_LEFT, '2px solid var(--highlight-color)');
14911491
} else {
1492-
$(this.getBlockMainDom()).css(STR_BORDER, '2px solid var(--highlight-color');
1492+
$(this.getBlockMainDom()).css(STR_BORDER, '2px solid var(--highlight-color)');
14931493
}
14941494
}
14951495
}

‎src/api_block/blockContainer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2649,7 +2649,7 @@ define([
26492649
this.hideOptionPreviewBox();
26502650
$(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_PREVIEW_BUTTON).removeClass('enabled');
26512651

2652-
this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.15');
2652+
this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.2.0');
26532653
this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
26542654
$('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);
26552655
}

‎src/api_block/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
id='vp_apiblock_option_page'>
121121
<div class="vp-apiblock-option-navigator">
122122
<div class="vp-apiblock-option-navigator-label">
123-
<span class="vp-orange-text">Visual Python 1.1.15</span>
123+
<span class="vp-orange-text">Visual Python 1.2.0</span>
124124
</div>
125125
<div class="vp-apiblock-option-new-to-save" title="something modified...">
126126

‎src/common/constant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ define ([
4848
* toolbar btn properties
4949
*/
5050
const TOOLBAR_BTN_INFO = {
51-
HELP: "Visual Python 1.1.15"
51+
HELP: "Visual Python 1.2.0"
5252
// , ICON: "fa-angellist"
5353
, ICON: "vp-main-icon"
5454
, ID: "vpBtnToggle"

0 commit comments

Comments
 (0)