Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
dist/
jupyterlab/lib/visualpython
test/
jupyternotebook/visualpython
colab/visualpython
test/
.gitignore
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#=============================================================================
# Set version and replace it
#=============================================================================
VP_ORG_VER=2.3.2
VP_NEW_VER=2.3.3
VP_ORG_VER=2.3.3
VP_NEW_VER=2.3.4

# update version info
grep -REil "VP_ORG_VER=.+$" colab/build.colab.sh jupyterlab/build.jupyterlab.sh jupyternotebook/build.jupyternotebook.sh | xargs sed -i "s/VP_ORG_VER=.\+$/VP_ORG_VER=${VP_ORG_VER}/g"
Expand Down
6 changes: 3 additions & 3 deletions colab/build.colab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#=============================================================================
# Replace Version
#=============================================================================
VP_ORG_VER=2.3.2
VP_NEW_VER=2.3.3
VP_ORG_VER=2.3.3
VP_NEW_VER=2.3.4

# update version info
# update manifest version with new numbering for new version
Expand All @@ -28,7 +28,7 @@ mkdir -p ../dist/colab

# build package
# sudo apt-get install zip
zip -r ../dist/colab/visualpython-v$VP_NEW_VER.$VP_COLAB_VER.zip * -x build.colab.sh
zip -r ../dist/colab/visualpython-v$VP_NEW_VER.zip * -x build.colab.sh

exit 0
# End of file
4 changes: 2 additions & 2 deletions jupyterlab/build.jupyterlab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#=============================================================================
# Replace Version and Basic Files
#=============================================================================
VP_ORG_VER=2.3.2
VP_NEW_VER=2.3.3
VP_ORG_VER=2.3.3
VP_NEW_VER=2.3.4

# update version info
grep -REil "\"version\": \"${VP_ORG_VER}\"" package.json | xargs sed -i "s/\"version\": \"${VP_ORG_VER//\./\\.}\"/\"version\": \"${VP_NEW_VER}\"/g"
Expand Down
4 changes: 2 additions & 2 deletions jupyterlab/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jupyterlab/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jupyterlab-visualpython",
"version": "2.3.3",
"version": "2.3.4",
"description": "GUI-based Python code generator for Jupyter Lab as an extension",
"keywords": [
"jupyter",
Expand Down
4 changes: 2 additions & 2 deletions jupyterlab/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
]
version = "2.3.3"
version = "2.3.4"

[project.license]
file = "LICENSE"
Expand Down Expand Up @@ -92,7 +92,7 @@ file = [
]

[tool.tbump.version]
current = "2.3.3"
current = "2.3.4"
regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"

[tool.tbump.git]
Expand Down
4 changes: 2 additions & 2 deletions jupyternotebook/build.jupyternotebook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#=============================================================================
# Replace Version and Basic Files
#=============================================================================
VP_ORG_VER=2.3.2
VP_NEW_VER=2.3.3
VP_ORG_VER=2.3.3
VP_NEW_VER=2.3.4

