From 0b3e8b78c079a26b443730b23b7956a3cf0e29f9 Mon Sep 17 00:00:00 2001
From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com>
Date: Mon, 8 Aug 2022 04:08:25 +1000
Subject: [PATCH] join fixes and css update

---
 public/css/app.css                      |   4 +-
 public/css/appdark.css                  | 541 +-----------------------
 resources/css/{app.css => DONOTUSE.css} |   0
 resources/views/client/join.blade.php   |   2 +-
 resources/views/layouts/app.blade.php   |   1 +
 5 files changed, 25 insertions(+), 523 deletions(-)
 rename resources/css/{app.css => DONOTUSE.css} (100%)

diff --git a/public/css/app.css b/public/css/app.css
index 3d80c2f..65aec8e 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -155,9 +155,9 @@
   width: max-content;
   border-radius: 3px;
   border: 1px solid #3D414A;
-  background: rgb(80, 80, 80);
+  background: #cacbcc;
   /* Fallback for IE 11*/
-  background: linear-gradient(#cacbcc 10%, #2d2d2d 100%);
+  background: linear-gradient(#cacbcc 10%, #606060 100%);
 }
 
 .navbar {
diff --git a/public/css/appdark.css b/public/css/appdark.css
index 850ce83..5b8a3a7 100644
--- a/public/css/appdark.css
+++ b/public/css/appdark.css
@@ -1,88 +1,3 @@
-@keyframes animatedbackground {
-  from {
-    background-position-x: 0px;
-    animation-timing-function: linear;
-  }
-
-  to {
-    background-position-x: 2000px;
-    animation-timing-function: linear;
-  }
-}
-
-@keyframes alertanim {
-  0% {
-    top: 0px;
-    animation-timing-function: linear;
-  }
-
-  100% {
-    background-position-x: 72px;
-    animation-timing-function: linear;
-  }
-}
-
-.catalogitem,
-.catalogitemimage {
-  width: 126px;
-  padding: 5px;
-}
-
-.arkoticon_small {
-  margin: 0px;
-  width: 12px;
-}
-
-.arkoticon_navbar {
-  margin: 0px;
-  margin-right: 3px;
-  width: 20px;
-}
-
-.arkotcontainer {
-  position: relative;
-  padding-right: 10px;
-  margin-right: 0%;
-  margin-left: auto;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-content: center;
-  justify-content: center;
-  align-items: center;
-}
-
-.smallnavbarbuttoncontainer {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-content: center;
-  justify-content: flex-end;
-  align-items: center;
-}
-
-.arkotlabel {
-  color: rgb(35, 98, 222);
-  font-weight: bold;
-}
-
-#alert,
-#success {
-  height: fit-content;
-  margin: 0px;
-  animation: alertanim;
-  animation-duration: 250ms;
-  animation-iteration-count: 1;
-  position: fixed;
-  z-index: 10;
-  top: 72px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  padding-right: 5px;
-  padding-left: 5px;
-  width: 100%;
-  text-align: center;
-}
 
 #alert {
   background: linear-gradient(#f07575 10%, #de2323 100%);
@@ -96,128 +11,16 @@
   color: red;
 }
 
-#logo_full {
-  display: none;
-}
-
-#logo_small {
-  display: block;
-}
-
-@media (min-width: 1688px) {
-  #logo_full {
-    display: block;
-  }
-
-  #logo_small {
-    display: none;
-  }
-}
-
-@media (max-width: 730px) {
-  .navbarbuttoncontainer a {
-    position: relative;
-  }
-}
-
-@media (max-width: 970px) {
-  .navbarbuttoncontainer a {
-    font-size: 14px;
-  }
-}
-
-@media (max-width: 640px) {
-  .navbarbuttoncontainer a {
-    font-size: 12px;
-  }
-}
 
 .popupcontainer {
-  top: 0%;
-  position: fixed;
   background-color: rgba(0, 0, 0, 0.5);
-  width: 100%;
-  height: 100%;
-  z-index: 100000000;
-}
-
-.popup {
-  color: #000000;
-  text-align: center;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  padding-left: 5px;
-  padding-right: 5px;
-  transform: translate(-50%, -50%);
-  width: max-content;
-  border-radius: 3px;
-  border: 1px solid #3D414A;
-  background: #cacbcc;
-  /* Fallback for IE 11*/
-  background: linear-gradient(#cacbcc 10%, #606060 100%);
 }
 
 .navbar {
-  height: 40px;
-  margin: 0px;
-  padding-right: 5px;
-  align-content: center;
-  padding-left: 5px;
-  padding-top: 2px;
-  position: fixed;
-  top: 0px;
-  padding-bottom: 2px;
-  color: white;
-  line-height: normal;
-  z-index: 100;
-  display: inline-flex;
-  vertical-align: middle;
-  width: 100%;
   background: #2362DE;
-  /* Fallback for IE 11*/
   background: linear-gradient(#3690df 10%, #0d1085 100%);
 }
 
-.navbarbuttoncontainer,
-.navbarlogincontainer {
-  padding-left: 5px;
-  vertical-align: middle;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-content: center;
-  justify-content: center;
-  align-items: center;
-}
-
-#navbarlogincontainer,
-#navbarsignedincontainer {
-  position: relative;
-  padding-right: 10px;
-  margin-right: 0%;
-  margin-left: 0%;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-content: center;
-  justify-content: flex-end;
-  align-items: center;
-}
-
-#profilefriendscontainer p,
-#profilefriendscontainer a {
-  display: inline;
-}
-
-#profiletopcontainer {
-  margin-bottom: 30px;
-  display: block;
-  width: 100%;
-}
-
 .onlinestatus_website {
   color: #2260DD;
 }
