Skip to content

Commit

Permalink
Resolve package-lock.json conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
EricXie-02 committed Sep 24, 2024
2 parents fa8407c + 3815f10 commit 7097f22
Show file tree
Hide file tree
Showing 54 changed files with 22,987 additions and 19,905 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ __pycache__/

coverage/
node_modules/
dist/

old/*output
old/*.scad
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"cSpell.words": ["registryref"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"rpc.enabled": true
}
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3duf.org
57 changes: 57 additions & 0 deletions dist/animations.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#resolution-toolbar {
align-content: center;
position: absolute;
width: 500px;
height: 120px;
top: 10px;
right: 100px;
background-color: rgb(250, 250, 250);
z-index: 9;
box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.36);
transition: all 0.4s;
padding-left: 30px;
padding-right: 30px;
padding-top: 5px;
padding-botton: 5px;
opacity: 0.9;
border-radius: 5px;
}

#zoom-toolbar {
align-content: center;
position: absolute;
/*width: 100px;*/
height: 30%;
top: 100px;
right: 30px;
/*background-color: rgb(250, 250, 250);*/
z-index: 9;
transition: all 0.4s;
padding-top: 25px;
padding-botton: 25px;
/*opacity: 0.9;*/
border-radius: 5px;
}

#toolbar-button-panel {
position: absolute;
top: 10px;
right: 10px;
z-index: 9;
}

.showtoolbar {
-webkit-transform: translateY(0);
transform: translateY(0);
visibility: visible;
}

.hidetoolbar {
-webkit-transform: translateY(-100%);
transform: translateY(-100%);
visibility: hidden;
}

.collapse {
display: none;
}
1 change: 1 addition & 0 deletions dist/css/app.85a0644e.css

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

5 changes: 5 additions & 0 deletions dist/css/chunk-vendors.acfd7f9b.css

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions dist/demo.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#canvas_block {
position: fixed;
padding: 0px;
}

#c {
width: 100%;
height: 100%;
}

#button_block {
display: block;
position: fixed;
left: 0;
width: 250px;
height: 100%;
background: #eee;
top: 0;
}

#param-slider-container {
padding: 15;
}

hr {
border: 0;
border-bottom: 1px dashed #ccc;
background: #999;
}

.slider-container {
margin-bottom: 10;
}

.btn-label:first-of-type {
margin-top: 0;
}

.btn-label {
width: 100%;
display: block;
background-color: #1c2b44;
height: auto;
padding: 10px;
font-size: 14px;
margin: 1em 0 1em 0;
color: #eee;
text-shadow: 0 -1px 0 #000;
letter-spacing: 0.1em;
text-transform: uppercase;
font-weight: normal;
box-shadow: 0 2px 0px #ccc;
}
Binary file added dist/favicon.ico
Binary file not shown.
Binary file added dist/fonts/Roboto-Black.313a6563.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Black.59eb3601.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-BlackItalic.cc2fadc3.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-BlackItalic.f75569f8.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-Bold.50d75e48.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Bold.b52fac2b.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-BoldItalic.4fe0f73c.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-BoldItalic.94008e69.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-Light.c73eb1ce.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Light.d26871e8.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-LightItalic.13efe6cb.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-LightItalic.e8eaae90.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-Medium.1d659482.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Medium.90d16760.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-MediumItalic.13ec0eb5.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-MediumItalic.83e114c3.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Regular.35b07eb2.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Regular.73f0a88b.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-RegularItalic.4357beb8.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-RegularItalic.f5902d5e.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-Thin.ad538a69.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-Thin.d3b47375.woff
Binary file not shown.
Binary file added dist/fonts/Roboto-ThinItalic.5b4a33e1.woff2
Binary file not shown.
Binary file added dist/fonts/Roboto-ThinItalic.8a96edbb.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
72 changes: 72 additions & 0 deletions dist/img/3DuF_favicon_large.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/3DuF_placeholder_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/3DuF_placeholder_png.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 75 additions & 0 deletions dist/img/3DuF_placeholder_svg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/CHANNEL.6ac8d4e3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/cidar_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/favicon_large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7097f22

Please sign in to comment.