# update version info
grep -REil ${VP_ORG_VER//\./\\.} setup.py visualpython/* | xargs sed -i --follow-symlinks "s/${VP_ORG_VER//\./\\.}/${VP_NEW_VER}/g"
Expand Down
2 changes: 1 addition & 1 deletion jupyternotebook/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name = name,
version = '2.3.3',
version = '2.3.4',
packages = find_packages(),
package_data = {"": ["*"], 'visualpython' : ['visualpython.yaml', 'README.md']},
scripts = ['visualpython/bin/visualpy', 'visualpython/bin/visualpy.bat'],
Expand Down
60 changes: 30 additions & 30 deletions visualpython/css/boardFrame.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@
position: relative;
float: left;

border-left: 1px solid var(--border-gray-color);
border-left: 1px solid var(--vp-border-gray-color);
box-sizing: border-box;
}
.vp-board-header {
box-sizing: border-box;
width: 100%;
height: 50px;
text-align: right;
background-color: #FFFFFF;
border-bottom: 1px solid var(--border-gray-color);
background-color: var(--vp-background-color);
border-bottom: 1px solid var(--vp-border-gray-color);
}
.vp-board-title {
width: 100%;
height: 50px;
background-color: white;
background-color: var(--vp-background-color);
display: flex;
flex-direction: row;
position: relative;
z-index: 10;
border-bottom: 0.25px solid var(--border-gray-color);
border-bottom: 0.25px solid var(--vp-border-gray-color);
box-sizing: border-box;
}
.vp-board-title input {
Expand All @@ -48,8 +48,8 @@
}
.vp-board-title input:focus {
transition: 0.7s;
border: 0.5px solid var(--highlight-color) !important;
color: var(--font-highlight);
border: 0.5px solid var(--vp-highlight-color) !important;
color: var(--vp-font-highlight);
}
.vp-board-title input::selection {
background-color: #FDEFDD;
Expand All @@ -72,13 +72,13 @@
position: relative;
color: #000;
background-size: 5px 5px;
background-image: repeating-linear-gradient( to right, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 50px ), repeating-linear-gradient( to bottom, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 50px );
background-color: white;
background-image: repeating-linear-gradient( to right, var(--vp-grid-line-color) 0, var(--vp-grid-line-color) 0.25px, transparent 1px, transparent 50px ), repeating-linear-gradient( to bottom, var(--vp-grid-line-color) 0, var(--vp-grid-line-color) 0.25px, transparent 1px, transparent 50px );
background-color: var(--vp-background-color);
}
.vp-board-footer {
width: 100%;
height: 50px;
border-top: 1px solid var(--border-gray-color);
border-top: 1px solid var(--vp-border-gray-color);
line-height: 50px;
}
.vp-board-footer-buttons {
Expand Down Expand Up @@ -106,8 +106,8 @@
margin-top: 25px;
width: 150px;
float: right;
background: #FFFFFF;
border: 0.25px solid var(--border-gray-color);
background: var(--vp-background-color);
border: 0.25px solid var(--vp-border-gray-color);
border-radius: 3px;
box-sizing: border-box;
box-shadow: 1px 1px 2px rgb(0 0 0 / 10%);
Expand All @@ -119,7 +119,7 @@
margin-inline-start: 0px;
margin-inline-end: 0px;
padding-inline-start: 0px;
color: var(--font-primary);
color: var(--vp-font-primary);
}
.vp-board-header-button-inner ul li {
overflow: hidden;
Expand All @@ -131,14 +131,14 @@
line-height: 22px;
text-align: left;
vertical-align: middle;
color: var(--font-primary);
background-color: #FFFFFF;
color: var(--vp-font-primary);
background-color: var(--vp-background-color);
margin-bottom: 2px;
float: none;
}
.vp-board-header-button-inner ul li:hover {
color: var(--font-highlight);
/* background-color: var(--light-gray-color); */
color: var(--vp-font-highlight);
/* background-color: var(--vp-light-gray-color); */
}

/* block */
Expand All @@ -156,7 +156,7 @@
flex-direction: column;
justify-content: center;
touch-action: none;
color: var(--font-primary);
color: var(--vp-font-primary);
font-family: 'AppleSDGothicNeo';

}
Expand All @@ -171,7 +171,7 @@
position: relative;
display: flex;
flex-direction: row;
background: var(--border-gray-color);
background: var(--vp-border-gray-color);
z-index: 10;
text-overflow: ellipsis;
white-space: nowrap;
Expand Down Expand Up @@ -222,7 +222,7 @@

