Merge pull request #31 from Flynntes/dev

Fixing GitHub Issues
Flynntes · Jan 8, 2020 · 400b68f · 400b68f
2 parents 4f7c05f + b89e173
commit 400b68f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/sleeky-backend/assets/css/_base.scss b/sleeky-backend/assets/css/_base.scss
@@ -747,6 +747,11 @@ code {
   padding: 0px 10px !important;
 }
 
+body > div > pre {
+  overflow-x: scroll;
+  padding-left: 290px;
+}
+
 // End General Styles
 
 
@@ -936,4 +941,8 @@ code {
       }
     }
   }
+
+  body > div > pre {
+    padding-left: 20px;
+  }
 }
diff --git a/sleeky-backend/assets/css/dark.css b/sleeky-backend/assets/css/dark.css
diff --git a/sleeky-backend/assets/css/light.css b/sleeky-backend/assets/css/light.css
diff --git a/sleeky-backend/assets/js/theme.js b/sleeky-backend/assets/js/theme.js
@@ -111,7 +111,7 @@ $( document ).ready(function() {
     $("#wrap").prepend(`<div class="nav-open" id="navOpen"><i class="material-icons">menu</i></div>`);
 
     // Add frontend link
-    $('#admin_menu').append('<li class="admin_menu_toplevel"><a href="/"><i class="material-icons">arrow_back</i> Frontend Interface</a></li>');
+    $('#admin_menu').append('<li class="admin_menu_toplevel frontend_link"><a href="/"><i class="material-icons">arrow_back</i> Frontend Interface</a></li>');
 
     // admin_menu
     $('#navOpen').on('click', function() {

diff --git a/sleeky-backend/plugin.php b/sleeky-backend/plugin.php
@@ -137,4 +137,11 @@ function sleeky_settings_update() {
 		}
 
 	}
+}
+
+// Hide admin links for non-authenticated users
+if (yourls_is_valid_user() != 1) {
+	echo <<<HEAD
+		<style>ul#admin_menu li:not(.frontend_link) {display: none}</style>
+HEAD;
 }
diff --git a/sleeky-frontend/index.php b/sleeky-frontend/index.php
@@ -46,7 +46,7 @@
 		<div class="container verticle-center">
 			<div class="main-content">
 				<div class="close noselect">
-				    <a href="<?php echo siteURL ?>"><i class="material-icons">close</i></a>
+				    <a href="javascript:window.location.href=window.location.href;"><i class="material-icons">close</i></a>
 				</div>
 				<section class="head">
 					<h2>YOUR SHORTENED LINK:</h2>