@@ -234,133 +37,18 @@
   color: white;
 }
 
-.important {
-  color: red;
-  font-weight: bold;
-}
-
-#yes,
-#no {
-  width: 50%;
-}
-
-#FeedBox {
-  width: 100%;
-  height: 22px;
-}
-
-#FeedButton {
-  width: 100%;
-  height: 22px;
-}
-
-#logo_signup,
-#logo-signup p {
-  margin: auto;
-  text-align: center;
-  width: 200px;
-}
-
-#feed,
-#profileleftcontainer {
-  text-align: center;
-  padding-left: 5px;
-  padding-right: 5px;
-  width: 50%;
-}
-
-#gamesframe,
-#profilerightcontainer {
-  text-align: center;
-  padding-left: 5px;
-  padding-right: 5px;
-  width: 50%;
-}
-
 .FeedContainerBox,
-.ProfileContainerBox {
-  border-radius: 1px;
-  text-align: left;
-  width: 100%;
-  vertical-align: top;
-  display: inline-flex;
-  border: 1px solid #787373;
-  overflow-y: hidden;
-  overflow-x: hidden;
-  border-width: 1px;
-  margin-bottom: 5px;
-}
-
+.ProfileContainerBox,
 .FriendsContainerBox {
-  border-radius: 1px;
-  text-align: left;
-  width: 100%;
-  min-width: max-content;
-  vertical-align: top;
-  display: inline-flex;
-  border: 1px solid #000000;
-  border-width: 1px;
-  margin-bottom: 5px;
+  border: 1px solid #787373;
 }
-
-#btncontainer {
-  margin-left: 75%;
-}
-
-.navbarbutton {
-  position: relative;
-  padding-right: 5px;
-  text-align: center;
-  font-size: 18px;
-}
-
-.smallnavbarbutton {
-  position: relative;
-  padding-right: 5px;
-  text-align: center;
-  font-size: 15px;
-}
-
 .smallnav {
-  height: 25px;
-  margin: 0px;
-  padding-left: 10px;
-  padding-right: 5px;
-  position: fixed;
-  z-index: 100;
-  top: 43px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  display: inline-flex;
-  vertical-align: middle;
-  width: 100%;
-  line-height: normal;
   color: rgb(255, 255, 255);
-  text-size-adjust: auto;
-  text-align: left;
-  background: #000000;
   background: linear-gradient(#303030 10%, #000000 100%);
 }
 
-.invisible,
-#invisible {
-  display: none !important;
-}
-
 html {
-  animation-name: animatedbackground;
-  animation-duration: 50s;
-  animation-iteration-count: infinite;
-  background: url('../img/animated.png');
-  background-position: center bottom;
-  background-repeat: repeat-x;
-  background-attachment: fixed;
-  margin: 0px;
-  font-family: "Helvetica";
-  src: url('Helvetica.ttf') format('truetype'), ;
-  font-style: normal;
   background-color: rgb(1, 17, 48);
-  height: 100%;
   color: white;
 }
 
@@ -374,48 +62,14 @@ body {
   height: 100%;
 }
 
