diff --git a/data.json b/data.json index b9755ad..ffc45b1 100644 --- a/data.json +++ b/data.json @@ -112,7 +112,7 @@ { "id": 12, "name": "R870", - "damage": 92, + "damage": 552, "damage_multiplier": 6, "rpm": 70, "mag_size": 12, @@ -122,7 +122,7 @@ { "id": 14, "name": "Scattergun", - "damage": 110, + "damage": 232, "damage_multiplier": 4, "rpm": 300, "mag_size": 7, @@ -132,7 +132,7 @@ { "id": 16, "name": "Shorty", - "damage": 29, + "damage": 116, "damage_multiplier": 4, "rpm": 185, "mag_size": 8, @@ -142,7 +142,7 @@ { "id": 18, "name": "AA12", - "damage": 22, + "damage": 88, "damage_multiplier": 4, "rpm": 300, "mag_size": 20, @@ -412,7 +412,7 @@ { "id": 46, "name": "RC12", - "damage": 50, + "damage": 200, "damage_multiplier": 4, "rpm": 225, "mag_size": 10, @@ -772,7 +772,7 @@ { "id": 83, "name": "SPAS-12", - "damage": 24, + "damage": 192, "damage_multiplier": 8, "rpm": 150, "mag_size": 8, @@ -814,7 +814,7 @@ "name": "M32", "damage": 500, "damage_multiplier": 1, - "rpm": 9999, + "rpm": 120, "mag_size": 6, "reload_time": 12, "guntype": "SPECIAL" @@ -824,7 +824,7 @@ "name": "M32NL", "damage": 1, "damage_multiplier": 1, - "rpm": 9999, + "rpm": 120, "mag_size": 6, "reload_time": 12, "guntype": "SPECIAL" diff --git a/static/img/TRL_Logo.jpg b/static/img/TRL_Logo.jpg new file mode 100644 index 0000000..4836f40 Binary files /dev/null and b/static/img/TRL_Logo.jpg differ diff --git a/static/img/menu-list-icon-app-navigation-option-page-interface-dropdown-three-lines-button-dots-sign-symbol-black-artwork-graphic-illustration-clipart-eps-vector.jpg b/static/img/menu-list-icon-app-navigation-option-page-interface-dropdown-three-lines-button-dots-sign-symbol-black-artwork-graphic-illustration-clipart-eps-vector.jpg new file mode 100644 index 0000000..02c1bd4 Binary files /dev/null and b/static/img/menu-list-icon-app-navigation-option-page-interface-dropdown-three-lines-button-dots-sign-symbol-black-artwork-graphic-illustration-clipart-eps-vector.jpg differ diff --git a/static/style.css b/static/style.css index 036a487..f51d8b2 100644 --- a/static/style.css +++ b/static/style.css @@ -21,7 +21,7 @@ header nav a { } header nav a:hover { - color: #45a049; + color: gray; } h1 { @@ -89,9 +89,9 @@ input { } -main{ +main { position: relative; - z-index: 1; + z-index: -1; background-color: rgba(255, 255, 255, 0.9); margin-top: 10%; padding: 20px 35px 35px 35px; @@ -100,6 +100,112 @@ main{ overflow: auto; } -.test{ +nav { + top: 0; + left: 0; + width: 100% +} -} \ No newline at end of file +.divider { + top: 0; + width: 80% +} + +/* Add a black background color to the top navigation */ +.topnav { + position: absolute; + right: 20px; + top: 10px; + background-color: #333; + overflow: visible; /* Ensure dropdown content isn't clipped */ + z-index: 1000; /* Higher z-index to appear above other content */ +} + +/* Style the links inside the navigation bar */ +.topnav a { + color: #f2f2f2; + text-align: center; + text-decoration: none; + font-size: 17px; +} + +/* Style the dropdown button */ +.dropdown .dropbtn { + font-size: 17px; + border: none; + outline: none; + color: white; + background-color: inherit; + padding: 14px 16px; + cursor: pointer; +} + +/* Dropdown content */ +.dropdown-content { + display: none; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); + right: 0; /* Ensures dropdown aligns with the button */ + z-index: 2000; /* Ensures it stays above the rest */ +} + +/* Style the links inside the dropdown */ +.dropdown-content a { + float: none; /* Ensure the links stack properly */ + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; + text-align: left; +} + +/* Add a dark background on hover */ +.topnav a:hover, .dropdown:hover .dropbtn { + background-color: #555; + color: white; +} + +/* Add a grey background to dropdown links on hover */ +.dropdown-content a:hover { + background-color: #ddd; + color: black; +} + +/* Show the dropdown when the button is clicked */ +.dropdown.show .dropdown-content { + display: block; /* Toggle visibility */ +} + +/* Media query for smaller screens */ +@media screen and (max-width: 600px) { + .topnav { + right: 0; + top: 0; + width: 100%; + position: relative; + } + + .dropdown .dropbtn { + width: 100%; + text-align: center; + } + + .dropdown-content { + width: 100%; + position: relative; + } +} + +/* Hide the icon on larger screens */ +.topnav .icon { + display: none; +} + +/* Show the icon only on smaller screens */ +@media screen and (max-width: 600px) { + .topnav .icon { + display: block; + } +} diff --git a/templates/index.html b/templates/index.html index 69edeb2..6c7e588 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,11 +6,43 @@ Gun Stats + -
@@ -21,23 +53,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - +
IDNameDamageDamage multiplierRounds per minuteMagazine SizeReload timeGun typeRPSDPSDPMAvg DPS
IDNameDamageDamage multiplierRounds per minuteMagazine SizeReload timeGun typeRPSDPSDPMAvg DPS