/* block color labeling */
.vp-block.vp-focus .vp-block-header {
border: 2px solid var(--highlight-color);
border: 2px solid var(--vp-highlight-color);
}
.vp-block.vp-focus-child .vp-block-header {
background-color: rgb(196, 196, 196);
Expand Down Expand Up @@ -285,9 +285,9 @@
display: flex;
}
.vp-block-button {
background-color: white;
color: var(--font-primary);
border: 0.25px solid var(--border-gray-color);
background-color: var(--vp-background-color);
color: var(--vp-font-primary);
border: 0.25px solid var(--vp-border-gray-color);
box-sizing: border-box;
box-shadow: 1px 1px 2px rgb(0 0 0 / 10%);
border-radius: 2px;
Expand All @@ -296,7 +296,7 @@
text-align: center;
}
.vp-block-button:hover {
background-color: var(--highlight-color);
background-color: var(--vp-highlight-color);
color: white;
cursor: pointer;
transition: 0.2s;
Expand All @@ -309,7 +309,7 @@
border: 2px solid transparent;
}
.vp-block-markdown.vp-focus .vp-block-header {
border: 2px solid var(--highlight-color);
border: 2px solid var(--vp-highlight-color);
}
.vp-block-markdown .vp-block-header:empty::after {
content: 'Double click to edit.';
Expand All @@ -329,24 +329,24 @@
/* block menu */
.vp-block-menu-box {
position: fixed;
background: #FFFFFF;
background: var(--vp-background-color);
width: 125px;
line-height: 15px;
border: 0.25px solid var(--border-gray-color);
border: 0.25px solid var(--vp-border-gray-color);
border-radius: 3px;
padding: 5px;
z-index: 50;
}
.vp-block-menu-item {
color: var(--font-primary);
color: var(--vp-font-primary);
padding: 5px;
font-size: 14px;
}
.vp-block-menu-item:hover {
color: var(--font-highlight);
color: var(--vp-font-highlight);
cursor: pointer;
}
#vp_block_menu_delete:hover {
background: var(--highlight-color);
background: var(--vp-highlight-color);
color: white;
}
2 changes: 1 addition & 1 deletion visualpython/css/component/alertModal.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
width: 400px;
height: 150px;
padding: 15px;
background-color: white;
background-color: var(--vp-background-color);
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 3px 1px -2px rgba(0,0,0,0.12), 0 1px 5px 0 rgba(0,0,0,0.2);
}
.vp-alertModal-inner {
Expand Down
30 changes: 15 additions & 15 deletions visualpython/css/component/dataSelector.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
padding-right: 23px;
}
.vp-ds-box input.vp-ds-target:disabled {
background: var(--light-gray-color) !important;
background: var(--vp-light-gray-color) !important;
cursor: not-allowed;
}
.vp-ds-box input.vp-ds-target:disabled + .vp-ds-filter {
Expand All @@ -41,28 +41,28 @@
}
.vp-dataselector {
position: absolute;
top: calc(50% - 275px);
top: calc(50% - 290px);
left: calc(50% - 325px);
width: 650px;
height: 550px;
background: white;
border: 1px solid var(--border-gray-color);
height: 580px;
background: var(--vp-background-color);
border: 1px solid var(--vp-border-gray-color);
z-index: 1300;
/* font */
font-family: AppleSDGothicNeo;
font-size: 14px;
color: var(--font-primary);
color: var(--vp-font-primary);
}
.vp-ds-data-box {
width: 100%;
height: 160px;
height: 130px;
align-content: baseline;
align-items: center;
}
.vp-ds-type-box,
.vp-ds-variable-box {
border: 0.25px solid var(--border-gray-color);
height: 160px;
border: 0.25px solid var(--vp-border-gray-color);
height: 130px;
grid-row-gap: 0px;
align-content: baseline;
}
Expand All @@ -71,26 +71,26 @@
padding-left: 5px;
height: 25px;
line-height: 25px;
border-bottom: 1px solid var(--border-gray-color);
border-bottom: 1px solid var(--vp-border-gray-color);
}
.vp-ds-type-item:hover,
.vp-ds-var-item:hover {
background: var(--light-gray-color);
color: var(--font-highlight);
background: var(--vp-light-gray-color);
color: var(--vp-font-highlight);
cursor: pointer;
}
.vp-ds-type-item.selected,
.vp-ds-var-item.selected {
background: var(--light-gray-color);
color: var(--font-highlight);
background: var(--vp-light-gray-color);
color: var(--vp-font-highlight);
font-weight: bold;
}
.vp-ds-option-box {
height: calc(100% - 200px);
margin-top: 10px;
}
.vp-ds-option-inner-box {
height: calc(100% - 30px);
height: calc(100% - 80px);
}
.vp-ds-df-option-box {
height: 100%;
Expand Down
Loading