From 81acb17fc0418a917145e232e2a3221ecc0a1b1d Mon Sep 17 00:00:00 2001 From: PossiblyAxolotl Date: Sat, 17 Aug 2024 21:17:43 -0600 Subject: [PATCH] should work when embedded now --- apps/famous/index.html | 16 ++++++++-------- apps/guestbook/index.html | 2 +- apps/info.html | 4 ++-- apps/terminal.html | 2 +- apps/welcome.html | 2 +- apps/windowgen.html | 2 +- drag.js | 2 +- index.html | 4 ++++ style.css | 19 ++++++++++++++++++- 9 files changed, 37 insertions(+), 16 deletions(-) diff --git a/apps/famous/index.html b/apps/famous/index.html index 53e2a6b..0d2f698 100644 --- a/apps/famous/index.html +++ b/apps/famous/index.html @@ -16,28 +16,28 @@

Famous Rocks

- from wikipedia + from wikipedia

The Grand Canyon is one of the largest collectives of rock mass on earth. I haven't been there before, but someday I'd love to go get a bite to eat.

- from wikipedia + from wikipedia

Easter Island is where all the most popular rocks host their annual gathering, before venturing forth to forge the future of rock-kind. Truly a wonder of nature.

- from wikipedia + from wikipedia

This stone is named Rosetta. How could they trap her in a glass box like that? To rot in there for all of eternity??? Poor Rosetta...

- from xitter + from xitter

Despite his name, Dwayne "The Rock" Johnson is actually not a rock, but a human boy! I know, he had me fooled too. And what's this? He's about to dig into a nice tasty stone of his own?? Save some for me, Dwayne!

- from wikipedia + from wikipedia

Legend has it that once repaired, if you perform the right spell here you can unlock a special mask like no other.

- from wikimedia + from wikimedia

Dude who wrote on my rock? What the heck man??? I was gonna eat that. People these days...

- from jased + from jased

Here we see a group of small rocks at the annual family reunion. They sit peacefully, unaware of the horrors to come. What's that on the rock in front of them? Whatever it is, its probably not important.

- from wikimedia + from wikimedia

Many young rocks aspire to someday become a large space rock like the moon. Little do they know, the moon was actually put there by NASA to give people something to do and they stopped hiring rocks years ago.

\ No newline at end of file diff --git a/apps/guestbook/index.html b/apps/guestbook/index.html index 751e08e..1e08b64 100644 --- a/apps/guestbook/index.html +++ b/apps/guestbook/index.html @@ -37,7 +37,7 @@
  • Keep it PG
  • Be nice
  • Don't make a bunch of posts, this is more of a one time thing
    • -
  • You agree to the
    • +
  • You agree to the
    • \ No newline at end of file diff --git a/apps/info.html b/apps/info.html index 96901b5..0743a37 100644 --- a/apps/info.html +++ b/apps/info.html @@ -46,8 +46,8 @@

    i-eat.rocks

    Rock-OS v0.1.3

    Created by PossiblyAxolotl

    -

    Contact

    - +

    Contact

    + \ No newline at end of file diff --git a/apps/terminal.html b/apps/terminal.html index 55d72e2..c6c776f 100644 --- a/apps/terminal.html +++ b/apps/terminal.html @@ -65,7 +65,7 @@ ta.value += "\n> " + command; if (command != "help") { - window.top.postMessage(command) + window.parent.postMessage(command) } else { ta.value += "\nwin (url) (title) (width) (height) - create a window"; ta.value += "\nwg - open windowgen"; diff --git a/apps/welcome.html b/apps/welcome.html index f00e9c3..2e22043 100644 --- a/apps/welcome.html +++ b/apps/welcome.html @@ -16,7 +16,7 @@

    Hey rock fan!

    diff --git a/apps/windowgen.html b/apps/windowgen.html index 5aac602..eb9e9e8 100644 --- a/apps/windowgen.html +++ b/apps/windowgen.html @@ -19,7 +19,7 @@ diff --git a/drag.js b/drag.js index 9ec0c73..6b1ee1b 100644 --- a/drag.js +++ b/drag.js @@ -12,7 +12,7 @@ function clampPos() { const lPad = -selected.offsetWidth / 2; const rPad = window.innerWidth - selected.offsetWidth / 2; const tPad = 0; - const bPad = document.body.offsetHeight - 32; + const bPad = document.body.offsetHeight - 72; if (sPosX < lPad) {selected.style.left = lPad + "px"}; if (sPosX > rPad) {selected.style.left = rPad + "px"}; diff --git a/index.html b/index.html index 3dab42f..6a0571d 100644 --- a/index.html +++ b/index.html @@ -45,10 +45,14 @@ + + \ No newline at end of file diff --git a/style.css b/style.css index 10414ff..697d54b 100644 --- a/style.css +++ b/style.css @@ -108,12 +108,14 @@ button:active { body, html { background: linear-gradient(to right, #00000000, rgba(255, 255, 255, 0.15)), url("images/ui/wallpaper1.png"); + background-color: #63659e; overflow: hidden; width: 100vw; padding:0; margin:0; - height: 100lvh; + height: 100svh; + max-height: 100svh; } .app { @@ -150,4 +152,19 @@ body, html { .rainbow { color:red; animation: hue infinite 2s linear; +} + +nav { + background-color: #dbdbdb; + border-top: outset white 4px; + + position: absolute; + + width:100%; + height: 32px; + bottom:0; + + box-shadow: 0px 0px 4px rgba(0,0,0,0.5); + + z-index: 2147483647; } \ No newline at end of file