From 33446ab77c964850ed12e58446196fc9b8b231f0 Mon Sep 17 00:00:00 2001 From: Victor Lobe Date: Sun, 2 Aug 2020 16:06:29 -0700 Subject: [PATCH] Code cleanup/beautified --- calc/index.html | 131 ++++---- calc/script.js | 32 +- calc/style.css | 13 +- css/conduct.css | 73 ++-- css/main.css | 35 +- index.html | 439 ++++++++++++++----------- js/index.js | 118 +++---- js/main.js | 4 +- masterbuilders/assets/css/builders.css | 11 +- masterbuilders/assets/js/builders.js | 18 +- masterbuilders/index.html | 211 +++++++----- staff/index.html | 152 +++++---- 12 files changed, 694 insertions(+), 543 deletions(-) diff --git a/calc/index.html b/calc/index.html index 072deb1..c1a123c 100644 --- a/calc/index.html +++ b/calc/index.html @@ -1,80 +1,83 @@ - + + Admin Application Calculator - - -

Admin Application Calculator

-
-
+ + + +

Admin Application Calculator

+
+

Application Type:

+ +
+
+
+

Operator:

-
-

Operator:

-
-
- - -
-
- - -
+ +
-
-

Super Admin:

-
-
- - - -
-
- - - -
-
-
-
-

Telnet Admin:

-
-
- - -
-
- - -
-
-
-
-

Senior Admin:

-
-
- -
-
- -
-
-
-
-

Score:

-

0 points / 0 votes

-

0% (0%)

-

Status: N/A

-
+ +
- +
+
+

Super Admin:

+
+
+ + + +
+
+ + + +
+
+
+
+

Telnet Admin:

+
+
+ + +
+
+ + +
+
+
+
+

Senior Admin:

+
+
+ +
+
+ +
+
+
+
+

Score:

+

0 points / 0 votes

+

0% (0%)

+

Status: N/A