-.content_special,
-#content_special {
-  display: inline-flex;
-  width: 100%;
-  flex-direction: row;
-  align-items: flex-start;
-  align-content: center;
-  justify-content: flex-start;
-  flex-wrap: nowrap;
-}
-
 .content {
   color: white;
-  max-width: 1000px;
-  margin: auto;
-  margin-top: 105px;
-  padding-left: 5px;
-  padding-right: 5px;
-  min-height: 300px;
   background: rgb(25, 25, 25);
-  padding-bottom: 5px;
-  padding-top: 5px;
 }
 
 .content_signup {
   color: rgb(255, 255, 255);
-  max-width: 500px;
-  margin: auto;
-  margin-top: 30px;
-  padding-left: 5px;
-  padding-right: 5px;
   background: rgb(25, 25, 25);
-  padding-bottom: 5px;
-  padding-top: 5px;
-}
-
-.content_signup button {
-  width: 100%;
-}
-
-.content_signup input {
-  width: 98%;
 }
 
 .content p a,
@@ -428,128 +82,11 @@ body {
 }
 
 #footer {
-  text-align: center;
-  max-width: 1000px;
-  margin: auto;
-  padding-left: 5px;
-  padding-right: 5px;
-  padding-bottom: 5px;
-  padding-top: 5px;
   background: rgb(0, 0, 0);
-  /* Fallback for IE 11*/
-  min-height: fit-content;
 }
 
