From 59ef527a4e71a5cd356df414553f54ac748dea98 Mon Sep 17 00:00:00 2001 From: Jennie Robinson Faber Date: Sun, 5 Nov 2023 14:47:42 -0500 Subject: [PATCH] Add progress bar --- css/main.css | 8 +++- twine_src/css/output.css | 83 ++++++++++++++++++++++++++++++++++++--- twine_src/main.twee | 52 ++++++++++++------------ twine_src/scripts/init.js | 54 ++++++------------------- 4 files changed, 122 insertions(+), 75 deletions(-) diff --git a/css/main.css b/css/main.css index de497dd..86fc128 100644 --- a/css/main.css +++ b/css/main.css @@ -55,9 +55,13 @@ html { #rep { @apply flex flex-col self-end -ml-6 z-30 relative w-72; } - -.repImage { +.passage-choices { + @apply flex flex-row justify-between; +} +.passage-choices span { + @apply underline font-bold cursor-pointer hover:text-neutral-950 text-neutral-800; } + #passageContainer { @apply self-end flex-col w-full p-6 md:max-h-96 overflow-y-auto bg-neutral-400; } diff --git a/twine_src/css/output.css b/twine_src/css/output.css index 1022c9f..2f89333 100644 --- a/twine_src/css/output.css +++ b/twine_src/css/output.css @@ -1113,6 +1113,10 @@ video { position: absolute; } +.top-0 { + top: 0px; +} + .mx-auto { margin-left: auto; margin-right: auto; @@ -1123,10 +1127,19 @@ video { margin-bottom: 0.5rem; } +.mx-6 { + margin-left: 1.5rem; + margin-right: 1.5rem; +} + .-mb-4 { margin-bottom: -1rem; } +.mr-6 { + margin-right: 1.5rem; +} + .block { display: block; } @@ -1143,10 +1156,18 @@ video { height: 10rem; } +.h-6 { + height: 1.5rem; +} + .w-40 { width: 10rem; } +.w-full { + width: 100%; +} + .flex-shrink-0 { flex-shrink: 0; } @@ -1163,8 +1184,13 @@ video { justify-content: center; } -.justify-between { - justify-content: space-between; +.rounded-full { + border-radius: 9999px; +} + +.bg-neutral-200 { + --tw-bg-opacity: 1; + background-color: rgb(229 229 229 / var(--tw-bg-opacity)); } .bg-neutral-300 { @@ -1172,15 +1198,24 @@ video { background-color: rgb(212 212 212 / var(--tw-bg-opacity)); } -.bg-red-200 { +.bg-neutral-400 { --tw-bg-opacity: 1; - background-color: rgb(254 202 202 / var(--tw-bg-opacity)); + background-color: rgb(163 163 163 / var(--tw-bg-opacity)); +} + +.bg-neutral-600 { + --tw-bg-opacity: 1; + background-color: rgb(82 82 82 / var(--tw-bg-opacity)); } .p-1 { padding: 0.25rem; } +.p-2 { + padding: 0.5rem; +} + .py-6 { padding-top: 1.5rem; padding-bottom: 1.5rem; @@ -1200,10 +1235,20 @@ video { line-height: 1.25rem; } +.text-lg { + font-size: 1.125rem; + line-height: 1.75rem; +} + .uppercase { text-transform: uppercase; } +.text-neutral-900 { + --tw-text-opacity: 1; + color: rgb(23 23 23 / var(--tw-text-opacity)); +} + .underline { text-decoration-line: underline; } @@ -1281,7 +1326,23 @@ html { align-self: flex-end; } -.repImage { +.passage-choices { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.passage-choices span { + cursor: pointer; + font-weight: 700; + --tw-text-opacity: 1; + color: rgb(38 38 38 / var(--tw-text-opacity)); + text-decoration-line: underline; +} + +.passage-choices span:hover { + --tw-text-opacity: 1; + color: rgb(10 10 10 / var(--tw-text-opacity)); } #passageContainer { @@ -1394,3 +1455,15 @@ tw-story { #sidebar li:hover { background-color: #555; } + +@media (prefers-color-scheme: dark) { + .dark\:bg-neutral-500 { + --tw-bg-opacity: 1; + background-color: rgb(115 115 115 / var(--tw-bg-opacity)); + } + + .dark\:bg-neutral-700 { + --tw-bg-opacity: 1; + background-color: rgb(64 64 64 / var(--tw-bg-opacity)); + } +} diff --git a/twine_src/main.twee b/twine_src/main.twee index 0d0021f..d919a64 100644 --- a/twine_src/main.twee +++ b/twine_src/main.twee @@ -46,15 +46,25 @@ What's your planet name? <% console.log(setup.game) %> <% console.log(s) %> -
+
+
Energy:
+ +
+
+
+
+
Turn:
+
1
+
-
+
@@ -64,7 +74,7 @@ What's your planet name?
    -
  • ENERGY: <%= setup.game.energy %>
  • +
  • ENERGY: <%= setup.game.energy %>
  • BUDDY UP
  • TRACK TIME
  • ENGAGE IN PROJECT
  • @@ -76,6 +86,7 @@ What's your planet name?