+
+
+
+ + \ No newline at end of file diff --git a/calc/script.js b/calc/script.js index 0151062..3ad5d96 100644 --- a/calc/script.js +++ b/calc/script.js @@ -5,8 +5,7 @@ var rounded_percentage = 0; var application_type = "super"; var approved = false; -function submit_vote(points) -{ +function submit_vote(points) { total_points += points; total_votes++; percentage = (total_points / total_votes) * 100; @@ -14,38 +13,27 @@ function submit_vote(points) update_score(); } -function update_score() -{ +function update_score() { document.getElementById("points").innerHTML = total_points; document.getElementById("total_votes").innerHTML = total_votes; document.getElementById("rounded_percentage").innerHTML = rounded_percentage; document.getElementById("percentage").innerHTML = percentage; application_type = document.getElementById("type").value; - - if (application_type == "super" && rounded_percentage >= 60) - { + + if (application_type == "super" && rounded_percentage >= 60) { approved = true; - } - else if (application_type == "telnet" && rounded_percentage >= 65) - { + } else if (application_type == "telnet" && rounded_percentage >= 65) { approved = true; - } - else if (application_type == "senior" && rounded_percentage >= 70) - { + } else if (application_type == "senior" && rounded_percentage >= 70) { approved = true; - } - else - { + } else { approved = false; } - - if (approved) - { + + if (approved) { document.getElementById("status").style = "color: #0f0;"; document.getElementById("status").innerHTML = "Accepted"; - } - else - { + } else { document.getElementById("status").style = "color: #f00;"; document.getElementById("status").innerHTML = "Denied"; } diff --git a/calc/style.css b/calc/style.css index 7da023c..1ab3215 100644 --- a/calc/style.css +++ b/calc/style.css @@ -30,14 +30,15 @@ select { color: white; cursor: pointer; -webkit-appearance: none; - +} + select::before { - border-bottom-style: solid; - border-top: none; + border-bottom-style: solid; + border-top: none; } select:after { - margin-top: 7px; - border-top-style: solid; - border-bottom: none; + margin-top: 7px; + border-top-style: solid; + border-bottom: none; } \ No newline at end of file diff --git a/css/conduct.css b/css/conduct.css index d33279c..1300ea1 100644 --- a/css/conduct.css +++ b/css/conduct.css @@ -2,10 +2,12 @@ body { background: #222 url("../images/conduct-bg.png") fixed no-repeat center center; background-size: cover; font-family: 'Roboto', sans-serif; - margin-bottom: 50px; } + margin-bottom: 50px; +} .brand-logo { - font-family: 'Raleway', sans-serif !important; } + font-family: 'Raleway', sans-serif !important; +} .content { margin: 50px auto; @@ -13,30 +15,43 @@ body { width: 90%; color: #eee; height: 100%; - background: rgba(34, 34, 34, 0.6); } - .content h1 { - margin-top: 5.17241px; - font-size: 1.3em; - font-weight: 900; - text-transform: uppercase; - border-bottom: 1px solid #ccc; - padding: 0 0 10px; } - .content h3 { - font-size: 1.05em; - font-weight: 600; } - .content li { - padding: 5px; } - .content .warning { - color: #F44336; - padding: 1px 10px; - border-left: 3px solid #F44336; - display: block; } - .content a { - color: #bbb; - padding: 2px; - -webkit-transition: all .3s ease-in-out; - -o-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; - border-bottom: 1px hidden #ccc; } - .content a:hover { - border-bottom: 1px solid #ccc; } + background: rgba(34, 34, 34, 0.6); +} + +.content h1 { + margin-top: 5.17241px; + font-size: 1.3em; + font-weight: 900; + text-transform: uppercase; + border-bottom: 1px solid #ccc; + padding: 0 0 10px; +} + +.content h3 { + font-size: 1.05em; + font-weight: 600; +} + +.content li { + padding: 5px; +} + +.content .warning { + color: #F44336; + padding: 1px 10px; + border-left: 3px solid #F44336; + display: block; +} + +.content a { + color: #bbb; + padding: 2px; + -webkit-transition: all .3s ease-in-out; + -o-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; + border-bottom: 1px hidden #ccc; +} + +.content a:hover { + border-bottom: 1px solid #ccc; +} \ No newline at end of file diff --git a/css/main.css b/css/main.css index d441100..dba230a 100644 --- a/css/main.css +++ b/css/main.css @@ -431,57 +431,65 @@ small { } footer.page-footer .footer-copyright { - height: auto!important; + height: auto !important; margin-bottom: -15px } h3 { - color: rgba(255, 255, 255, 0.6); - font-size: 1.35em;text-align: center; - margin-top: 2px; + color: rgba(255, 255, 255, 0.6); + font-size: 1.35em; + text-align: center; + margin-top: 2px; } .github { - position: absolute; - right: 10px; - font-size: 16px; - z-index: 1; - color: #ddd; + position: absolute; + right: 10px; + font-size: 16px; + z-index: 1; + color: #ddd; } .github-icon { - font-family: FontAwesome; + font-family: FontAwesome; } .github-icon::before { - content: '\f09b' + content: '\f09b' } @media only screen and (max-width:991px) { + .cover-2 h2, .cover-2 p { width: 100% } + .online-part { padding: 25% .7% } + .rule { padding: 15px } + .useful { margin-top: 0; margin: 0 } + .discord-widget { padding-left: 0; -webkit-transform: translateX(25%); -ms-transform: translateX(25%); transform: translateX(25%) } + .admins>ul>a { display: block; border-radius: 0 } + .head-icon { width: 20px; height: 20px; @@ -489,21 +497,26 @@ h3 { float: left; border-radius: 50% } + .modal li { display: block; width: 100%; padding: 5px 70px } + .modal-msg { margin: 25px 0; padding: 5px } + .nav-wrapper { background: #111 } + .modal.modal-fixed-footer .modal-content { padding: 10px } + nav .nav-wrapper li>a { font-weight: 500; font-size: 1em diff --git a/index.html b/index.html index c04f72d..f55db44 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,8 @@ - - - - - - Home | TotalFreedom Minecraft Server - - - - - - - - - - - - - -
- -
- -
- +
-

Made by miwojedk - this project won the #1 place on PlanetMinecraft Contest (Press "Show More" to see more information) +

Made by miwojedk - this project won the #1 place on PlanetMinecraft Contest (Press "Show More" to see + more information)

- +
- +

Made by Dusty01

- +
- +

Made by Dusty01

- +
- +

Made by Dusty01

- +
- +

Made by UYScutix

- +
@@ -219,53 +244,61 @@
- +

Made by UYScutix

- +
- +

Made by UYScutix

- +
- +

Made by UYScutix

- +
- +

Made by xfilez (Redstoner)

- +
@@ -273,174 +306,200 @@
- +

Made by xfilez (Redstoner)

- +
- +

Made by DDiS

- +
- +

Made by DisignusBlocks

- +
- +

Made by DisignusBlocks

- +
- +

Made by DisignusBlocks

- +
- +

Made by DisignusBlocks

- +
- +

Made by Nathaniel

- +
- +

Made by Nathaniel

- +
- +

Made by CaliburnS3 (Redstoner)

- +
- +

Made by xfilez (Redstoner)

- +
- +

Made by xfilez (Redstoner)

- +
-
+
- +

Made by DragonSlayer2189 (Redstoner)

- +
-
+
-
- -
If you are masterbuilder, send me your builds!
- + + +
If you are masterbuilder, send me + your builds!
+ + + + + + + + + + + + \ No newline at end of file