-/*Button gradients by TersisWilvin*/
-
-.tab {
-  background: rgb(255, 255, 255);
-  background: linear-gradient(0deg, #fff 0%, #b8b8b8 49%, #e3e3e3 50%, #f2f2f2 95%, #fff 100%);
-  font-weight: 400;
-  text-align: center;
-  height: 20px;
-  border-radius: 1px;
-  border: 1px solid #3D414A;
-  font-family: "Helvetica";
-  padding-left: 5px;
-  padding-right: 5px;
-  color: rgb(0, 0, 0) !important;
-}
-
-.tab_selected {
-  background: rgb(35, 98, 222);
-  background: linear-gradient(0deg, #00a2ff 0%, #0074bd 49%, #08f 50%, #57c2fe 95%, #99daff 100%);
-  font-weight: 400;
-  text-align: center;
-  height: 20px;
-  border-radius: 1px;
-  border: 1px solid #3D414A;
-  font-family: "Helvetica";
-  padding-left: 5px;
-  padding-right: 5px;
-  color: #fff !important;
-}
-
-button {
-  background: rgb(255, 255, 255);
-  /*Fallback for IE 11*/
-  background: linear-gradient(0deg, #fff 0%, #b8b8b8 49%, #e3e3e3 50%, #f2f2f2 95%, #fff 100%);
-  font-weight: 400;
-  text-align: center;
-  height: 20px;
-  border-radius: 3px;
-  border: 1px solid #3D414A;
-  font-family: "Helvetica";
-  color: #fff;
-}
-
-button:hover {
-  cursor: pointer;
-}
-
-button:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-
-button.bluebutton {
-  background: rgb(35, 98, 222);
-  /*Fallback for IE 11*/
-  background: linear-gradient(0deg, #00a2ff 0%, #0074bd 49%, #08f 50%, #57c2fe 95%, #99daff 100%);
-}
-
-button:hover.bluebutton {
-  background: linear-gradient(0deg, #32b5ff 0%, #0074bd 49%, #2c99f8 50%, #71c9fa 95%, #b6e5ff 100%);
-}
-
-button:active.bluebutton,
-button:focus.bluebutton {
-  background: linear-gradient(0deg, #32b5ff 0%, #0074bd 49%, #2c99f8 50%, #71c9fa 95%, #b6e5ff 100%);
-}
-
-button.greybutton {
-  background: rgb(255, 255, 255);
-  color: black;
-  /*Fallback for IE 11*/
-  background: linear-gradient(0deg, #fff 0%, #b8b8b8 49%, #e3e3e3 50%, #f2f2f2 95%, #fff 100%);
-}
-
-button:hover.greybutton {
-  background: linear-gradient(0deg, #fff 0%, #b8b8b8 49%, #e3e3e3 50%, #f2f2f2 95%, #fff 100%);
-}
-
-button.redbutton {
-  background: rgb(223, 24, 24);
-  /*Fallback for IE 11*/
-  background: linear-gradient(0deg, #d86868 0%, #a95151 49%, #bc5c5c 50%, #e96f6f 95%, #fe7979 100%);
-}
-
-button:hover.redbutton {
-  background: linear-gradient(0deg, #e27676 0%, #a95151 49%, #ca6363 50%, #f07272 95%, #fd8888 100%);
-}
-
-button.greenbutton {
-  background: rgb(26, 92, 46);
-  /*Fallback for IE 11*/
-  background: linear-gradient(0deg, #02b757 0%, #118237 49%, #01a64e 50%, #3fc679 95%, #a3e2bd 100%);
-}
-
-button:hover.greenbutton {
-  background: linear-gradient(0deg, #3fc679 0%, #15933f 49%, #3cc175 50%, #46dc86 95%, #53ff9d 100%);
-}
-
-
 #footer_signup {
-  text-align: center;
-  max-width: 500px;
-  margin: auto;
-  padding-left: 5px;
-  padding-right: 5px;
-  padding-bottom: 5px;
-  padding-top: 5px;
   background: rgb(0, 0, 0);
-  min-height: fit-content;
 }
 
 #footer p,
@@ -559,81 +96,45 @@ button:hover.greenbutton {
   color: white;
 }
 
-p,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0px;
-}
-
-img {
-  object-fit: contain;
-}
-
 a,
 #navbarusername {
   color: white;
-  text-decoration: none;
-  font-weight: bolder;
-}
-
-.nonbolded {
-  font-weight: normal !important;
 }
 
 .logoutframe {
-  color: black;
-  max-width: fit-content;
-  margin: auto;
-  padding-left: 5px;
-  padding-right: 5px;
   background: rgb(255, 255, 255);
-  /* Fallback for IE 11*/
   background-color: rgb(255, 255, 255);
-  padding-bottom: 5px;
-  padding-top: 5px;
-}
-
-.w-5 {
-  display: none;
-}
-
-.flex {
-  display: table;
-  margin-right: auto;
-  margin-left: auto;
 }
 
 .iphone-sidebar {
-  position: fixed;
   color: rgb(255, 255, 255);
-  width: 20%;
-  height: 100%;
-  margin-left: 0px;
   background-color: rgb(0, 0, 0);
-  padding-bottom: 5px;
-  padding-top: 5px;
 }
 
 .iphone-content {
-  position: relative;
   color: white;
-  width: 80%;
-  height: 100%;
-  left: 20%;
   background-color: rgb(0, 0, 0);
-  padding-bottom: 5px;
-  padding-top: 5px;
-  padding-left: 5px;
-  padding-right: 0px;
-  overflow-x: hidden;
-  position: fixed;
-  height: 100%;
 }
 
 #InviteTreeContainer {
   background-color: rgb(255, 255, 255);
+}
+
+textarea, select, input {
+  background-color: black;
+  color: white;
+}
+
+button.greybutton {
+  background: black;
+  color: rgb(255, 255, 255);
+  background: linear-gradient(180deg, #4b4b4b 0%, rgb(36, 36, 36) 100%);
+}
+
+button:hover.greybutton {
+  background: linear-gradient(0deg, #4b4b4b 0%, rgb(36, 36, 36) 100%);
+}
+
+.popup {
+  color: white;
 }
\ No newline at end of file
diff --git a/resources/css/app.css b/resources/css/DONOTUSE.css
similarity index 100%
rename from resources/css/app.css
rename to resources/css/DONOTUSE.css
diff --git a/resources/views/client/join.blade.php b/resources/views/client/join.blade.php
index 7f8e9c0..a94383e 100644
--- a/resources/views/client/join.blade.php
+++ b/resources/views/client/join.blade.php
@@ -76,7 +76,7 @@ end)
 game:GetService("ChangeHistoryService"):SetEnabled(false)
 game:GetService("ContentProvider"):SetThreadPool(16)
 game:GetService("InsertService"):SetBaseSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=10&type=base")
-game:GetService("InsertService"):SetUserSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=20&type=user&userid=%d&sid=%d)
+game:GetService("InsertService"):SetUserSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=20&type=user&userid=%d&sid=%d")
 game:GetService("InsertService"):SetCollectionUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?sid=%d")
 game:GetService("InsertService"):SetAssetUrl("http://www.morblox.us/asset/?id=%d")
 game:GetService("InsertService"):SetAssetVersionUrl("http://www.morblox.us/Asset/?assetversionid=%d")
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 254933a..0d25078 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,6 +19,7 @@
     @auth
         @switch (Auth::user()->settings->theme)
             @case(3)
+            <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
             <link href="{{ asset('css/appdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
             @break
             @case(2)