diff --git a/beach/img/assets/logo-sm.png b/beach/img/assets/logo-sm.png deleted file mode 100644 index 3a4c663..0000000 Binary files a/beach/img/assets/logo-sm.png and /dev/null differ diff --git a/beach/img/assets/logosmall_bpb.jpg b/beach/img/assets/logosmall_bpb.jpg deleted file mode 100644 index 5eb07ab..0000000 Binary files a/beach/img/assets/logosmall_bpb.jpg and /dev/null differ diff --git a/beach/img/assets/logosmall_bpb1.jpg b/beach/img/assets/logosmall_bpb1.jpg deleted file mode 100644 index 60e7a2d..0000000 Binary files a/beach/img/assets/logosmall_bpb1.jpg and /dev/null differ diff --git a/beach/img/slideshow/img1.jpg b/beach/img/slideshow/img1.jpg deleted file mode 100644 index fffe745..0000000 Binary files a/beach/img/slideshow/img1.jpg and /dev/null differ diff --git a/beach/img/slideshow/img2.jpg b/beach/img/slideshow/img2.jpg deleted file mode 100644 index 68fdfce..0000000 Binary files a/beach/img/slideshow/img2.jpg and /dev/null differ diff --git a/beach/img/slideshow/img3.jpg b/beach/img/slideshow/img3.jpg deleted file mode 100644 index 29a976f..0000000 Binary files a/beach/img/slideshow/img3.jpg and /dev/null differ diff --git a/beach/index.html b/beach/index.html deleted file mode 100644 index 0395221..0000000 --- a/beach/index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - Beach Party Balloons - - - - - - - - - - - -
- -
- - -
- - - -
- - - - - - - - - - - \ No newline at end of file diff --git a/beach/script.js b/beach/script.js deleted file mode 100644 index a77d1d7..0000000 --- a/beach/script.js +++ /dev/null @@ -1,13 +0,0 @@ -// initialize navbar -document.addEventListener('DOMContentLoaded', function() { - var elems = document.querySelectorAll('.sidenav'); - var instances = M.Sidenav.init(elems, options); - - }); - -// init slideshow -document.addEventListener('DOMContentLoaded', function() { - var elems = document.querySelector('.carousel'); - var instances = M.Carousel.init(elems, options); -console.log("twst") - }); \ No newline at end of file diff --git a/beach/style.css b/beach/style.css deleted file mode 100644 index 88f9e0f..0000000 --- a/beach/style.css +++ /dev/null @@ -1,9 +0,0 @@ -body { - display: flex; - min-height: 100vh; - flex-direction: column; - } - - main { - flex: 1 0 auto; - } \ No newline at end of file diff --git a/kathleen/index.html b/kathleen/index.html deleted file mode 100644 index 730ece1..0000000 --- a/kathleen/index.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - Kathleen - - - -
- - - -
No Classes Right Now 😁
-
- - - \ No newline at end of file diff --git a/menu/menu.css b/menu/menu.css index 86d6a21..6b03958 100644 --- a/menu/menu.css +++ b/menu/menu.css @@ -20,4 +20,5 @@ html{ } .navbar-item:hover { color: #363636 !important; + background-color: white !important; } \ No newline at end of file diff --git a/nato/style.css b/nato/style.css index 9ece881..f228718 100644 --- a/nato/style.css +++ b/nato/style.css @@ -23,10 +23,11 @@ h1{ background-color: #2d2e2e !important; border-color:#2d2e2e !important} #main{ - margin-top: 7%; display: flex; - justify-items: center; + margin-top: 7%; flex-direction: column; + column-gap: 50px; + justify-items: flex-end; } #clear{ font-size: 35px; margin: 3%; @@ -39,9 +40,10 @@ text-align: center !important; } #output{ background-color: cornflowerblue; - max-width: 60%; - width: 300px; - height: 15rem; + max-width:max-content; + width: 75%; + /* height: 15rem; */ + min-height: fit-content; margin: auto; margin-top: 50px; color: white; diff --git a/rollDice/dice.css b/rollDice/dice.css index 7f648ac..ed515c0 100644 --- a/rollDice/dice.css +++ b/rollDice/dice.css @@ -1,6 +1,7 @@ body{ background-color: #b967ff; + height: 100%; } #diceContainer{ @@ -24,6 +25,7 @@ body{ color: #fffb96; border-radius: 20px; font-size: 200%; + padding: 2rem; } #numberOfDiceSelection{ @@ -40,6 +42,22 @@ input[type=radio] { width: 100%; height: 2em; } -img{ +.die{ height:7.75em; } + +#numbers{ + display: none; + text-align: center; + font-size: 1.5rem; + color: white;; +} + +.wrapper{ + position:fixed; + right:0; + bottom:0; +} +#math{ + display: none; +} \ No newline at end of file diff --git a/rollDice/dice.js b/rollDice/dice.js index 7958a1a..5abe3ba 100644 --- a/rollDice/dice.js +++ b/rollDice/dice.js @@ -8,25 +8,44 @@ function newDiceNumber() { die_value[i] = new Array(2); } for (i = 0, j = 1; i < numberOfDice; i++, j++) { - die_value[i][0] = ""; + die_value[i][0] = ""; die_value[i][1] = j; document.getElementById("die" + j).innerHTML = die_value[i][0]; } } function shuffle_dice() { + document.getElementById("math").style.display = "block" + let addition = ""; + let sum = 0; for (i = 0, j = 1; i < die_value.length; i++, j++) { var rand = Math.floor(Math.random() * 6) + 1; - die_value[i][0] = "" + die_value[i][0] = "" die_value[i][1] = rand; document.getElementById("die" + j).innerHTML = die_value[i][0]; - document.getElementById("numbers").innerHTML = die_value[i][1] + "+" + die_value[j][1]; + addition += ` ${die_value[i][1]}` + " "; + sum = sum + die_value[i][1]; + if (i < die_value.length -1) {addition += "+"; } else addition += "= "; + } + + document.getElementById("numbers").innerHTML = addition + sum; +} + +function showMath(){ + + var numBlock = document.getElementById('numbers'); + if (numBlock.style.display === "none") { +    numBlock.style.display = "block"; +  } else { +    numBlock.style.display = "none"; + } + } function die_gif() { for (i = 0, j = 1; i < die_value.length; j++, i++) { - die_value[i][0] = ""; + die_value[i][0] = ""; document.getElementById("die" + j).innerHTML = die_value[i][0]; } setTimeout(shuffle_dice, 600) diff --git a/rollDice/index.html b/rollDice/index.html index 3f66de6..f06c602 100644 --- a/rollDice/index.html +++ b/rollDice/index.html @@ -6,6 +6,8 @@ + + Roll Dice @@ -13,7 +15,7 @@ -