restore and add build.sh

README.md

@@ -21,29 +21,24 @@ Platinum is a hobby project entirely managed and written by the community. It is
 4. Open the downloaded file then let Platinum install!
 
 ## Building from source
-<<<<<<< HEAD
-
-=======
->>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
+### Windows
 Run
 ```
 git clone https://github.com/redstone-scratch/Platinum && cd Platinum
 npm/pnpm install
 npm/pnpm run tailwind:once
 npm/pnpm run make
 ```
-<<<<<<< HEAD
 The output is in the out directory.
 
-=======
-
+### Linux
+Run
+```
+git clone https://github.com/redstone-scratch/Platinum && cd Platinum
+bash build.sh
+```
 The output is in the out directory.
 
-## About this fork
-
-This fork is not supposed to replace Platinum, it is more of a testbed for the more stable Platinum releases.
-
->>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 ## Contributors
 
 This section will update automatically as we get contribut*o*rs.

build.sh

@@ -0,0 +1,3 @@
+npm install
+npm run tailwind:once
+npm run make

src/bookmarks.js

@@ -1,4 +1,3 @@
-
 // initialise global variables
 const bookmarksBar = document.getElementById("bookmarks");
 // get bookmarks initialised
@@ -67,13 +66,8 @@ function updateBookmarksVar() {
  * Stores the bookmarks in localstorage and runs updateBookmarksVar
  */
 function storeBookmarks() {
-<<<<<<< HEAD
-  if (bookmarks.length === 0) bookmarksBar.classList.add("hidden");
-  // else bookmarksBar.classList.remove("hidden");
-=======
 	if (bookmarks.length === 0) bookmarksBar.classList.add("hidden");
 	//else bookmarksBar.classList.remove("hidden");
->>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 	window.localStorage.setItem("bookmarks", JSON.stringify(bookmarks));
 	updateBookmarksVar();
 }

src/tabs.js

@@ -152,10 +152,7 @@ function handleTabShortcuts(e) {
         document.querySelector('.current').reload();
         e.preventDefault();
     }
-<<<<<<< HEAD
-=======
     if (isModifier && e.key === "u") {
         alert('dunno how to open devtools :(')
     }
->>>>>>> 38062090b4962591978249d7cdf4a2dc7b8d1b04
 };