Merge pull request Dashticz#857 from lokonli/mergeFixes

Merge fixes

css/creative.css

@@ -1536,10 +1536,10 @@ img.icon {
   img.icon {
     max-width: 15px !important;
   }
-  .mh .fas,
-  .mh .far,
-  .mh .fab,
-  .mh .wi {
+  .col-icon .fas,
+  .col-icon .far,
+  .col-icon .fab,
+  .col-icon .wi {
     font-size: 15px !important;
   }
 

docs/releasenotes/releasenotes.rst

@@ -8,6 +8,9 @@ For Dashticz's **master** version Release Notes go to: https://dashticz.readthed
 Recent changes
 ---------------
 
+v3.8.3 Beta (29-5-2021)
+-----------------------
+
 Enhancements
 ~~~~~~~~~~~~
 
@@ -20,6 +23,12 @@ Fixes
 
 * Weather: Changed styling of current weather block (center the three parts)
 * Weather: Fix styling of forecast block for white Dashticz template
+* Merged changes from master v3.8.0.1 and v3.8.0.2
+
+Code
+~~~~~
+
+* Bump Swiper.js from 5.4.5 to 6.4.2
 
 v3.8.2 Beta (24-4-2021)
 -----------------------
@@ -30,11 +39,7 @@ Enhancements
 ~~~~~~~~~~~~
 
 * Rewrite of the weather block. See :ref:`customweather`.
-
-Fixes
-~~~~~~
-
-* Standby: Prevent click to activate a Dashticz block while in standby
+
 
 v3.8.1 Beta (14-4-2021)
 -----------------------
@@ -52,6 +57,24 @@ Enhancements
 
 * Auto slide timer configurable per screen via screen parameter ``auto_slide_page``
 
+* Fix for columns without block parameter
+* Fix for icon size for special blocks on screen width < 975 pixels
+
+v3.8.0.2 Master (14-5-2021)
+---------------------------
+
+Fixes
+~~~~~
+
+* Fix potential error in startup behavior
+
+v3.8.0.1 Master (26-4-2021)
+---------------------------
+
+Fixes
+~~~~~~
+
+* Standby: Prevent click to activate a Dashticz block while in standby
 
 v3.8 Master (9-4-2021)
 ----------------------

index.html

@@ -49,8 +49,8 @@
   <meta name="msapplication-square310x310logo"
     content="img/favicon/largetile.png" />
   <title>Dashticz</title>
-  <script> var _DASHTICZ_VERSION=17;</script>
-  <script src="dist/bundle.js?t=17"></script>
+  <script> var _DASHTICZ_VERSION=18;</script>
+  <script src="dist/bundle.js?t=18"></script>
 
 </head>
 

index2.html

@@ -50,8 +50,8 @@
   <meta name="msapplication-square310x310logo"
     content="img/favicon/largetile.png" />
   <title>Dashticz</title>
-  <script> var _DASHTICZ_VERSION=17;</script>
-  <script src="dist/bundle.js?t=17"></script>
+  <script> var _DASHTICZ_VERSION=18;</script>
+  <script src="dist/bundle.js?t=18"></script>
 
 </head>
 

js/debug.js

@@ -1,4 +1,4 @@
-//# sourceURL=js/components/debug.js
+//# sourceURL=js/debug.js
 /* global TemplateEngine*/
 
 var Debug = (function () {
@@ -19,11 +19,16 @@ var Debug = (function () {
     INFO: 0,
     REQUEST: 1,
     ERROR: 2,
-    CONFIG: 3
+    CONFIG: 3,
   };
 
   function init() {
-    templateEngine.load('debug').then(function (template) {
+    $('body').on('click', '.logo', function () {
+      $el.modal({
+        show: true,
+      });
+    });
+    return templateEngine.load('debug').then(function (template) {
       var data = {};
       $('body').append(template(data));
       $el = $('#modal-debug');
@@ -35,73 +40,72 @@ var Debug = (function () {
       $el.on('show.bs.modal', function () {
         visible = true;
         createDebug();
-      })
+      });
       $el.on('hide.bs.modal', function () {
-        visible=false;
-      })
-
-    });
-    $('body').on('click', '.logo', function () {
-      $el.modal({
-        show: true,
+        visible = false;
       });
     });
   }
 
   function createDebug() {
-      var html = messages.reduce(function(acc, msg) {
-          return acc + (msg.type===Debug.REQUEST?'':renderDebugRow(msg));
-      },'');
-      $elbody.html(html);
-      updateStatus();
+    var html = messages.reduce(function (acc, msg) {
+      return acc + (msg.type === Debug.REQUEST ? '' : renderDebugRow(msg));
+    }, '');
+    $elbody.html(html);
+    updateStatus();
   }
 
   function renderDebugRow(msg) {
-    return '<div>'+msg.timestamp.toISOString().slice(11, 23)+': ' + msg.msg + '</div>'
+    return (
+      '<div>' +
+      msg.timestamp.toISOString().slice(11, 23) +
+      ': ' +
+      msg.msg +
+      '</div>'
+    );
   }
 
   function add(item) {
     messages.push(item);
-    if (item.type===Debug.REQUEST) {
+    if (item.type === Debug.REQUEST) {
       lastRequest = item;
-      requestCount +=1;
+      requestCount += 1;
       updateStatus();
       return;
     }
 
-    if(visible) {
-        $elbody.append(renderDebugRow(item));
-        updateStatus();
+    if (visible) {
+      $elbody.append(renderDebugRow(item));
+      updateStatus();
     }
-    if(messages.length>1000) {
-        messages.splice(0,1);
-        if(visible)
-            $elbody.find(":first-child").remove();
+    if (messages.length > 1000) {
+      messages.splice(0, 1);
+      if (visible) $elbody.find(':first-child').remove();
     }
   }
 
   function updateStatus() {
-    $el.find('.debug-status').html(requestCount+': '+lastRequest.msg);
+    $el.find('.debug-status').html(requestCount + ': ' + lastRequest.msg);
   }
 
   function log() {
     var msg;
-    var start=0;
-    var type=0;
-    if (arguments.length>1 && typeof arguments[0]==='number') {
-        type = arguments[0];
-        start=1;
+    var start = 0;
+    var type = 0;
+    if (arguments.length > 1 && typeof arguments[0] === 'number') {
+      type = arguments[0];
+      start = 1;
     }
     for (var i = start; i < arguments.length; i++) {
       var arg = arguments[i];
       var str = typeof arg === 'object' ? JSON.stringify(arg) : arg;
       msg = (msg ? msg + ' ' : '') + str;
     }
     var item = {
-        timestamp: new Date(),
-        msg: msg,
-        type: type
-    }
-    add(item);    
+      timestamp: new Date(),
+      msg: msg,
+      type: type,
+    };
+    add(item);
   }
 })();