From efb60f2471371a5291499bca9553e0b6c3753195 Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Wed, 14 Aug 2024 14:52:08 +0200 Subject: [PATCH] team oppgave --- CSS/flex/index.html | 7 ++- htmx/index.html | 21 ++++++++ intro_html/css.html | 49 ++++++++++++++++++ intro_html/index.html | 31 +++--------- intro_html/script.js | 30 ++++++++++- prosjekt/index.html | 1 + team/oppgave1/index.html | 12 +++++ team/oppgave1/index2.html | 91 ++++++++++++++++++++++++++++++++++ team/variabler/healthMana.html | 28 +++++++++-- 9 files changed, 239 insertions(+), 31 deletions(-) create mode 100644 intro_html/css.html create mode 100644 team/oppgave1/index.html create mode 100644 team/oppgave1/index2.html diff --git a/CSS/flex/index.html b/CSS/flex/index.html index 7f96077..b94b014 100644 --- a/CSS/flex/index.html +++ b/CSS/flex/index.html @@ -32,7 +32,7 @@

Verden!

Aaaaa aaaa
- aaaa aaaa + aaaa aaaa
Bbbbb bbbb bbbb bbbb
Aaaaa aaaa aaaa aaaa
@@ -55,6 +55,11 @@
Aaaaa aaaa aaaa aaaa
Bbbbb bbbb bbbb bbbb
+ + + diff --git a/htmx/index.html b/htmx/index.html index e69de29..b8a761c 100644 --- a/htmx/index.html +++ b/htmx/index.html @@ -0,0 +1,21 @@ + + + + + + + Document + + + +

HTMX

+ Blog + + + + + + + \ No newline at end of file diff --git a/intro_html/css.html b/intro_html/css.html new file mode 100644 index 0000000..2b07a4b --- /dev/null +++ b/intro_html/css.html @@ -0,0 +1,49 @@ + + + + + + + Document + + + + +
+
Header
+
Menu
+
MainContent
+
Footer
+
+ + + \ No newline at end of file diff --git a/intro_html/index.html b/intro_html/index.html index 1020e22..76c1394 100644 --- a/intro_html/index.html +++ b/intro_html/index.html @@ -15,43 +15,26 @@

Eksempel 1

-
Start Tekst Her
-
-
+
Verktøy
-
- De to viktigste verktøyene vi skal bruke er disse: -
    -
  • - Koderedigeringsprogrammet Visual Studio Code -
    - Vi skal bruke noen extensions: -
      -
    • JavaScript-booster
      • -
    • es6-string-html
      • -
    • live-server
      • -
    • live-share
      • -
    -
    • -
  • Nettleseren Chrome
    • -
+
-
+
HTML
-
+
Vi bruker HTML til å definere et dokument.
  • Tagger for grunnleggende oppsett av en HTML-fil
    • @@ -74,7 +57,7 @@
-
+
Vi bruker CSS til å style et dokument, altså farger, fonter, utseende og lignende.
  • background-color
    • @@ -95,12 +78,12 @@
-
+
JavaScript
-
+
Det viktigste vi skal lære er programmeringsspråket JavaScript. Vi skal lære grunnleggende programmering ved å manipulere HTML- og CSS-kode på en nettside ved hjelp av JavaScript. diff --git a/intro_html/script.js b/intro_html/script.js index a937d49..26684f1 100644 --- a/intro_html/script.js +++ b/intro_html/script.js @@ -1,3 +1,29 @@ -function oppdaterTekst() { - document.getElementById('tekstDiv').innerHTML = 'Ny tekst nå som knappen er trykket på'; +blankAll() +function blankAll(){ + document.getElementById('inner').innerHTML = ''; +} +function green() { + blankAll(); + document.getElementById('inner').innerHTML = /*HTML*/ ` + De to viktigste verktøyene vi skal bruke er disse: +
    +
  • + Koderedigeringsprogrammet Visual Studio Code +
    + Vi skal bruke noen extensions: +
      +
    • JavaScript-booster
      • +
    • es6-string-html
      • +
    • live-server
      • +
    • live-share
      • +
    +
    • +
  • Nettleseren Chrome
    • +
`; +} +function blue() { + +} +function red() { + } \ No newline at end of file diff --git a/prosjekt/index.html b/prosjekt/index.html index af4132d..513f4f7 100644 --- a/prosjekt/index.html +++ b/prosjekt/index.html @@ -5,6 +5,7 @@ Super cool project for homelabers + +

Gruppe Oppgave the Goats

+
Klikk her for å legge til eller ta vekk
+ + + + +
+
Inventory
+
+
+ +
+ + + \ No newline at end of file diff --git a/team/variabler/healthMana.html b/team/variabler/healthMana.html index 114c025..d0d56ec 100644 --- a/team/variabler/healthMana.html +++ b/team/variabler/healthMana.html @@ -3,10 +3,30 @@ - Hei på deg! + Health og Mana + -
+
Add or delete potions from inventory
+
@@ -14,7 +34,7 @@
- Inventory +
Inventory
@@ -43,7 +63,7 @@ function showHideInventory() { if (inventoryOpen != true) { document.getElementById('inventory').innerHTML = /*HTML*/ ` -
Health
+
Health
Mana
`; document.getElementById("manaTotal").innerHTML = manaTotal;