From e1d59db30d76cfdf2603aedd719f241ae79c046b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Apr 2018 11:14:22 +0200
Subject: [PATCH] Fonts issues on Windows

---
 customize.dist/pages.js                         | 4 ++++
 customize.dist/src/less2/include/alertify.less  | 2 ++
 customize.dist/src/less2/include/checkmark.less | 2 ++
 www/settings/app-settings.less                  | 1 +
 4 files changed, 9 insertions(+)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 4d20f3775..6fd5d418e 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -671,6 +671,8 @@ define([
             }
         });
 
+        $(input).change(function () { $(mark).focus(); });
+
         return h('label.cp-checkmark', labelOpts, [
             input,
             mark,
@@ -711,6 +713,8 @@ define([
             }
         });
 
+        $(input).change(function () { $(mark).focus(); });
+
         return h('label.cp-radio', labelOpts, [
             input,
             mark,
diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 66e66c791..24c63e570 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -62,6 +62,8 @@
         width: 100%;
         height: 100%;
         z-index: 100000; // alertify container
+        font: @colortheme_app-font;
+
         &.forefront {
             z-index: @max-z-index; // alertify max forefront
         }
diff --git a/customize.dist/src/less2/include/checkmark.less b/customize.dist/src/less2/include/checkmark.less
index fa52f3ec9..adbc70750 100644
--- a/customize.dist/src/less2/include/checkmark.less
+++ b/customize.dist/src/less2/include/checkmark.less
@@ -50,6 +50,7 @@
         }
 
         .cp-checkmark-label {
+            cursor: default;
             &:empty {
                 display: none;
             }
@@ -122,6 +123,7 @@
         }
 
         .cp-checkmark-label {
+            cursor: default;
             &:empty {
                 display: none;
             }
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 6c78318db..a47dd88f6 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -18,6 +18,7 @@
 &.cp-app-settings {
     display: flex;
     flex-flow: column;
+    font: @colortheme_app-font;
     #cp-sidebarlayout-container {
         #cp-sidebarlayout-rightside {
             input[type="checkbox"] {