diff --git a/api/analyze.js b/api/analyze.js index 69d423a..e511a54 100644 --- a/api/analyze.js +++ b/api/analyze.js @@ -185,6 +185,14 @@ Object.keys(data[0]).forEach(x => { if (colorObj.copiedChannel > 1000) delete colorObj.copiedChannel; if (colorObj.pColor == "-1") delete colorObj.pColor if (colorObj.blending) colorObj.blending = true + if (colorObj.copiedHSV) { + let hsv = colorObj.copiedHSV.split("a") + colorObj.copiedHSV = {} + hsv.forEach((x, y) => { colorObj.copiedHSV[colorStuff.hsv[y]] = x }) + colorObj.copiedHSV['s-checked'] = colorObj.copiedHSV['s-checked'] == 1 + colorObj.copiedHSV['v-checked'] = colorObj.copiedHSV['v-checked'] == 1 + if (colorObj.copyOpacity == 1) colorObj.copyOpacity = true + } colorObj.opacity = +Number(colorObj.opacity).toFixed(2) colorList[y] = colorObj diff --git a/assets/css/browser.css b/assets/css/browser.css index b399aa6..9b4b37c 100644 --- a/assets/css/browser.css +++ b/assets/css/browser.css @@ -769,6 +769,70 @@ input::-webkit-inner-spin-button { font-size: 3vh; } +.color { + cursor: pointer; +} + +.color:hover { + transform:scale(1.1); + transition-duration: 0.1s; + transition-timing-function: ease-in-out; +} + +.colorBox { + position: absolute; + height: 22vh; + width: 22vh; + border-radius: 2vh; + border: 0.75vh solid; + margin: 2.5% auto; + right: 20%; + top: 34%; +} + +.colorSection { + display: inline-block; + width: 30%; + margin: 3% 0; +} + +.colorSection h1 { + font-size: 4vh; +} + +.colorSection p { + font-size: 3.2vh; + margin: 3% auto; + padding: 0.5% 0; + background-color: rgba(0, 0, 0, 0.2); + border-color: rgba(0, 0, 0, 0.2); + border-radius: 1vh; + max-width: 80%; +} + +.colorCheckbox { + text-align: left; + margin: 3% 0 0.5% 7%; +} + +.colorCheckbox label { + height: 7%; + padding-right: 17%; +} + +.colorSection2 { + width: 55%; + text-align: left; + display: inline-block; + vertical-align: top; +} + +.copyDetails { + text-align: center; + width: 48%; + margin: 3% 0; +} + .blendingDot { text-align: left; margin-left: 9%; @@ -785,6 +849,10 @@ input::-webkit-inner-spin-button { user-select: none; } +.copiedHSV { + font-size: 2vh !important; +} + .codeFont { font-size: 1.5vh; white-space: normal; diff --git a/html/analyze.html b/html/analyze.html index 1fa0890..7535adc 100644 --- a/html/analyze.html +++ b/html/analyze.html @@ -19,6 +19,11 @@ +