attempt to fix color picker

css/colors/blue-dark.css

@@ -382,9 +382,7 @@ body.stop-scrolling {
     display: block;
     width: calc(100% - 35px);
 }
-.asColorPicker-dropdown {
-  display: none;
-}
+
 .top-left-part {
     width: auto;
     max-width: 220px;

index.php

@@ -33,7 +33,7 @@
 	<!-- ============================================================== -->
 	<div id="preloader" class="preloader">
 		<svg class="circular" viewbox="25 25 50 50">
-			<circle class="path" cx="50" cy="50" fill="none" r="20" stroke-miterlimit="10" stroke-width="5"></circle>
+			<circle class="path" cx="50" cy="50" fill="none" r="20" stroke-miterlimit="10" stroke-width="10"></circle>
 		</svg>
 	</div>
 	<!-- ============================================================== -->
@@ -45,7 +45,7 @@
 		<!-- ============================================================== -->
 		<nav class="navbar navbar-default navbar-static-top m-b-0">
 			<div class="navbar-header">
-				<div class="top-left-part hidden-xs">
+				<div class="top-left-part hidden-xs p-r-10">
 					<!-- Logo -->
 					 <a class="logo" href="javascript:void(0)"><!-- Logo text image you can use text also -->
 						 <span class="hidden-xs" id="main-logo"></span>
@@ -54,8 +54,8 @@
 				<!-- Search input and Toggle icon -->
 				<ul class="nav navbar-top-links navbar-left">
 					<li><a class="open-close waves-effect waves-light visible-xs" href="javascript:void(0)"><i class="ti-close ti-menu fa-fw"></i></a></li>
-					<li class=""><a class="dropdown-toggle waves-effect waves-light" onclick="reloadCurrentTab();"> <i class="fa fa-refresh fa-fw"></i></a></li>
-					<li class=""><a class="dropdown-toggle waves-effect waves-light" onclick="closeCurrentTab();"> <i class="mdi mdi-close fa-fw"></i></a></li>
+					<li class=""><a class="dropdown-toggle waves-effect waves-light" onclick="reloadCurrentTab();"> <i class="ti-reload"></i></a></li>
+					<li class=""><a class="dropdown-toggle waves-effect waves-light" onclick="closeCurrentTab();"> <i class="ti-close"></i></a></li>
 				</ul>
 				<ul class="nav navbar-top-links navbar-right pull-right"></ul>
 			</div><!-- /.navbar-header -->

js/custom.js

@@ -15,38 +15,39 @@ $(document).ready(function () {
     "use strict";
     var body = $("body");
     $(function () {
+        //$("#preloader").fadeOut();
         var set = function () {
-                var topOffset = 60,
-                    width = (window.innerWidth > 0) ? window.innerWidth : this.screen.width,
-                    height = ((window.innerHeight > 0) ? window.innerHeight : this.screen.height) - 1;
-                if (width < 768) {
-                    $('div.navbar-collapse').addClass('collapse');
-                    topOffset = 100; /* 2-row-menu */
-                } else {
-                    $('div.navbar-collapse').removeClass('collapse');
-                }
+            var topOffset = 60,
+                width = (window.innerWidth > 0) ? window.innerWidth : this.screen.width,
+                height = ((window.innerHeight > 0) ? window.innerHeight : this.screen.height) - 1;
+            if (width < 768) {
+                $('div.navbar-collapse').addClass('collapse');
+                topOffset = 100; /* 2-row-menu */
+            } else {
+                $('div.navbar-collapse').removeClass('collapse');
+            }
 
-                /* ===== This is for resizing window ===== */
+            /* ===== This is for resizing window ===== */
 
-                if (width < 1170) {
-                    body.addClass('content-wrapper');
-                    $(".sidebar-nav, .slimScrollDiv").css("overflow-x", "visible").parent().css("overflow", "visible");
-                } else {
-                    body.removeClass('content-wrapper');
-                }
+            if (width < 1170) {
+                body.addClass('content-wrapper');
+                $(".sidebar-nav, .slimScrollDiv").css("overflow-x", "visible").parent().css("overflow", "visible");
+            } else {
+                body.removeClass('content-wrapper');
+            }
 
-                height = height - topOffset;
-                if (height < 1) {
-                    height = 1;
-                }
-                if (height > topOffset) {
-                    $("#page-wrapper").css("min-height", (height) + "px");
-                }
-            },
-            url = window.location,
-            element = $('ul.nav a').filter(function () {
-                return this.href === url || url.href.indexOf(this.href) === 0;
-            }).addClass('activez').parent().parent().addClass('ok').parent();
+            height = height - topOffset;
+            if (height < 1) {
+                height = 1;
+            }
+            if (height > topOffset) {
+                $("#page-wrapper").css("min-height", (height) + "px");
+            }
+        },
+        url = window.location,
+        element = $('ul.nav a').filter(function () {
+            return this.href === url || url.href.indexOf(this.href) === 0;
+        }).addClass('activez').parent().parent().addClass('ok').parent();
         if (element.is('li')) {
             element.addClass('activezo');
         }
@@ -69,11 +70,10 @@ function pageLoad(){
     "use strict";
     //Start Organizr
     $(function () {
-        $("#preloader").fadeOut();
         $('#side-menu').metisMenu();
     });
     $(".colorpicker").asColorPicker({
-        mode: 'palettes'
+        mode: 'simple'
     });
 
 
@@ -956,7 +956,7 @@ $(document).on("click", ".changeDefaultCategory", function () {
     settingsAPI(post,callbacks);
 });
 // CHANGE CUSTOMIZE Options
-$(document).on('change asColorPicker::change', '#customize-appearance-form :input', function(e) {
+$(document).on('change asColorPicker::close', '#customize-appearance-form :input', function(e) {
 	$(this).attr('data-changed', true);
     switch ($(this).attr('type')) {
         case 'switch':

js/functions.js

@@ -608,7 +608,7 @@ function buildLanguage(replace=false,newLang=null){
 	});
 	var lang = `
 		<li class="dropdown" id="languageDropdown">
-			<a class="dropdown-toggle waves-effect waves-light" data-toggle="dropdown" href="#" aria-expanded="false"> <i class="fa fa-language"></i><span></span></a>
+			<a class="dropdown-toggle waves-effect waves-light" data-toggle="dropdown" href="#" aria-expanded="false"> <i class="fa fa-language fa-lg fa-fw"></i><span></span></a>
 			<ul class="dropdown-menu mailbox animated bounceInDown">
 				<li>
 					<div class="drop-title" lang="en">Choose Language</div>
@@ -779,6 +779,7 @@ function buildLogin(){
 	}).fail(function(xhr) {
 		console.error("Organizr Function: Login Connection Failed");
 	});
+	$("#preloader").fadeOut();
 }
 function buildLockscreen(){
 	closeSideMenu();

js/lazyload.min.js

@@ -0,0 +1,2 @@
+/*! Lazy Load 2.0.0-beta.2 - MIT license - Copyright 2007-2017 Mika Tuupola */
+!function(t,e){"object"==typeof exports?module.exports=e(t):"function"==typeof define&&define.amd?define([],e(t)):t.LazyLoad=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";function e(t,e){this.settings=r(s,e||{}),this.images=t||document.querySelectorAll(this.settings.selector),this.observer=null,this.init()}const s={src:"data-src",srcset:"data-srcset",selector:".lazyload"},r=function(){let t={},e=!1,s=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(e=arguments[0],s++);for(;s<o;s++)!function(s){for(let o in s)Object.prototype.hasOwnProperty.call(s,o)&&(e&&"[object Object]"===Object.prototype.toString.call(s[o])?t[o]=r(!0,t[o],s[o]):t[o]=s[o])}(arguments[s]);return t};if(e.prototype={init:function(){if(!t.IntersectionObserver)return void this.loadImages();let e=this,s={root:null,rootMargin:"0px",threshold:[0]};this.observer=new IntersectionObserver(function(t){t.forEach(function(t){if(t.intersectionRatio>0){e.observer.unobserve(t.target);let s=t.target.getAttribute(e.settings.src),r=t.target.getAttribute(e.settings.srcset);"img"===t.target.tagName.toLowerCase()?(s&&(t.target.src=s),r&&(t.target.srcset=r)):t.target.style.backgroundImage="url("+s+")"}})},s),this.images.forEach(function(t){e.observer.observe(t)})},loadAndDestroy:function(){this.settings&&(this.loadImages(),this.destroy())},loadImages:function(){if(!this.settings)return;let t=this;this.images.forEach(function(e){let s=e.getAttribute(t.settings.src),r=e.getAttribute(t.settings.srcset);"img"===e.tagName.toLowerCase()?(s&&(e.src=s),r&&(e.srcset=r)):e.style.backgroundImage="url("+s+")"})},destroy:function(){this.settings&&(this.observer.disconnect(),this.settings=null)}},t.lazyload=function(t,s){return new e(t,s)},t.jQuery){const s=t.jQuery;s.fn.lazyload=function(t){return t=t||{},t.attribute=t.attribute||"data-src",new e(s.makeArray(this),t),this}}return e});

js/version.json

@@ -19,5 +19,12 @@
         "new": "New Updater Progress Bar",
         "fixed": "Lag Times on updater|Added longer timeouts",
         "notes": "This is alpha - expect bugs|Please report bugs in GitHub issues page"
+    },
+    "2.0.0-alpha.120": {
+        "date":"20180110",
+        "title": "Color Picker Testing",
+        "new": "",
+        "fixed": "Attempt to fix color picker",
+        "notes": "This is alpha - expect bugs|Please report bugs in GitHub issues page"
     }
 }