diff --git a/src/assets/base.css b/src/assets/base.css index 7cc4895..b22368d 100644 --- a/src/assets/base.css +++ b/src/assets/base.css @@ -1,24 +1,24 @@ :root { --c-light-0: #ffffff; - --c-light-1: #f8f8f8; - --c-light-2: #f2f2f2; + --c-light-1: #eeeeee; + --c-light-t: rgba(235, 235, 235, 0.64); --c-dark-0: #000000; --c-dark-1: #181818; --c-dark-2: #222222; --c-dark-3: #282828; + --c-dark-4: #333333; + --c-dark-5: #555555; + --c-dark-t: rgba(84, 84, 84, 0.65); - --c-indigo: #2c3e50; + --c-error: #ff0000; - --c-divider-light-1: rgba(60, 60, 60, 0.29); - --c-divider-light-2: rgba(60, 60, 60, 0.12); - --c-divider-dark-1: rgba(84, 84, 84, 0.65); - --c-divider-dark-2: rgba(84, 84, 84, 0.48); - - --c-text-light-1: var(--c-indigo); - --c-text-light-2: rgba(60, 60, 60, 0.66); - --c-text-dark-1: var(--c-light-0); - --c-text-dark-2: rgba(235, 235, 235, 0.64); + --c-x: #ff0000; + --c-y: #00ff00; + --c-z: #0000ff; + --c-x-t: #ff000077; + --c-y-t: #00ff0077; + --c-z-t: #0000ff77; --quat-bg-alpha: 0.3; --c-bg-quat-x: rgba(255, 0, 0, var(--quat-bg-alpha)); @@ -26,36 +26,56 @@ --c-bg-quat-z: rgba(0, 0, 255, var(--quat-bg-alpha)); --c-bg-quat-w: rgba(255, 255, 0, var(--quat-bg-alpha)); - --c-bg-btn: #282828; - --c-bg-btn-hover: #333; - --c-bg-btn-active: #555; - --cont-border-radius: 20px; } /* semantic color variables for this project */ :root { - --color-background: var(--c-dark-1); - --color-background-soft: var(--c-dark-2); - --color-background-mute: var(--c-dark-3); + --c-text-main: var(--c-dark-t); + --c-text-accent: var(--c-dark-0); + + --c-bg-main: var(--c-light-1); + --c-bg-accent: var(--c-light-2); + --c-bg-canvas: var(--c-light-2); - --color-border: var(--c-divider-dark-2); - --color-border-hover: var(--c-divider-dark-1); + --c-selection: var(--c-light-1); + --c-bg-tooltip: var(--c-light-0); + --c-text-tooltip: var(--c-dark-0); - --color-heading: var(--c-text-dark-1); - --color-text: var(--c-text-dark-2); + --c-btn-border: var(--c-light-t); + --c-btn-bg: var(--c-light-3); + --c-btn-bg-hover: var(--c-light-4); + --c-btn-bg-active: var(--c-light-5); + --c-table-bg: var(--c-light-3); + --c-table-header: var(--c-light-4); + --c-table-border: var(--c-light-t); + --c-svg: var(--c-dark-t); + --c-svg-hover: var(--c-dark-0); } .dark { - --color-background: var(--c-light-0); - --color-background-soft: var(--c-light-1); - --color-background-mute: var(--c-light-2); + --c-text-main: var(--c-light-t); + --c-text-accent: var(--c-light-0); + + --c-bg-main: var(--c-dark-1); + --c-bg-accent: var(--c-dark-2); + --c-bg-canvas: var(--c-dark-2); + + --c-selection: var(--c-dark-0); + --c-bg-tooltip: var(--c-dark-0); + --c-text-tooltip: var(--c-light-0); + + --c-btn-border: var(--c-dark-t); + --c-btn-bg: var(--c-dark-3); + --c-btn-bg-hover: var(--c-dark-4); + --c-btn-bg-active: var(--c-dark-5); - --color-border: var(--c-divider-light-2); - --color-border-hover: var(--c-divider-light-1); + --c-table-bg: var(--c-dark-3); + --c-table-header: var(--c-dark-4); + --c-table-border: var(--c-dark-t); - --color-heading: var(--c-text-light-1); - --color-text: var(--c-text-light-1); + --c-svg: var(--c-light-t); + --c-svg-hover: var(--c-light-0); } *, @@ -67,8 +87,8 @@ } body { - color: var(--color-text); - background: var(--color-background); + color: var(--c-text-main); + background: var(--c-bg-main); transition: color 0.5s, background-color 0.5s; diff --git a/src/assets/main.css b/src/assets/main.css index 2dd9d2a..ed49dfe 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -20,21 +20,20 @@ h2 { } ::selection { - background-color: black; + background-color: var(--c-selection); } .tooltip { position: relative; display: inline-block; - border-bottom: 1px dotted black; } .tooltip .tooltiptext { line-height: 1.2; visibility: hidden; width: 120px; - background-color: black; - color: #fff; + background-color: var(--c-bg-tooltip); + color: var(--c-text-tooltip); text-align: center; padding: 5px 0; border-radius: 6px; diff --git a/src/components/ActionButton.vue b/src/components/ActionButton.vue index 18b3f36..f932dee 100644 --- a/src/components/ActionButton.vue +++ b/src/components/ActionButton.vue @@ -34,16 +34,16 @@ button { padding: 10px; border-radius: 20%; cursor: pointer; - border: 1px solid var(--c-divider-dark-1); - background-color: var(--c-bg-btn); + border: 1px solid var(--c-btn-border); + background-color: var(--c-btn-bg); } button:hover { - background-color: var(--c-bg-btn-hover); + background-color: var(--c-btn-bg-hover); } button:active { - background-color: var(--c-bg-btn-active); + background-color: var(--c-btn-bg-active); } /* Toast animation */ diff --git a/src/components/CoordControl.vue b/src/components/CoordControl.vue index 5131e45..245c22e 100644 --- a/src/components/CoordControl.vue +++ b/src/components/CoordControl.vue @@ -69,8 +69,7 @@ button { font-size: 24pt; padding-left: 10px; padding-right: 10px; - color: #ffffff; - /* text-shadow: 0px 0px 5px #000; */ + color: var(--c-text-accent); border-width: 0px; cursor: pointer; } @@ -84,26 +83,26 @@ button { } .x .label { - background-color: #ff000077; + background-color: var(--c-x-t); } .x button { - background-color: #ff0000; + background-color: var(--c-x); } .y .label { - background-color: #00ff0077; + background-color: var(--c-y-t); } .y button { - background-color: #00ff00; + background-color: var(--c-y); } .z .label { - background-color: #0000ff77; + background-color: var(--c-z-t); } .z button { - background-color: #0000ff; + background-color: var(--c-z); } \ No newline at end of file diff --git a/src/components/Help.vue b/src/components/Help.vue index 6b1ad44..f37c450 100644 --- a/src/components/Help.vue +++ b/src/components/Help.vue @@ -90,27 +90,27 @@ button { width: 50px; height: 50px; padding: 0 15px 0 15px; - border: 1px solid var(--c-divider-dark-1); - background-color: var(--c-bg-btn); + border: 1px solid var(--c-btn-border); + background-color: var(--c-btn-bg); border-radius: 50%; cursor: pointer; z-index: 2; } button:hover { - background-color: var(--c-bg-btn-hover); + background-color: var(--c-btn-bg-hover); } button:active { - background-color: var(--c-bg-btn-active); + background-color: var(--c-btn-bg-active); } .content { z-index: 1; top: 15px; right: 15px; - border: 1px solid var(--c-divider-dark-1); - background-color: var(--c-bg-btn); + border: 1px solid var(--c-table-border); + background-color: var(--c-table-bg); padding: 0 70px 20px 70px; display: flex; flex-direction: column; @@ -122,12 +122,12 @@ table { } .header-row { - color: white; - background-color: var(--c-bg-btn-hover); + color: var(--c-text-accent); + background-color: var(--c-table-header); } td { - border: 1px solid var(--c-divider-dark-1); + border: 1px solid var(--c-table-border); padding: 10px; } \ No newline at end of file diff --git a/src/components/Links.vue b/src/components/Links.vue index 9eb9364..06db04f 100644 --- a/src/components/Links.vue +++ b/src/components/Links.vue @@ -30,45 +30,11 @@ a { } svg { - fill: var(--c-text-dark-2); + fill: var(--c-svg); transition: fill 0.3s; } svg:hover { - fill: white; -} - -/* a:hover { - background-color: var(--c-bg-btn-hover); -} - -a:active { - background-color: var(--c-bg-btn-active); -} */ - -.content { - z-index: 1; - top: 15px; - right: 15px; - border: 1px solid var(--c-divider-dark-1); - background-color: var(--c-bg-btn); - padding: 0 70px 20px 70px; - display: flex; - flex-direction: column; -} - -table { - border-collapse: collapse; - line-height: 1; -} - -.header-row { - color: white; - background-color: var(--c-bg-btn-hover); -} - -td { - border: 1px solid var(--c-divider-dark-1); - padding: 10px; + fill: var(--c-svg-hover); } \ No newline at end of file diff --git a/src/components/Snap.vue b/src/components/Snap.vue index df63b47..3caaee2 100644 --- a/src/components/Snap.vue +++ b/src/components/Snap.vue @@ -53,20 +53,19 @@ function decSnapDenom() { .pi { width: 15px; height: 15px; - /* margin-bottom: 7px; */ } hr { width: 100%; - border: 1px solid var(--c-text-dark-2); + border: 1px solid var(--c-text-main); } .active_hr { - border-color: white; + border-color: var(--c-text-accent); } .active { - color: white; + color: var(--c-text-accent); } .buttons { @@ -78,17 +77,17 @@ button { font-size: 12pt; border-width: 0px; cursor: pointer; - color: var(--c-text-dark-2); - border: 1px solid var(--c-divider-dark-1); - background-color: var(--c-bg-btn); + color: var(--c-text-main); + border: 1px solid var(--c-btn-border); + background-color: var(--c-btn-bg); } button:hover { - background-color: var(--c-bg-btn-hover); + background-color: var(--c-btn-bg-hover); } button:active { - background-color: var(--c-bg-btn-active); + background-color: var(--c-btn-bg-active); } .plus { diff --git a/src/components/Vis3D.vue b/src/components/Vis3D.vue index b52674c..f8e1df6 100644 --- a/src/components/Vis3D.vue +++ b/src/components/Vis3D.vue @@ -415,29 +415,20 @@ span { } .x { - color: red + color: var(--c-x) } .y { - color: greenyellow + color: var(--c-y) } .z { - color: blue + color: var(--c-z) } canvas { width: 500px; height: 500px; border-radius: var(--cont-border-radius); - /* width: 300px; - height: 300px; */ } - -/* @media screen and (min-aspect-ratio: 1/1) { - canvas { - width: 500px; - height: 500px; - } -} */ diff --git a/src/components/VisControls.vue b/src/components/VisControls.vue index c807b76..d2d161a 100644 --- a/src/components/VisControls.vue +++ b/src/components/VisControls.vue @@ -48,15 +48,15 @@ button { padding: 10px; border-radius: 20%; cursor: pointer; - border: 1px solid var(--c-divider-dark-1); - background-color: var(--c-bg-btn); + border: 1px solid var(--c-btn-border); + background-color: var(--c-btn-bg); } button:hover { - background-color: var(--c-bg-btn-hover); + background-color: var(--c-btn-bg-hover); } button:active { - background-color: var(--c-bg-btn-active); + background-color: var(--c-btn-bg-active); } \ No newline at end of file diff --git a/src/components/VisMat.vue b/src/components/VisMat.vue index 088b5f5..3aae279 100644 --- a/src/components/VisMat.vue +++ b/src/components/VisMat.vue @@ -169,12 +169,16 @@ watch(rotMat, (newRotMat) => { diff --git a/src/components/VisQuat.vue b/src/components/VisQuat.vue index 033a26f..750a75e 100644 --- a/src/components/VisQuat.vue +++ b/src/components/VisQuat.vue @@ -157,11 +157,11 @@ watch(quat, (newQuat) => { diff --git a/src/components/icons/IconCopy.vue b/src/components/icons/IconCopy.vue index 480fc9b..6c981f4 100644 --- a/src/components/icons/IconCopy.vue +++ b/src/components/icons/IconCopy.vue @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/src/components/icons/IconEdit.vue b/src/components/icons/IconEdit.vue index 5f4a154..9002f09 100644 --- a/src/components/icons/IconEdit.vue +++ b/src/components/icons/IconEdit.vue @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/src/components/icons/IconGithub.vue b/src/components/icons/IconGithub.vue index 1ba3d7a..4f5a874 100644 --- a/src/components/icons/IconGithub.vue +++ b/src/components/icons/IconGithub.vue @@ -4,9 +4,3 @@ d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3 .3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5 .3-6.2 2.3zm44.2-1.7c-2.9 .7-4.9 2.6-4.6 4.9 .3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3 .7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3 .3 2.9 2.3 3.9 1.6 1 3.6 .7 4.3-.7 .7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3 .7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3 .7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z" /> - - \ No newline at end of file diff --git a/src/components/icons/IconMoon.vue b/src/components/icons/IconMoon.vue index 86d53fc..48d327c 100644 --- a/src/components/icons/IconMoon.vue +++ b/src/components/icons/IconMoon.vue @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/src/components/icons/IconNo.vue b/src/components/icons/IconNo.vue index 3321f01..88d0a93 100644 --- a/src/components/icons/IconNo.vue +++ b/src/components/icons/IconNo.vue @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/src/components/icons/IconPi.vue b/src/components/icons/IconPi.vue index a23c3ff..cdcf955 100644 --- a/src/components/icons/IconPi.vue +++ b/src/components/icons/IconPi.vue @@ -8,10 +8,10 @@ \ No newline at end of file diff --git a/src/components/icons/IconQuestion.vue b/src/components/icons/IconQuestion.vue index 1a14d0d..44850b6 100644 --- a/src/components/icons/IconQuestion.vue +++ b/src/components/icons/IconQuestion.vue @@ -7,10 +7,10 @@ \ No newline at end of file diff --git a/src/components/icons/IconReset.vue b/src/components/icons/IconReset.vue index 63f9801..9d621d4 100644 --- a/src/components/icons/IconReset.vue +++ b/src/components/icons/IconReset.vue @@ -1,12 +1,12 @@ \ No newline at end of file diff --git a/src/components/icons/IconSun.vue b/src/components/icons/IconSun.vue index 6218bca..b725cd2 100644 --- a/src/components/icons/IconSun.vue +++ b/src/components/icons/IconSun.vue @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/src/components/icons/IconYes.vue b/src/components/icons/IconYes.vue index 1ad0aac..a505977 100644 --- a/src/components/icons/IconYes.vue +++ b/src/components/icons/IconYes.vue @@ -7,6 +7,6 @@ \ No newline at end of file