Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
Showing with 1,738 additions and 1,120 deletions.
  1. +10 −0 README.md
  2. +91 −0 css/m3rlin.css
  3. +79 −80 css/main.css
  4. BIN favicon.ico
  5. BIN images/brijan-pale.gif
  6. BIN images/brijan.gif
  7. +768 −335 index.html
  8. +42 −0 js/m3rlin.js
  9. +748 −705 js/main.js
@@ -1,7 +1,17 @@
# SLAcer.js ([demo](http://lautr3k.github.io/SLAcer.js/)) # SLAcer.js ([demo](http://lautr3k.github.io/SLAcer.js/))

![Screenshot](/screenshot.png?raw=true) ![Screenshot](/screenshot.png?raw=true)


This project is a fork of SLAcer.js adapted for the M3rlin project.

Checkout the original SlAcer.js at

Additional resources:
brijan.gif : http://thepatternlibrary.com/
favicon.ico : https://game-icons.net/1x1/delapouite/porcelain-vase.html

# Main features # Main features

- Browse or drag/drop STL file. - Browse or drag/drop STL file.
- Mesh information: size, volume, cost, etc... - Mesh information: size, volume, cost, etc...
- Mesh transformation: scale, rotate, translate, mirror. - Mesh transformation: scale, rotate, translate, mirror.
@@ -0,0 +1,91 @@
.centerer {
display: flex;
align-items: center;
justify-content: space-around;
}

#hide {
display: none;
transition: 0.5s;
}
.modal-header {
color: rgb(105, 105, 105);
text-align: center;
}
.full_modal-dialog {
width: 98% !important;
height: 92% !important;
min-width: 98% !important;
min-height: 92% !important;
max-width: 98% !important;
max-height: 92% !important;
padding: 0 !important;
}

.full_modal-content {
height: 99% !important;
min-height: 99% !important;
max-height: 99% !important;
}
.modal-body {
background-image: url('../images/brijan-pale.gif');
/* display: flex; */
display: none;
align-content: center;
justify-content: center;
}
.m3rlin-options,
m34 {
/* display: none; */
background-image: url('../images/brijan-pale.gif');
display: flex;
justify-content: space-around;

width: 100%;
margin: 0px;
padding: 50px;
}
.m3rlin-btn {
background-color: white;
border: 5px solid #696969;
border-radius: 10px;
background-size: contain;
font-size: 1.5em;
margin: 10px;
align-content: center;
padding: 3% 7% 3% 7%;
transition: 0.3s;
}
.modal-footer {
/* display: flex; */
}
#m3rlin-continue,
#quick {
background: rgb(171, 250, 171);
transition: 0.3s;
}
.m3rlin-btn:hover {
background: #696969;
color: white;
border: 5px solid orange;
}
#m3rlin-continue:hover,
#quick:hover {
background: #696969;

color: rgb(171, 250, 171);
}

#quick-confirm {
/* display: flex; */
display: none;
}
.m3rlin-quickstart-btns {
/* display: none; */
/* align-content: space-between;
justify-content: center; */
}
.caution {
border: 4px solid orange;
background-color: orange;
}
@@ -1,153 +1,152 @@
/* Navbar */ /* Navbar */
.navbar { .navbar {
margin: 0; margin: 0;
} }



/* Sidebar */ /* Sidebar */
#sidebar { #sidebar {
position: fixed; position: fixed;
top: 51px; top: 51px;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 300px; width: 300px;
padding: 10px; padding: 10px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
background-color: #f5f5f5; background-color: #f5f5f5;
border-right: 1px solid #eeeeee; border-right: 1px solid #eeeeee;
} }


#sidebar .panel-placeholder { #sidebar .panel-placeholder {
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 4px; border-radius: 4px;
background-color: #eeeeee; background-color: #eeeeee;
border: 1px dashed #cccccc; border: 1px dashed #cccccc;
} }


#sidebar .panel-body { #sidebar .panel-body {
padding-bottom: 0; padding-bottom: 0;
} }


