Merge branch 'dev'

Flynntes · Oct 3, 2019 · 4f7c05f · 4f7c05f
2 parents 54120f9 + 9b9ebcd
commit 4f7c05f
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 1,169 deletions.
diff --git a/sleeky-backend/assets/css/_base.scss b/sleeky-backend/assets/css/_base.scss
@@ -70,21 +70,16 @@ input {
  @if ($theme == "light") {
  border-radius: 3px !important;
  }
-
- // @if (lightness($light) > 40) {
- // color: red !important;
- // }
- // @else {
- // color: blue !important;
- // }
 }
 
 input.button,
-input.submit {
+input.submit,
+input[type="submit"] {
  border-left: 7px solid $accent !important;
  background: $light !important;
  font-weight: 600;
  transition: 0.3s all !important;
+ cursor: pointer;
 
  @if ($theme == "light") {
  background: $accent !important;
@@ -96,20 +91,23 @@ input.submit {
 
 // Need to fix this, because I've had to copy this down lower to make it apply to the add URL button
 input.button:hover,
-input.submit:hover {
+input.submit:hover,
+input[type="submit"]:hover {
  background: darken($accent, 15%) !important;
 
  @if ($theme == "light") {
  background: darken($accent, 15%) !important;
  }
 }
 
-input[type="button"]:disabled {
+input[type="button"]:disabled,
+input[type="submit"]:disabled {
  cursor: not-allowed;
 }
 
-input.text {
- border: 1px solid transparent !important;
+input.text,
+input[type="text"] {
+ border: 1px solid rgba(255, 255, 255, 0.25) !important;
  transition: 0.4s all;
 }
 
@@ -197,7 +195,7 @@ select:hover {
  font-weight: 600;
  }
 
- img {
+ .login-logo {
  width: 150px;
  margin: 30px auto;
  display: flex;
@@ -549,7 +547,7 @@ header {
 //
 // Information
 // 
-.infos {
+#wrap {
  #tabs {
  min-width: 580px;
 
@@ -685,7 +683,8 @@ div.share {
 
 .sub_wrap,
 .plugins main,
-.plugin_page_sleeky_settings main {
+.plugin_page_sleeky_settings main,
+code {
  background: $default;
  padding: 10px;
  padding: 5px 25px;

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
@@ -1,8 +1,5 @@
 // Sleeky Admin Theme
-// 2018 Flynn Tesoriero
-
-// TODO
-// Add theme URL config option (sleeky-backend)
+// 2019 Flynn Tesoriero
 
 console.log("Sleeky Admin Theme Running");
 
@@ -38,9 +35,9 @@ $( document ).ready(function() {
  console.log("Login page");
 
  if (theme == "light") {
- $("#login").prepend(`<img src="${url}/assets/img/logo_black.png">`);
+ $("#login").prepend(`<img class="login-logo" src="${url}/assets/img/logo_black.png">`);
  } else if (theme == "dark") {
- $("#login").prepend(`<img src="${url}/assets/img/logo_white.png">`);
+ $("#login").prepend(`<img class="login-logo" src="${url}/assets/img/logo_white.png">`);
  }
 
 
@@ -50,9 +47,6 @@ $( document ).ready(function() {
 
  handleNav()
 
- // Add content padding to suit new URL section
- // $("#wrap").css("padding-top", "50px");
-
  // Hide YOURLS new URL section
  $("#new_url").hide();
 
@@ -103,10 +97,10 @@ $( document ).ready(function() {
  for (let i = 0; i < 3; i++) {
  $($('#headers > li')[i]).find('h2').text(titles[i]);
  }
-
- // console.log();
  } else {
- console.warn("Unknown page")
+ console.warn("Unknown page");
+
+ handleNav();
  }
 
  function handleNav() {

diff --git a/sleeky-backend/plugin.php b/sleeky-backend/plugin.php
@@ -3,7 +3,7 @@
 Plugin Name: Sleeky Backend
 Plugin URI: https://sleeky.flynntes.com
 Description: UI overhaul of the YOURLS backend
-Version: 3.0
+Version: 2.2.1
 Author: Flynn Tesoriero
 Author URI: https://flynntes.com
 */