#sidebar .info { #sidebar .info {
margin-bottom: 10px; margin-bottom: 10px;
} }


#sidebar .info-label { #sidebar .info-label {
font-weight: bold; font-weight: bold;
} }


#sidebar .info, #sidebar .info,
#sidebar .form-group { #sidebar .form-group {
min-height: 20px; min-height: 20px;
} }


#sidebar small { #sidebar small {
color: #888888; color: #888888;
font-weight: normal; font-weight: normal;
} }


#sidebar label, #sidebar label,
#sidebar .info-label { #sidebar .info-label {
width: 60%; width: 60%;
float: left; float: left;
} }


#sidebar .info-value, #sidebar .info-value,
#sidebar .form-control { #sidebar .form-control {
width: 40%; width: 40%;
float: left; float: left;
} }


/* Main */ /* Main */
#main { #main {
position: fixed; position: fixed;
left: 301px; left: 301px;
right: 39px; right: 39px;
top: 51px; top: 51px;
bottom: 0; bottom: 0;
} }


/* Slider */ /* Slider */
#slider { #slider {
position: fixed; position: fixed;
padding: 10px; padding: 10px;
width: 60px; width: 60px;
top: 51px; top: 51px;
bottom: 0; bottom: 0;
right: 0; right: 0;
background-color: #f5f5f5; background-color: #f5f5f5;
border-left: 1px solid #eeeeee; border-left: 1px solid #eeeeee;
} }


#slider .min, #slider .min,
#slider .max { #slider .max {
padding: 0; padding: 0;
height: 20px; height: 20px;
display: block; display: block;
text-align: center; text-align: center;
} }


#slider .max { #slider .max {
margin-bottom: 10px; margin-bottom: 10px;
} }


#slider .min { #slider .min {
margin-top: 10px; margin-top: 10px;
} }


#slider .slider { #slider .slider {
margin-left: 10px; margin-left: 10px;
} }


#slider .slider-handle { #slider .slider-handle {
border: 1px #cccccc solid; border: 1px #cccccc solid;
background-color: #ffffff; background-color: #ffffff;
background-image: -webkit-linear-gradient(top, #eeeeee 0%, #cccccc 100%); background-image: -webkit-linear-gradient(top, #eeeeee 0%, #cccccc 100%);
background-image: -o-linear-gradient(top, #eeeeee 0%, #cccccc 100%); background-image: -o-linear-gradient(top, #eeeeee 0%, #cccccc 100%);
background-image: linear-gradient(to bottom,#eeeeee 0%, #cccccc 100%); background-image: linear-gradient(to bottom, #eeeeee 0%, #cccccc 100%);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#cccccc', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#cccccc', GradientType=0);
filter: none; filter: none;
} }


#slider .slider-track { #slider .slider-track {
border: 1px solid #eeeeee; border: 1px solid #eeeeee;
} }


#slider .slider-track, #slider .slider-track,
#slider .slider-selection { #slider .slider-selection {
background-color: #ffffff; background-color: #ffffff;
background-image: none; background-image: none;
filter: none; filter: none;
} }


/* Alert */ /* Alert */
#alert { #alert {
position: absolute; position: absolute;
top: 61px; top: 61px;
left: 311px; left: 311px;
right: 71px; right: 71px;
} }


/* Button file */ /* Button file */
.btn-file { .btn-file {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }


.btn-file input[type=file] { .btn-file input[type='file'] {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
min-width: 100%; min-width: 100%;
min-height: 100%; min-height: 100%;
font-size: 100px; font-size: 100px;
text-align: right; text-align: right;
filter: alpha(opacity=0); filter: alpha(opacity=0);
opacity: 0; opacity: 0;
outline: none; outline: none;
background: white; background: white;
cursor: inherit; cursor: inherit;
display: block; display: block;
} }
BIN +1.12 KB favicon.ico
Binary file not shown.
BIN +4.94 KB images/brijan-pale.gif
Binary file not shown.
BIN +5.01 KB images/brijan.gif
Binary file not shown.

No commit comments for this range

You can’t perform that action at this time.