From d3f2398865f15f3f68cec20f97eaa449ddafec62 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Tue, 8 Aug 2017 16:19:44 +0200
Subject: [PATCH 01/22] bump tippy to 1.2.0, add dynamicTitle option
---
www/common/common-interface.js | 1 +
www/common/tippy.css | 2 +-
www/common/tippy.min.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index d7d0b46d6..83389b816 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -313,6 +313,7 @@ define([
position: 'bottom',
distance: 0,
performance: true,
+ dynamicTitle: true,
delay: [delay, 0]
});
};
diff --git a/www/common/tippy.css b/www/common/tippy.css
index 9e4527a03..bb3a28650 100644
--- a/www/common/tippy.css
+++ b/www/common/tippy.css
@@ -1 +1 @@
-.tippy-touch{cursor:pointer!important}.tippy-notransition{-webkit-transition:none!important;transition:none!important}.tippy-popper{max-width:400px;-webkit-perspective:800px;perspective:800px;z-index:9999;outline:0;-webkit-transition-timing-function:cubic-bezier(.165,.84,.44,1);transition-timing-function:cubic-bezier(.165,.84,.44,1)}.tippy-popper.html-template{max-width:96%;max-width:calc(100% - 20px)}.tippy-popper[x-placement^=top] [x-arrow]{border-top:7px solid #333;border-right:7px solid transparent;border-left:7px solid transparent;bottom:-7px;margin:0 9px}.tippy-popper[x-placement^=top] [x-arrow].arrow-small{border-top:5px solid #333;border-right:5px solid transparent;border-left:5px solid transparent;bottom:-5px}.tippy-popper[x-placement^=top] [x-arrow].arrow-big{border-top:10px solid #333;border-right:10px solid transparent;border-left:10px solid transparent;bottom:-10px}.tippy-popper[x-placement^=top] [x-circle]{-webkit-transform-origin:0 33%;transform-origin:0 33%}.tippy-popper[x-placement^=top] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-55%);transform:scale(1) translate(-50%,-55%);opacity:1}.tippy-popper[x-placement^=top] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-50%);transform:scale(.15) translate(-50%,-50%);opacity:0}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow]{border-top:7px solid #fff;border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-top:5px solid #fff;border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-top:10px solid #fff;border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow]{border-top:7px solid rgba(0,0,0,.7);border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-top:5px solid rgba(0,0,0,.7);border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-top:10px solid rgba(0,0,0,.7);border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=top] [data-animation=perspective]{-webkit-transform-origin:bottom;transform-origin:bottom}.tippy-popper[x-placement^=top] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateY(-10px) rotateX(0);transform:translateY(-10px) rotateX(0)}.tippy-popper[x-placement^=top] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateY(0) rotateX(90deg);transform:translateY(0) rotateX(90deg)}.tippy-popper[x-placement^=top] [data-animation=fade].enter{opacity:1;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=fade].leave{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=shift].enter{opacity:1;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=shift].leave{opacity:0;-webkit-transform:translateY(0);transform:translateY(0)}.tippy-popper[x-placement^=top] [data-animation=scale].enter{opacity:1;-webkit-transform:translateY(-10px) scale(1);transform:translateY(-10px) scale(1)}.tippy-popper[x-placement^=top] [data-animation=scale].leave{opacity:0;-webkit-transform:translateY(0) scale(0);transform:translateY(0) scale(0)}.tippy-popper[x-placement^=bottom] [x-arrow]{border-bottom:7px solid #333;border-right:7px solid transparent;border-left:7px solid transparent;top:-7px;margin:0 9px}.tippy-popper[x-placement^=bottom] [x-arrow].arrow-small{border-bottom:5px solid #333;border-right:5px solid transparent;border-left:5px solid transparent;top:-5px}.tippy-popper[x-placement^=bottom] [x-arrow].arrow-big{border-bottom:10px solid #333;border-right:10px solid transparent;border-left:10px solid transparent;top:-10px}.tippy-popper[x-placement^=bottom] [x-circle]{-webkit-transform-origin:0 -50%;transform-origin:0 -50%}.tippy-popper[x-placement^=bottom] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-45%);transform:scale(1) translate(-50%,-45%);opacity:1}.tippy-popper[x-placement^=bottom] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-5%);transform:scale(.15) translate(-50%,-5%);opacity:0}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow]{border-bottom:7px solid #fff;border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-bottom:5px solid #fff;border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-bottom:10px solid #fff;border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow]{border-bottom:7px solid rgba(0,0,0,.7);border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-bottom:5px solid rgba(0,0,0,.7);border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-bottom:10px solid rgba(0,0,0,.7);border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=bottom] [data-animation=perspective]{-webkit-transform-origin:top;transform-origin:top}.tippy-popper[x-placement^=bottom] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateY(10px) rotateX(0);transform:translateY(10px) rotateX(0)}.tippy-popper[x-placement^=bottom] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateY(0) rotateX(-90deg);transform:translateY(0) rotateX(-90deg)}.tippy-popper[x-placement^=bottom] [data-animation=fade].enter{opacity:1;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=fade].leave{opacity:0;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=shift].enter{opacity:1;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=shift].leave{opacity:0;-webkit-transform:translateY(0);transform:translateY(0)}.tippy-popper[x-placement^=bottom] [data-animation=scale].enter{opacity:1;-webkit-transform:translateY(10px) scale(1);transform:translateY(10px) scale(1)}.tippy-popper[x-placement^=bottom] [data-animation=scale].leave{opacity:0;-webkit-transform:translateY(0) scale(0);transform:translateY(0) scale(0)}.tippy-popper[x-placement^=left] [x-arrow]{border-left:7px solid #333;border-top:7px solid transparent;border-bottom:7px solid transparent;right:-7px;margin:6px 0}.tippy-popper[x-placement^=left] [x-arrow].arrow-small{border-left:5px solid #333;border-top:5px solid transparent;border-bottom:5px solid transparent;right:-5px}.tippy-popper[x-placement^=left] [x-arrow].arrow-big{border-left:10px solid #333;border-top:10px solid transparent;border-bottom:10px solid transparent;right:-10px}.tippy-popper[x-placement^=left] [x-circle]{-webkit-transform-origin:50% 0;transform-origin:50% 0}.tippy-popper[x-placement^=left] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%);opacity:1}.tippy-popper[x-placement^=left] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-50%);transform:scale(.15) translate(-50%,-50%);opacity:0}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow]{border-left:7px solid #fff;border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-left:5px solid #fff;border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-left:10px solid #fff;border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow]{border-left:7px solid rgba(0,0,0,.7);border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-left:5px solid rgba(0,0,0,.7);border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-left:10px solid rgba(0,0,0,.7);border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=left] [data-animation=perspective]{-webkit-transform-origin:right;transform-origin:right}.tippy-popper[x-placement^=left] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateX(-10px) rotateY(0);transform:translateX(-10px) rotateY(0)}.tippy-popper[x-placement^=left] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateX(0) rotateY(-90deg);transform:translateX(0) rotateY(-90deg)}.tippy-popper[x-placement^=left] [data-animation=fade].enter{opacity:1;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=fade].leave{opacity:0;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=shift].enter{opacity:1;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=shift].leave{opacity:0;-webkit-transform:translateX(0);transform:translateX(0)}.tippy-popper[x-placement^=left] [data-animation=scale].enter{opacity:1;-webkit-transform:translateX(-10px) scale(1);transform:translateX(-10px) scale(1)}.tippy-popper[x-placement^=left] [data-animation=scale].leave{opacity:0;-webkit-transform:translateX(0) scale(0);transform:translateX(0) scale(0)}.tippy-popper[x-placement^=right] [x-arrow]{border-right:7px solid #333;border-top:7px solid transparent;border-bottom:7px solid transparent;left:-7px;margin:6px 0}.tippy-popper[x-placement^=right] [x-arrow].arrow-small{border-right:5px solid #333;border-top:5px solid transparent;border-bottom:5px solid transparent;left:-5px}.tippy-popper[x-placement^=right] [x-arrow].arrow-big{border-right:10px solid #333;border-top:10px solid transparent;border-bottom:10px solid transparent;left:-10px}.tippy-popper[x-placement^=right] [x-circle]{-webkit-transform-origin:-50% 0;transform-origin:-50% 0}.tippy-popper[x-placement^=right] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%);opacity:1}.tippy-popper[x-placement^=right] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-50%);transform:scale(.15) translate(-50%,-50%);opacity:0}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow]{border-right:7px solid #fff;border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-right:5px solid #fff;border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-right:10px solid #fff;border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow]{border-right:7px solid rgba(0,0,0,.7);border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-right:5px solid rgba(0,0,0,.7);border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-right:10px solid rgba(0,0,0,.7);border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=right] [data-animation=perspective]{-webkit-transform-origin:left;transform-origin:left}.tippy-popper[x-placement^=right] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateX(10px) rotateY(0);transform:translateX(10px) rotateY(0)}.tippy-popper[x-placement^=right] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateX(0) rotateY(90deg);transform:translateX(0) rotateY(90deg)}.tippy-popper[x-placement^=right] [data-animation=fade].enter{opacity:1;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=fade].leave{opacity:0;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=shift].enter{opacity:1;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=shift].leave{opacity:0;-webkit-transform:translateX(0);transform:translateX(0)}.tippy-popper[x-placement^=right] [data-animation=scale].enter{opacity:1;-webkit-transform:translateX(10px) scale(1);transform:translateX(10px) scale(1)}.tippy-popper[x-placement^=right] [data-animation=scale].leave{opacity:0;-webkit-transform:translateX(0) scale(0);transform:translateX(0) scale(0)}.tippy-popper .tippy-tooltip.transparent-theme{background-color:rgba(0,0,0,.7)}.tippy-popper .tippy-tooltip.transparent-theme[data-animatefill]{background-color:transparent}.tippy-popper .tippy-tooltip.light-theme{color:#26323d;box-shadow:0 4px 20px 4px rgba(0,20,60,.1),0 4px 80px -8px rgba(0,20,60,.2);background-color:#fff}.tippy-popper .tippy-tooltip.light-theme[data-animatefill]{background-color:transparent}.tippy-tooltip{position:relative;color:#fff;border-radius:4px;font-size:.95rem;padding:.4rem .8rem;text-align:center;will-change:transform;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-color:#333;pointer-events:none}.tippy-tooltip--small{padding:.25rem .5rem;font-size:.8rem}.tippy-tooltip--big{padding:.6rem 1.2rem;font-size:1.2rem}.tippy-tooltip[data-animatefill]{overflow:hidden;background-color:transparent}.tippy-tooltip[data-interactive]{pointer-events:auto}.tippy-tooltip[data-inertia]{-webkit-transition-timing-function:cubic-bezier(.53,1,.36,.85);transition-timing-function:cubic-bezier(.53,2,.36,.85)}.tippy-tooltip [x-arrow]{position:absolute;width:0;height:0}.tippy-tooltip [x-circle]{position:absolute;will-change:transform;background-color:#333;border-radius:50%;width:130%;width:calc(110% + 2rem);left:50%;top:50%;z-index:-1;overflow:hidden;-webkit-transition:all ease;transition:all ease}.tippy-tooltip [x-circle]:before{content:"";padding-top:90%;float:left}@media (max-width:450px){.tippy-popper{max-width:96%;max-width:calc(100% - 20px)}}
\ No newline at end of file
+.tippy-touch{cursor:pointer!important}.tippy-notransition{transition:none!important}.tippy-popper{max-width:400px;-webkit-perspective:800px;perspective:800px;z-index:9999;outline:0;transition-timing-function:cubic-bezier(.165,.84,.44,1);pointer-events:none}.tippy-popper.html-template{max-width:96%;max-width:calc(100% - 20px)}.tippy-popper[x-placement^=top] [x-arrow]{border-top:7px solid #333;border-right:7px solid transparent;border-left:7px solid transparent;bottom:-7px;margin:0 9px}.tippy-popper[x-placement^=top] [x-arrow].arrow-small{border-top:5px solid #333;border-right:5px solid transparent;border-left:5px solid transparent;bottom:-5px}.tippy-popper[x-placement^=top] [x-arrow].arrow-big{border-top:10px solid #333;border-right:10px solid transparent;border-left:10px solid transparent;bottom:-10px}.tippy-popper[x-placement^=top] [x-circle]{-webkit-transform-origin:0 33%;transform-origin:0 33%}.tippy-popper[x-placement^=top] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-55%);transform:scale(1) translate(-50%,-55%);opacity:1}.tippy-popper[x-placement^=top] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-50%);transform:scale(.15) translate(-50%,-50%);opacity:0}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow]{border-top:7px solid #fff;border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-top:5px solid #fff;border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-top:10px solid #fff;border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow]{border-top:7px solid rgba(0,0,0,.7);border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-top:5px solid rgba(0,0,0,.7);border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-top:10px solid rgba(0,0,0,.7);border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=top] [data-animation=perspective]{-webkit-transform-origin:bottom;transform-origin:bottom}.tippy-popper[x-placement^=top] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateY(-10px) rotateX(0);transform:translateY(-10px) rotateX(0)}.tippy-popper[x-placement^=top] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateY(0) rotateX(90deg);transform:translateY(0) rotateX(90deg)}.tippy-popper[x-placement^=top] [data-animation=fade].enter{opacity:1;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=fade].leave{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=shift].enter{opacity:1;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=shift].leave{opacity:0;-webkit-transform:translateY(0);transform:translateY(0)}.tippy-popper[x-placement^=top] [data-animation=scale].enter{opacity:1;-webkit-transform:translateY(-10px) scale(1);transform:translateY(-10px) scale(1)}.tippy-popper[x-placement^=top] [data-animation=scale].leave{opacity:0;-webkit-transform:translateY(0) scale(0);transform:translateY(0) scale(0)}.tippy-popper[x-placement^=bottom] [x-arrow]{border-bottom:7px solid #333;border-right:7px solid transparent;border-left:7px solid transparent;top:-7px;margin:0 9px}.tippy-popper[x-placement^=bottom] [x-arrow].arrow-small{border-bottom:5px solid #333;border-right:5px solid transparent;border-left:5px solid transparent;top:-5px}.tippy-popper[x-placement^=bottom] [x-arrow].arrow-big{border-bottom:10px solid #333;border-right:10px solid transparent;border-left:10px solid transparent;top:-10px}.tippy-popper[x-placement^=bottom] [x-circle]{-webkit-transform-origin:0 -50%;transform-origin:0 -50%}.tippy-popper[x-placement^=bottom] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-45%);transform:scale(1) translate(-50%,-45%);opacity:1}.tippy-popper[x-placement^=bottom] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-5%);transform:scale(.15) translate(-50%,-5%);opacity:0}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow]{border-bottom:7px solid #fff;border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-bottom:5px solid #fff;border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-bottom:10px solid #fff;border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow]{border-bottom:7px solid rgba(0,0,0,.7);border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-bottom:5px solid rgba(0,0,0,.7);border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-bottom:10px solid rgba(0,0,0,.7);border-right:10px solid transparent;border-left:10px solid transparent}.tippy-popper[x-placement^=bottom] [data-animation=perspective]{-webkit-transform-origin:top;transform-origin:top}.tippy-popper[x-placement^=bottom] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateY(10px) rotateX(0);transform:translateY(10px) rotateX(0)}.tippy-popper[x-placement^=bottom] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateY(0) rotateX(-90deg);transform:translateY(0) rotateX(-90deg)}.tippy-popper[x-placement^=bottom] [data-animation=fade].enter{opacity:1;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=fade].leave{opacity:0;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=shift].enter{opacity:1;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=shift].leave{opacity:0;-webkit-transform:translateY(0);transform:translateY(0)}.tippy-popper[x-placement^=bottom] [data-animation=scale].enter{opacity:1;-webkit-transform:translateY(10px) scale(1);transform:translateY(10px) scale(1)}.tippy-popper[x-placement^=bottom] [data-animation=scale].leave{opacity:0;-webkit-transform:translateY(0) scale(0);transform:translateY(0) scale(0)}.tippy-popper[x-placement^=left] [x-arrow]{border-left:7px solid #333;border-top:7px solid transparent;border-bottom:7px solid transparent;right:-7px;margin:6px 0}.tippy-popper[x-placement^=left] [x-arrow].arrow-small{border-left:5px solid #333;border-top:5px solid transparent;border-bottom:5px solid transparent;right:-5px}.tippy-popper[x-placement^=left] [x-arrow].arrow-big{border-left:10px solid #333;border-top:10px solid transparent;border-bottom:10px solid transparent;right:-10px}.tippy-popper[x-placement^=left] [x-circle]{-webkit-transform-origin:50% 0;transform-origin:50% 0}.tippy-popper[x-placement^=left] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%);opacity:1}.tippy-popper[x-placement^=left] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-50%);transform:scale(.15) translate(-50%,-50%);opacity:0}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow]{border-left:7px solid #fff;border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-left:5px solid #fff;border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-left:10px solid #fff;border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow]{border-left:7px solid rgba(0,0,0,.7);border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-left:5px solid rgba(0,0,0,.7);border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-left:10px solid rgba(0,0,0,.7);border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=left] [data-animation=perspective]{-webkit-transform-origin:right;transform-origin:right}.tippy-popper[x-placement^=left] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateX(-10px) rotateY(0);transform:translateX(-10px) rotateY(0)}.tippy-popper[x-placement^=left] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateX(0) rotateY(-90deg);transform:translateX(0) rotateY(-90deg)}.tippy-popper[x-placement^=left] [data-animation=fade].enter{opacity:1;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=fade].leave{opacity:0;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=shift].enter{opacity:1;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=shift].leave{opacity:0;-webkit-transform:translateX(0);transform:translateX(0)}.tippy-popper[x-placement^=left] [data-animation=scale].enter{opacity:1;-webkit-transform:translateX(-10px) scale(1);transform:translateX(-10px) scale(1)}.tippy-popper[x-placement^=left] [data-animation=scale].leave{opacity:0;-webkit-transform:translateX(0) scale(0);transform:translateX(0) scale(0)}.tippy-popper[x-placement^=right] [x-arrow]{border-right:7px solid #333;border-top:7px solid transparent;border-bottom:7px solid transparent;left:-7px;margin:6px 0}.tippy-popper[x-placement^=right] [x-arrow].arrow-small{border-right:5px solid #333;border-top:5px solid transparent;border-bottom:5px solid transparent;left:-5px}.tippy-popper[x-placement^=right] [x-arrow].arrow-big{border-right:10px solid #333;border-top:10px solid transparent;border-bottom:10px solid transparent;left:-10px}.tippy-popper[x-placement^=right] [x-circle]{-webkit-transform-origin:-50% 0;transform-origin:-50% 0}.tippy-popper[x-placement^=right] [x-circle].enter{-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%);opacity:1}.tippy-popper[x-placement^=right] [x-circle].leave{-webkit-transform:scale(.15) translate(-50%,-50%);transform:scale(.15) translate(-50%,-50%);opacity:0}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow]{border-right:7px solid #fff;border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-right:5px solid #fff;border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-right:10px solid #fff;border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow]{border-right:7px solid rgba(0,0,0,.7);border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-right:5px solid rgba(0,0,0,.7);border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-right:10px solid rgba(0,0,0,.7);border-top:10px solid transparent;border-bottom:10px solid transparent}.tippy-popper[x-placement^=right] [data-animation=perspective]{-webkit-transform-origin:left;transform-origin:left}.tippy-popper[x-placement^=right] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateX(10px) rotateY(0);transform:translateX(10px) rotateY(0)}.tippy-popper[x-placement^=right] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateX(0) rotateY(90deg);transform:translateX(0) rotateY(90deg)}.tippy-popper[x-placement^=right] [data-animation=fade].enter{opacity:1;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=fade].leave{opacity:0;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=shift].enter{opacity:1;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=shift].leave{opacity:0;-webkit-transform:translateX(0);transform:translateX(0)}.tippy-popper[x-placement^=right] [data-animation=scale].enter{opacity:1;-webkit-transform:translateX(10px) scale(1);transform:translateX(10px) scale(1)}.tippy-popper[x-placement^=right] [data-animation=scale].leave{opacity:0;-webkit-transform:translateX(0) scale(0);transform:translateX(0) scale(0)}.tippy-popper .tippy-tooltip.transparent-theme{background-color:rgba(0,0,0,.7)}.tippy-popper .tippy-tooltip.transparent-theme[data-animatefill]{background-color:transparent}.tippy-popper .tippy-tooltip.light-theme{color:#26323d;box-shadow:0 4px 20px 4px rgba(0,20,60,.1),0 4px 80px -8px rgba(0,20,60,.2);background-color:#fff}.tippy-popper .tippy-tooltip.light-theme[data-animatefill]{background-color:transparent}.tippy-tooltip{position:relative;color:#fff;border-radius:4px;font-size:.95rem;padding:.4rem .8rem;text-align:center;will-change:transform;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-color:#333}.tippy-tooltip--small{padding:.25rem .5rem;font-size:.8rem}.tippy-tooltip--big{padding:.6rem 1.2rem;font-size:1.2rem}.tippy-tooltip[data-animatefill]{overflow:hidden;background-color:transparent}.tippy-tooltip[data-interactive]{pointer-events:auto}.tippy-tooltip[data-inertia]{transition-timing-function:cubic-bezier(.53,2,.36,.85)}.tippy-tooltip [x-arrow]{position:absolute;width:0;height:0}.tippy-tooltip [x-circle]{position:absolute;will-change:transform;background-color:#333;border-radius:50%;width:130%;width:calc(110% + 2rem);left:50%;top:50%;z-index:-1;overflow:hidden;transition:all ease}.tippy-tooltip [x-circle]:before{content:"";padding-top:90%;float:left}@media (max-width:450px){.tippy-popper{max-width:96%;max-width:calc(100% - 20px)}}
\ No newline at end of file
diff --git a/www/common/tippy.min.js b/www/common/tippy.min.js
index 431ed33a5..302888e9c 100644
--- a/www/common/tippy.min.js
+++ b/www/common/tippy.min.js
@@ -1 +1 @@
-(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.tippy=t()})(this,function(){'use strict';function e(e){Pe.forEach(function(t){var o=t.popper,i=t.tippyInstance,n=t.settings,r=n.appendTo,s=n.hideOnClick,a=n.trigger;if(r.contains(o)){var p=!0===s||-1!==a.indexOf('focus'),l=!e||o!==e.popper;p&&l&&i.hide(o)}})}function t(e,t){var o=Element.prototype.closest||function(e){for(var t=this;t;){if(Ie.call(t,e))return t;t=t.parentElement}};return o.call(e,t)}function o(e,t){return Array.prototype.find?e.find(t):e.filter(t)[0]}function n(){var i=function(){xe.touch=!0,xe.iOS()&&document.body.classList.add('tippy-touch'),xe.dynamicInputDetection&&document.addEventListener('mousemove',n)},n=function(){var e;return function(){var t=performance&&performance.now();t&&10>t-e&&(xe.touch=!1,document.removeEventListener('mousemove',n),!xe.iOS()&&document.body.classList.contains('tippy-touch')&&document.body.classList.remove('tippy-touch')),e=t}}();document.addEventListener('click',function(i){if(!(i.target instanceof Element))return e();var n=t(i.target,Ce.TOOLTIPPED_EL),r=t(i.target,Ce.POPPER);if(r){var s=o(Pe,function(e){return e.popper===r}),a=s.settings.interactive;if(a)return}if(n){var p=o(Pe,function(e){return e.el===n}),l=p.settings,d=l.hideOnClick,c=l.multiple,f=l.trigger;if(!c&&xe.touch||!c&&-1!==f.indexOf('click'))return e(p);if(!0!==d||-1!==f.indexOf('click'))return}t(i.target,Ce.CONTROLLER)||!document.querySelector(Ce.POPPER)||e()}),document.addEventListener('touchstart',i),window.addEventListener('blur',function(){var e=document,t=e.activeElement;t&&t.blur&&Ie.call(t,Ce.TOOLTIPPED_EL)&&t.blur()}),!xe.SUPPORTS_TOUCH&&(0m&&(e=m-f-2*d),0>h-f-d+p&&(e=f)),s.style[a('transform')]='translate3d('+e+'px, '+i+'px, 0)'}function y(e){return e instanceof Element||/Element/.test(Object.prototype.toString.call(e))?[e]:[].slice.call(document.querySelectorAll(e))}function v(e,t,o){if(!t)return o();var i=e.popper.querySelector(Ce.TOOLTIP),n=!1,r=function t(r){r.target!==i||(n=!0,i.removeEventListener('webkitTransitionEnd',t),i.removeEventListener('transitionend',t),o())};i.addEventListener('webkitTransitionEnd',r),i.addEventListener('transitionend',r),clearTimeout(e._transitionendTimeout),e._transitionendTimeout=setTimeout(function(){n||o()},t)}function E(e){return e&&'[object Function]'==={}.toString.call(e)}function O(e,t){if(1!==e.nodeType)return[];var o=window.getComputedStyle(e,null);return t?o[t]:o}function w(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function L(e){if(!e||-1!==['HTML','BODY','#document'].indexOf(e.nodeName))return window.document.body;var t=O(e),o=t.overflow,i=t.overflowX,n=t.overflowY;return /(auto|scroll)/.test(o+n+i)?e:L(w(e))}function T(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||e.firstElementChild.offsetParent===e)}function S(e){return null===e.parentNode?e:S(e.parentNode)}function P(e){var t=e&&e.offsetParent,o=t&&t.nodeName;return o&&'BODY'!==o&&'HTML'!==o?t:window.document.documentElement}function x(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return window.document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,i=o?e:t,n=o?t:e,r=document.createRange();r.setStart(i,0),r.setEnd(n,0);var s=r.commonAncestorContainer;if(e!==s&&t!==s||i.contains(n))return T(s)?s:P(s);var a=S(e);return a.host?x(a.host,t):x(e,S(t).host)}function C(e){var t=1=o.clientWidth&&i>=o.clientHeight}),d=0r,bottom:n-a.bottom>r,left:a.left-i>r,right:i-a.right>r};return'top'===p?d.top=a.top-n>l:'bottom'===p?d.bottom=n-a.bottom>l:'left'===p?d.left=a.left-i>l:'right'===p?d.right=i-a.right>l:void 0,d.top||d.bottom||d.left||d.right}function ve(e,o,i){var n,r,s=this,a=i.position,p=i.delay,l=i.duration,d=i.interactive,c=i.interactiveBorder,f=i.distance,m=i.hideOnClick,u=i.trigger,g=i.touchHold,b=i.touchWait,y=function(){clearTimeout(n),clearTimeout(r)},v=function(){if(y(),!h(o)){var e=Array.isArray(p)?p[0]:p;p?n=setTimeout(function(){return s.show(o)},e):s.show(o)}},E=function(e){return s.callbacks.wait?s.callbacks.wait.call(o,v,e):v()},O=function(){y();var e=Array.isArray(p)?p[1]:p;p?r=setTimeout(function(){return s.hide(o)},e):s.hide(o)};return{handleTrigger:function(t){var i='mouseenter'===t.type&&xe.SUPPORTS_TOUCH&&xe.touch;if(!(i&&g)){var n='click'===t.type;n&&h(o)&&'persistent'!==m?O():E(t),i&&xe.iOS()&&e.click&&e.click()}},handleMouseleave:function(n){if(!('mouseleave'===n.type&&xe.SUPPORTS_TOUCH&&xe.touch&&g)){if(d){var r=function n(r){var s=function(){document.body.removeEventListener('mouseleave',O),document.removeEventListener('mousemove',n),O()},a=t(r.target,Ce.TOOLTIPPED_EL),p=t(r.target,Ce.POPPER)===o,l=-1!==u.indexOf('click');return a&&a!==e?s():void(p||a===e||l||ye(r,o,i)&&s())};return document.body.addEventListener('mouseleave',O),void document.addEventListener('mousemove',r)}O()}},handleBlur:function(e){!e.relatedTarget||xe.touch||t(e.relatedTarget,Ce.POPPER)||O()}}}function Ee(e){var t=this;return e.reduce(function(e,o){var i=t.settings.performance?t.settings:ue(o,t.settings);i.arrow&&(i.animateFill=!1);var n=i.html,r=i.trigger,s=i.touchHold,a=o.getAttribute('title');if(!a&&!n)return e;var p=Ze;o.setAttribute('data-tooltipped',''),o.setAttribute('aria-describedby','tippy-tooltip-'+p),l(o);var d=ge(p,a,i),c=ve.call(t,o,d,i),f=[];return r.trim().split(' ').forEach(function(e){return f=f.concat(be(e,o,c,s))}),e.push({id:p,el:o,popper:d,settings:i,listeners:f,tippyInstance:t}),Ze++,e},[])}function Oe(e,t){return new $e(e,t)}var we=Math.min,Le=Math.floor,Te=Math.max,Se=Math.round,xe={};'undefined'!=typeof window&&(xe.SUPPORTED='requestAnimationFrame'in window,xe.SUPPORTS_TOUCH='ontouchstart'in window,xe.touch=!1,xe.dynamicInputDetection=!0,xe.iOS=function(){return /iPhone|iPad|iPod/.test(navigator.userAgent)&&!window.MSStream});for(var Pe=[],Ce={POPPER:'.tippy-popper',TOOLTIP:'.tippy-tooltip',CONTENT:'.tippy-tooltip-content',CIRCLE:'[x-circle]',ARROW:'[x-arrow]',TOOLTIPPED_EL:'[data-tooltipped]',CONTROLLER:'[data-tippy-controller]'},Ae={html:!1,position:'top',animation:'shift',animateFill:!0,arrow:!1,arrowSize:'regular',delay:0,trigger:'mouseenter focus',duration:350,interactive:!1,interactiveBorder:2,theme:'dark',size:'regular',distance:10,offset:0,hideOnClick:!0,multiple:!1,followCursor:!1,inertia:!1,flipDuration:350,sticky:!1,stickyDuration:200,appendTo:null,zIndex:9999,touchHold:!1,performance:!1,popperOptions:{}},ke=xe.SUPPORTED&&Object.keys(Ae),Ie=Element.prototype.matches||Element.prototype.matchesSelector||Element.prototype.webkitMatchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector||function(e){for(var t=(this.document||this.ownerDocument).querySelectorAll(e),o=t.length;0<=--o&&t.item(o)!==this;);return-1i[e]&&!t.escapeWithReference&&(n=we(r[o],i[e]-('right'===e?r.width:r.height))),Ye({},o,n)}};return n.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';r=ze({},r,s[t](e))}),e.offsets.popper=r,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,i=t.reference,n=e.placement.split('-')[0],r=Le,s=-1!==['top','bottom'].indexOf(n),a=s?'right':'bottom',p=s?'left':'top',l=s?'width':'height';return o[a]r(i[a])&&(e.offsets.popper[p]=r(i[a])),e}},arrow:{order:500,enabled:!0,fn:function(e,t){if(!se(e.instance.modifiers,'arrow','keepTogether'))return e;var o=t.element;if('string'==typeof o){if(o=e.instance.popper.querySelector(o),!o)return e;}else if(!e.instance.popper.contains(o))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var i=e.placement.split('-')[0],n=e.offsets,r=n.popper,s=n.reference,a=-1!==['left','right'].indexOf(i),p=a?'height':'width',l=a?'top':'left',d=a?'left':'top',c=a?'bottom':'right',f=F(o)[p];s[c]-fr[c]&&(e.offsets.popper[l]+=s[l]+f-r[c]);var m=s[l]+s[p]/2-f/2,h=m-R(e.offsets.popper)[l];return h=Te(we(r[p]-f,h),0),e.arrowElement=o,e.offsets.arrow={},e.offsets.arrow[l]=Se(h),e.offsets.arrow[d]='',e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(V(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=W(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement),i=e.placement.split('-')[0],n=Y(i),r=e.placement.split('-')[1]||'',s=[];switch(t.behavior){case Ge.FLIP:s=[i,n];break;case Ge.CLOCKWISE:s=pe(i);break;case Ge.COUNTERCLOCKWISE:s=pe(i,!0);break;default:s=t.behavior;}return s.forEach(function(a,p){if(i!==a||s.length===p+1)return e;i=e.placement.split('-')[0],n=Y(i);var l=e.offsets.popper,d=e.offsets.reference,c=Le,f='left'===i&&c(l.right)>c(d.left)||'right'===i&&c(l.left)c(d.top)||'bottom'===i&&c(l.top)c(o.right),u=c(l.top)c(o.bottom),b='left'===i&&m||'right'===i&&h||'top'===i&&u||'bottom'===i&&g,y=-1!==['top','bottom'].indexOf(i),v=!!t.flipVariations&&(y&&'start'===r&&m||y&&'end'===r&&h||!y&&'start'===r&&u||!y&&'end'===r&&g);(f||b||v)&&(e.flipped=!0,(f||b)&&(i=s[p+1]),v&&(r=ae(r)),e.placement=i+(r?'-'+r:''),e.offsets.popper=ze({},e.offsets.popper,z(e.instance.popper,e.offsets.reference,e.placement)),e=G(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport'},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],i=e.offsets,n=i.popper,r=i.reference,s=-1!==['left','right'].indexOf(o),a=-1===['top','left'].indexOf(o);return n[s?'left':'top']=r[t]-(a?n[s?'width':'height']:0),e.placement=Y(t),e.offsets.popper=R(n),e}},hide:{order:800,enabled:!0,fn:function(e){if(!se(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=j(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottomo.right||t.top>o.bottom||t.rightt-e&&(Ae.touch=!1,document.removeEventListener('mousemove',r),!Ae.iOS()&&document.body.classList.remove('tippy-touch')),e=t}}();document.addEventListener('click',function(e){if(!(e.target instanceof Element))return t();var i=o(e.target,Ce.TOOLTIPPED_EL),r=o(e.target,Ce.POPPER);if(r){var s=n(Pe,function(e){return e.popper===r}),a=s.settings.interactive;if(a)return}if(i){var p=n(Pe,function(e){return e.el===i}),d=p.settings,l=d.hideOnClick,c=d.multiple,f=d.trigger;if(!c&&Ae.touch||!c&&-1!==f.indexOf('click'))return t(p);if(!0!==l||-1!==f.indexOf('click'))return}o(e.target,Ce.CONTROLLER)||!document.querySelector(Ce.POPPER)||t()}),document.addEventListener('touchstart',i),window.addEventListener('blur',function(){var t=document,i=t.activeElement;i&&i.blur&&e.call(i,Ce.TOOLTIPPED_EL)&&i.blur()}),!Ae.SUPPORTS_TOUCH&&(0m&&(e=m-f-2*l),0>h-f-l+a&&(e=f)),s.style[p('transform')]='translate3d('+e+'px, '+i+'px, 0)'}function v(e){return e instanceof Element||/Element/.test(Object.prototype.toString.call(e))?[e]:Array.isArray(e)?e:[].slice.call(document.querySelectorAll(e))}function E(e,t,i){if(!t)return i();var o=e.popper.querySelector(Ce.TOOLTIP),n=!1,r=function t(r){r.target!==o||(n=!0,o.removeEventListener('webkitTransitionEnd',t),o.removeEventListener('transitionend',t),i())};o.addEventListener('webkitTransitionEnd',r),o.addEventListener('transitionend',r),clearTimeout(e._transitionendTimeout),e._transitionendTimeout=setTimeout(function(){n||i()},t)}function O(e){return e&&'[object Function]'==={}.toString.call(e)}function w(e,t){if(1!==e.nodeType)return[];var i=window.getComputedStyle(e,null);return t?i[t]:i}function T(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function L(e){if(!e||-1!==['HTML','BODY','#document'].indexOf(e.nodeName))return window.document.body;var t=w(e),i=t.overflow,o=t.overflowX,n=t.overflowY;return /(auto|scroll)/.test(i+n+o)?e:L(T(e))}function S(e){var t=e&&e.offsetParent,i=t&&t.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TD','TABLE'].indexOf(t.nodeName)&&'static'===w(t,'position')?S(t):t:window.document.documentElement}function x(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||S(e.firstElementChild)===e)}function A(e){return null===e.parentNode?e:A(e.parentNode)}function P(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return window.document.documentElement;var i=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,o=i?e:t,n=i?t:e,r=document.createRange();r.setStart(o,0),r.setEnd(n,0);var s=r.commonAncestorContainer;if(e!==s&&t!==s||o.contains(n))return x(s)?s:S(s);var a=A(e);return a.host?P(a.host,t):P(e,A(t).host)}function C(e){var t=1=i.clientWidth&&o>=i.clientHeight}),l=0r,bottom:n-a.bottom>r,left:a.left-o>r,right:o-a.right>r};return'top'===p?l.top=a.top-n>d:'bottom'===p?l.bottom=n-a.bottom>d:'left'===p?l.left=a.left-o>d:'right'===p?l.right=o-a.right>d:void 0,l.top||l.bottom||l.left||l.right}function Ee(e,t,i){var n,r,s=this,a=i.position,p=i.delay,d=i.duration,l=i.interactive,c=i.interactiveBorder,f=i.distance,m=i.hideOnClick,h=i.trigger,g=i.touchHold,b=i.touchWait,y=function(){clearTimeout(n),clearTimeout(r)},v=function(){if(y(),!u(t)){var e=Array.isArray(p)?p[0]:p;p?n=setTimeout(function(){return s.show(t)},e):s.show(t)}},E=function(e){return s.callbacks.wait?s.callbacks.wait.call(t,v,e):v()},O=function(){y();var e=Array.isArray(p)?p[1]:p;p?r=setTimeout(function(){return s.hide(t)},e):s.hide(t)};return{handleTrigger:function(i){var o='mouseenter'===i.type&&Ae.SUPPORTS_TOUCH&&Ae.touch;if(!(o&&g)){var n='click'===i.type;n&&u(t)&&'persistent'!==m?O():E(i),o&&Ae.iOS()&&e.click&&e.click()}},handleMouseleave:function(n){if(!('mouseleave'===n.type&&Ae.SUPPORTS_TOUCH&&Ae.touch&&g)){if(l){var r=function n(r){var s=function(){document.body.removeEventListener('mouseleave',O),document.removeEventListener('mousemove',n),O()},a=o(r.target,Ce.TOOLTIPPED_EL),p=o(r.target,Ce.POPPER)===t,d=-1!==h.indexOf('click');return a&&a!==e?s():void(p||a===e||d||ve(r,t,i)&&s())};return document.body.addEventListener('mouseleave',O),void document.addEventListener('mousemove',r)}O()}},handleBlur:function(e){!e.relatedTarget||Ae.touch||o(e.relatedTarget,Ce.POPPER)||O()}}}function Oe(e){var t=this;return e.reduce(function(e,i){var o=Qe,n=t.settings.performance?t.settings:ge(i,t.settings);n.arrow&&(n.animateFill=!1);var r=n.html,s=n.trigger,a=n.touchHold,p=i.getAttribute('title');if(!p&&!r)return e;i.setAttribute('data-tooltipped',''),i.setAttribute('aria-describedby','tippy-tooltip-'+o),l(i);var d=be(o,p,n),c=Ee.call(t,i,d,n),f=[];return s.trim().split(' ').forEach(function(e){return f=f.concat(ye(e,i,c,a))}),e.push({id:o,el:i,popper:d,settings:n,listeners:f,tippyInstance:t}),Qe++,e},[])}function we(e,t){return new et(e,t)}var Te=Math.min,Le=Math.floor,Se=Math.max,xe=Math.round,Ae={};'undefined'!=typeof window&&(Ae.SUPPORTED='requestAnimationFrame'in window,Ae.SUPPORTS_TOUCH='ontouchstart'in window,Ae.touch=!1,Ae.dynamicInputDetection=!0,Ae.iOS=function(){return /iPhone|iPad|iPod/.test(navigator.userAgent)&&!window.MSStream});for(var Pe=[],Ce={POPPER:'.tippy-popper',TOOLTIP:'.tippy-tooltip',CONTENT:'.tippy-tooltip-content',CIRCLE:'[x-circle]',ARROW:'[x-arrow]',TOOLTIPPED_EL:'[data-tooltipped]',CONTROLLER:'[data-tippy-controller]'},ke={html:!1,position:'top',animation:'shift',animateFill:!0,arrow:!1,arrowSize:'regular',delay:0,trigger:'mouseenter focus',duration:350,interactive:!1,interactiveBorder:2,theme:'dark',size:'regular',distance:10,offset:0,hideOnClick:!0,multiple:!1,followCursor:!1,inertia:!1,flipDuration:350,sticky:!1,stickyDuration:200,appendTo:null,zIndex:9999,touchHold:!1,performance:!1,dynamicTitle:!1,popperOptions:{}},Ie=Ae.SUPPORTED&&Object.keys(ke),De=Element.prototype,e=De.matches||De.matchesSelector||De.webkitMatchesSelector||De.mozMatchesSelector||De.msMatchesSelector||function(e){for(var t=(this.document||this.ownerDocument).querySelectorAll(e),o=t.length;0<=--o&&t.item(o)!==this;);return-1o[e]&&!t.escapeWithReference&&(n=Te(r[i],o[e]-('right'===e?r.width:r.height))),ze({},i,n)}};return n.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';r=je({},r,s[t](e))}),e.offsets.popper=r,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,i=t.popper,o=t.reference,n=e.placement.split('-')[0],r=Le,s=-1!==['top','bottom'].indexOf(n),a=s?'right':'bottom',p=s?'left':'top',d=s?'width':'height';return i[a]r(o[a])&&(e.offsets.popper[p]=r(o[a])),e}},arrow:{order:500,enabled:!0,fn:function(e,t){if(!ae(e.instance.modifiers,'arrow','keepTogether'))return e;var i=t.element;if('string'==typeof i){if(i=e.instance.popper.querySelector(i),!i)return e;}else if(!e.instance.popper.contains(i))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var o=e.placement.split('-')[0],n=e.offsets,r=n.popper,s=n.reference,a=-1!==['left','right'].indexOf(o),p=a?'height':'width',d=a?'top':'left',l=a?'left':'top',c=a?'bottom':'right',f=Y(i)[p];s[c]-fr[c]&&(e.offsets.popper[d]+=s[d]+f-r[c]);var m=s[d]+s[p]/2-f/2,h=m-H(e.offsets.popper)[d];return h=Se(Te(r[p]-f,h),0),e.arrowElement=i,e.offsets.arrow={},e.offsets.arrow[d]=xe(h),e.offsets.arrow[l]='',e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(J(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var i=U(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement),o=e.placement.split('-')[0],n=z(o),r=e.placement.split('-')[1]||'',s=[];switch(t.behavior){case Ge.FLIP:s=[o,n];break;case Ge.CLOCKWISE:s=de(o);break;case Ge.COUNTERCLOCKWISE:s=de(o,!0);break;default:s=t.behavior;}return s.forEach(function(a,p){if(o!==a||s.length===p+1)return e;o=e.placement.split('-')[0],n=z(o);var d=e.offsets.popper,l=e.offsets.reference,c=Le,f='left'===o&&c(d.right)>c(l.left)||'right'===o&&c(d.left)c(l.top)||'bottom'===o&&c(d.top)c(i.right),u=c(d.top)c(i.bottom),b='left'===o&&m||'right'===o&&h||'top'===o&&u||'bottom'===o&&g,y=-1!==['top','bottom'].indexOf(o),v=!!t.flipVariations&&(y&&'start'===r&&m||y&&'end'===r&&h||!y&&'start'===r&&u||!y&&'end'===r&&g);(f||b||v)&&(e.flipped=!0,(f||b)&&(o=s[p+1]),v&&(r=pe(r)),e.placement=o+(r?'-'+r:''),e.offsets.popper=je({},e.offsets.popper,j(e.instance.popper,e.offsets.reference,e.placement)),e=G(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport'},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,i=t.split('-')[0],o=e.offsets,n=o.popper,r=o.reference,s=-1!==['left','right'].indexOf(i),a=-1===['top','left'].indexOf(i);return n[s?'left':'top']=r[t]-(a?n[s?'width':'height']:0),e.placement=z(t),e.offsets.popper=H(n),e}},hide:{order:800,enabled:!0,fn:function(e){if(!ae(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,i=K(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottomi.right||t.top>i.bottom||t.right
Date: Tue, 8 Aug 2017 16:20:31 +0200
Subject: [PATCH 02/22] Add some missing titles
---
customize.dist/translations/messages.js | 10 +++++++++-
www/drive/main.js | 2 ++
www/pad/main.js | 3 +++
www/whiteboard/main.js | 4 ++--
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index fa0cf7791..b5f315706 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -244,9 +244,11 @@ define(function () {
out.canvas_enable = "Enable draw";
out.canvas_width = "Width";
out.canvas_opacity = "Opacity";
- out.canvas_opacityLabel = "opacity: {0}";
+ out.canvas_opacityLabel = "Opacity: {0}";
out.canvas_widthLabel = "Width: {0}";
out.canvas_saveToDrive = "Save this image as a file in your CryptDrive";
+ out.canvas_currentBrush = "Current brush";
+ out.canvas_chooseColor = "Choose a color";
// Profile
out.profileButton = "Profile"; // dropdown menu
@@ -343,6 +345,8 @@ define(function () {
out.fm_backup_title = 'Backup link';
out.fm_nameFile = 'How would you like to name that file?';
out.fm_error_cantPin = "Internal server error. Please reload the page and try again.";
+ out.fm_viewListButton = "List view";
+ out.fm_viewGridButton = "Grid view";
// File - Context menu
out.fc_newfolder = "New folder";
out.fc_rename = "Rename";
@@ -483,6 +487,10 @@ define(function () {
out.todo_markAsIncompleteTitle = "Mark this task as incomplete";
out.todo_removeTaskTitle = "Remove this task from your todo list";
+ // pad
+ out.pad_showToolbar = "Show toolbar";
+ out.pad_hideToolbar = "Hide toolbar";
+
// general warnings
out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. Learn more... ";
diff --git a/www/drive/main.js b/www/drive/main.js
index b1b764336..468be48b8 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1374,6 +1374,8 @@ define([
} else {
$gridButton.addClass('active');
}
+ $listButton.attr('title', Messages.fm_viewListButton);
+ $gridButton.attr('title', Messages.fm_viewGridButton);
$container.append($listButton).append($gridButton);
};
diff --git a/www/pad/main.js b/www/pad/main.js
index 712edc9bf..a095ba46e 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -520,14 +520,17 @@ define([
$collapse.removeClass('fa-question');
var updateIcon = function () {
$collapse.removeClass('fa-caret-down').removeClass('fa-caret-up');
+ $collapse.attr('title', '');
var isCollapsed = !$bar.find('.cke_toolbox_main').is(':visible');
if (isCollapsed) {
if (!initializing) { Cryptpad.feedback('HIDETOOLBAR_PAD'); }
$collapse.addClass('fa-caret-down');
+ $collapse.attr('title', Messages.pad_showToolbar);
}
else {
if (!initializing) { Cryptpad.feedback('SHOWTOOLBAR_PAD'); }
$collapse.addClass('fa-caret-up');
+ $collapse.attr('title', Messages.pad_hideToolbar);
}
};
updateIcon();
diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js
index 5a6fefb35..8a0fcf415 100644
--- a/www/whiteboard/main.js
+++ b/www/whiteboard/main.js
@@ -93,7 +93,7 @@ window.canvas = canvas;
var img = ccanvas.toDataURL("image/png");
var $img = $(' ', {
src: img,
- title: 'Current brush'
+ title: Messages.canvas_currentBrush
});
$controls.find('.selected').html('').append($img);
canvas.freeDrawingCursor = 'url('+img+') '+size/2+' '+size/2+', crosshair';
@@ -289,7 +289,7 @@ window.canvas = canvas;
var $color = module.$color = $('', {
id: "color-picker",
- title: "choose a color",
+ title: Messages.canvas_chooseColor,
'class': "fa fa-square rightside-button",
})
.on('click', function () {
From 6ca6755d02f567d029262877ffb35f461baf41ca Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Tue, 8 Aug 2017 16:51:23 +0200
Subject: [PATCH 03/22] more missing titles in toolbar
---
customize.dist/translations/messages.js | 4 ++++
www/common/toolbar2.js | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index b5f315706..19858d1f3 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -118,6 +118,10 @@ define(function () {
out.shareButton = 'Share';
out.shareSuccess = 'Copied link to clipboard';
+ out.userListButton = "User list";
+
+ out.userAccountButton = "Your account";
+
out.newButton = 'New';
out.newButtonTitle = 'Create a new pad';
out.uploadButton = 'Upload files';
diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 0c7b6e507..004cfd2b2 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -308,7 +308,7 @@ define([
toolbar.userlistContent = $content;
- var $container = $('', {id: 'userButtons'});
+ var $container = $('', {id: 'userButtons', title: Messages.userListButton});
var $button = $('').appendTo($container);
$('',{'class': 'buttonTitle'}).appendTo($button);
@@ -446,6 +446,7 @@ define([
//$shareBlock.find('button').attr('id', 'shareButton');
$shareBlock.find('.dropdown-bar-content').addClass(SHARE_CLS).addClass(EDITSHARE_CLS).addClass(VIEWSHARE_CLS);
$shareBlock.addClass('shareButton');
+ $shareBlock.attr('title', Messages.shareButton);
if (hashes.editHash) {
$shareBlock.find('a.editShare').click(function () {
@@ -760,6 +761,7 @@ define([
var createUserAdmin = function (toolbar, config) {
var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
+ $userAdmin.attr('title', Messages.userAccountButton);
var userMenuCfg = {
$initBlock: $userAdmin
};
From ca686f9c92b65beb9db81f6bf17b52b3beb34195 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Tue, 8 Aug 2017 17:47:10 +0200
Subject: [PATCH 04/22] (hopefully) fix newline in lists when pasting links
---
customize.dist/translations/messages.es.js | 4 ++--
customize.dist/translations/messages.fr.js | 4 ++--
customize.dist/translations/messages.js | 4 ++--
customize.dist/translations/messages.pt-br.js | 4 ++--
customize.dist/translations/messages.ro.js | 2 +-
customize.dist/translations/messages.zh.js | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
index 900a4dd46..34b0b9f4a 100644
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@@ -291,7 +291,7 @@ define(function () {
out.blog = "Blog";
out.initialState = [
- '',
+ '
',
'Esto es CryptPad , el editor colaborativo en tiempo real Zero Knowledge. Todo está guardado cuando escribes.',
' ',
'Comparte el enlace a este pad para editar con amigos o utiliza el botón Compartir para obtener un enlace sólo lectura que permite leer pero no escribir.',
@@ -299,7 +299,7 @@ define(function () {
'
',
'Vamos, empieza a escribir...',
- '
',
+ '
',
'
'
].join('');
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 70814a2de..5278a8be8 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -566,7 +566,7 @@ define(function () {
// Initial states
out.initialState = [
- '',
+ '
',
'Voici CryptPad , l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.',
' ',
'Partagez le lien vers ce pad avec des amis ou utilisez le bouton Partager pour obtenir le lien de lecture-seule , qui permet la lecture mais non la modification.',
@@ -574,7 +574,7 @@ define(function () {
'
',
'',
'Lancez-vous, commencez à taper...',
- '
',
+ '',
'
'
].join('');
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 19858d1f3..ec7cac571 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -615,7 +615,7 @@ define(function () {
// Initial states
out.initialState = [
- '',
+ '
',
'This is CryptPad , the Zero Knowledge realtime collaborative editor. Everything is saved as you type.',
' ',
'Share the link to this pad to edit with friends or use the Share button to share a read-only link which allows viewing but not editing.',
@@ -623,7 +623,7 @@ define(function () {
'
',
'Go ahead, just start typing...',
- '
',
+ '',
'
'
].join('');
diff --git a/customize.dist/translations/messages.pt-br.js b/customize.dist/translations/messages.pt-br.js
index 6ea5865d4..8764c7233 100644
--- a/customize.dist/translations/messages.pt-br.js
+++ b/customize.dist/translations/messages.pt-br.js
@@ -484,7 +484,7 @@ define(function () {
// Initial states
out.initialState = [
- '',
+ '
',
'This is CryptPad , the Zero Knowledge realtime collaborative editor. Everything is saved as you type.',
' ',
'Share the link to this pad to edit with friends or use the Share button to share a read-only link which allows viewing but not editing.',
@@ -492,7 +492,7 @@ define(function () {
'
',
'Go ahead, just start typing...',
- '
',
+ '',
'
'
].join('');
diff --git a/customize.dist/translations/messages.ro.js b/customize.dist/translations/messages.ro.js
index 0eeb8f7f2..d2d497dbd 100644
--- a/customize.dist/translations/messages.ro.js
+++ b/customize.dist/translations/messages.ro.js
@@ -331,7 +331,7 @@ define(function () {
out.header_france = "With from by ";
out.header_support = " ";
out.header_logoTitle = "Mergi la pagina principală";
- out.initialState = "Acesta este CryptPad , editorul colaborativ bazat pe tehnologia Zero Knowledge în timp real. Totul este salvat pe măsură ce scrii. Partajează link-ul către acest pad pentru a edita cu prieteni sau folosește Share butonul pentru a partaja read-only link permițând vizualizarea dar nu și editarea.
Îndrăznește, începe să scrii...
";
+ out.initialState = "Acesta este CryptPad , editorul colaborativ bazat pe tehnologia Zero Knowledge în timp real. Totul este salvat pe măsură ce scrii. Partajează link-ul către acest pad pentru a edita cu prieteni sau folosește Share butonul pentru a partaja read-only link permițând vizualizarea dar nu și editarea.
Îndrăznește, începe să scrii...
";
out.codeInitialState = "/*\n Acesta este editorul colaborativ de cod bazat pe tehnologia Zero Knowledge CryptPad.\n Ce scrii aici este criptat, așa că doar oamenii care au link-ul pot să-l acceseze.\n Poți să alegi ce limbaj de programare pus n evidență și schema de culori UI n dreapta sus.\n*/";
out.slideInitialState = "# CryptSlide\n* Acesta este un editor colaborativ bazat pe tehnologia Zero Knowledge.\n* Ce scrii aici este criptat, așa că doar oamenii care au link-ul pot să-l acceseze.\n* Nici măcar serverele nu au acces la ce scrii tu.\n* Ce vezi aici, ce auzi aici, atunci când pleci, lași aici.\n\n-\n# Cum se folosește\n1. Scrie-ți conținutul slide-urilor folosind sintaxa markdown\n - Află mai multe despre sintaxa markdown [aici](http://www.markdowntutorial.com/)\n2. Separă-ți slide-urile cu -\n3. Click pe butonul \"Play\" pentru a vedea rezultatele - Slide-urile tale sunt actualizate în timp real.";
out.driveReadmeTitle = "Ce este CryptDrive?";
diff --git a/customize.dist/translations/messages.zh.js b/customize.dist/translations/messages.zh.js
index ac0d9ce77..012b31018 100644
--- a/customize.dist/translations/messages.zh.js
+++ b/customize.dist/translations/messages.zh.js
@@ -467,7 +467,7 @@ define(function () {
// Initial states
out.initialState = [
- '',
+ '
',
'這是 CryptPad , 零知識即時協作編輯平台,當你輸入時一切已即存好。',
' ',
'分享這個工作檔案的網址連結給友人或是使用、 分享 按鈕分享唯讀的連結 其只能看不能編寫。',
@@ -475,7 +475,7 @@ define(function () {
'
',
'來吧, 開始打字輸入吧...',
- '
',
+ '',
'
'
].join('');
From 34ba673cd3955e2f40e5436eac0ae41fc5316be7 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 10:54:20 +0200
Subject: [PATCH 05/22] improve file upload UI
---
customize.dist/src/less/cryptpad.less | 35 ++++++++++---------
.../src/less2/include/colortheme.less | 2 ++
customize.dist/src/less2/include/modal.less | 17 +++++++++
www/common/common-file.js | 3 +-
www/file/file.less | 6 ----
5 files changed, 40 insertions(+), 23 deletions(-)
create mode 100644 customize.dist/src/less2/include/modal.less
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index e607ef7ff..67adce78a 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -3,6 +3,7 @@
@import "../less2/include/alertify.less";
@import "../less2/include/colortheme.less";
+@import "../less2/include/modal.less";
@import "./bar.less";
@import "./loading.less";
@import "./dropdown.less";
@@ -633,29 +634,30 @@ noscript {
/* Upload status table */
#uploadStatusContainer {
+ .modal_base();
position: absolute;
left: 10vw; right: 10vw;
- bottom: 100px;
- background-color: rgba(0,0,0,0.5);
- color: white;
- opacity: 0.7;
+ bottom: 10vh;
+ opacity: 1;
box-sizing: border-box;
- z-index:10000;
+ z-index: 10000;
display: none;
- font-family: @colortheme_font;
+ opacity: 0.9;
#uploadStatus {
width: 80vw;
- border: 1px solid black;
- border-collapse: collapse;
tr:nth-child(1) {
- background-color: #888;
- border: 1px solid #999;
- td { text-align: center; }
+ background-color: darken(@colortheme_modal-bg, 20%);
+ td {
+ text-align: center;
+ font-weight: bold;
+ padding: 0.25em;
+ }
}
+ @upload_pad_h: 0.25em;
+ @upload_pad_v: 0.5em;
+
td {
- border-left: 1px solid #BBB;
- border-right: 1px solid #BBB;
- padding: 0 10px;
+ padding: @upload_pad_h @upload_pad_v;
}
.upProgress {
width: 200px;
@@ -666,9 +668,10 @@ noscript {
.progressContainer {
position: absolute;
width: 0px;
- left: 5px;
- top: 1px; bottom: 1px;
+ left: @upload_pad_v;
+ top: @upload_pad_h; bottom: @upload_pad_h;
background-color: rgba(0,0,255,0.3);
+ z-index: -1;
}
.upCancel { text-align: center; }
.fa.cancel {
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 51b9af335..a62800442 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -15,6 +15,8 @@
@colortheme_modal-bg: #222;
@colortheme_modal-fg: #fff;
+@colortheme_modal-link: #eee;
+@colortheme_modal-link-visited: lighten(@colortheme_modal-link, 10%);
@colortheme_modal-dim: rgba(0, 0, 0, 0.4);
@colortheme_modal-padding: 12px;
@colortheme_modal-shadow: 0 8px 32px 0 rgba(0,0,0,.4);
diff --git a/customize.dist/src/less2/include/modal.less b/customize.dist/src/less2/include/modal.less
new file mode 100644
index 000000000..21cc69e97
--- /dev/null
+++ b/customize.dist/src/less2/include/modal.less
@@ -0,0 +1,17 @@
+@import (once) "./colortheme.less";
+
+.modal_base() {
+ font-family: @colortheme_font;
+
+ background-color: @colortheme_modal-bg;
+ color: @colortheme_modal-fg;
+ box-shadow: @colortheme_modal-shadow;
+
+ a {
+ color: @colortheme_modal-link;
+
+ &:visited {
+ color: @colortheme_modal-link-visited;
+ }
+ }
+}
diff --git a/www/common/common-file.js b/www/common/common-file.js
index 0093b9ef6..66e5eaefc 100644
--- a/www/common/common-file.js
+++ b/www/common/common-file.js
@@ -56,12 +56,13 @@ define([
$row.find('.upCancel').html('-');
var $pv = $row.find('.progressValue');
var $pb = $row.find('.progressContainer');
+ var $pc = $row.find('.upProgress');
var $link = $row.find('.upLink');
var updateProgress = function (progressValue) {
$pv.text(Math.round(progressValue*100)/100 + '%');
$pb.css({
- width: (progressValue/100)*188+'px'
+ width: (progressValue/100)*$pc.width()+'px'
});
};
diff --git a/www/file/file.less b/www/file/file.less
index 1e4db2cd1..fa6485806 100644
--- a/www/file/file.less
+++ b/www/file/file.less
@@ -128,9 +128,3 @@ media-tag {
z-index: 10000;
display: block;
}
-
-body #uploadStatusContainer {
- background-color: rgba(255, 255, 255, 0.9);
- color: black;
- opacity: 0.9;
-}
From ec011b15d5356bca74f0cce3bae55febf01c0877 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 10:55:36 +0200
Subject: [PATCH 06/22] remove duplicate css property
---
customize.dist/src/less/cryptpad.less | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 67adce78a..138ba5817 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -638,11 +638,10 @@ noscript {
position: absolute;
left: 10vw; right: 10vw;
bottom: 10vh;
- opacity: 1;
+ opacity: 0.9;
box-sizing: border-box;
z-index: 10000;
display: none;
- opacity: 0.9;
#uploadStatus {
width: 80vw;
tr:nth-child(1) {
From 665e81912e4d0073819afc99d922ef8c07bea110 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:06:06 +0200
Subject: [PATCH 07/22] put the tooltip on the actual button to prevent tippy
from popping when not intended
---
www/common/toolbar2.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 004cfd2b2..2165a3eb9 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -446,7 +446,7 @@ define([
//$shareBlock.find('button').attr('id', 'shareButton');
$shareBlock.find('.dropdown-bar-content').addClass(SHARE_CLS).addClass(EDITSHARE_CLS).addClass(VIEWSHARE_CLS);
$shareBlock.addClass('shareButton');
- $shareBlock.attr('title', Messages.shareButton);
+ $shareBlock.find('button').attr('title', Messages.shareButton);
if (hashes.editHash) {
$shareBlock.find('a.editShare').click(function () {
@@ -761,7 +761,7 @@ define([
var createUserAdmin = function (toolbar, config) {
var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
- $userAdmin.attr('title', Messages.userAccountButton);
+ $userAdmin.find('button').attr('title', Messages.userAccountButton);
var userMenuCfg = {
$initBlock: $userAdmin
};
From e08ed72653835a03bebba637a20c4e301a4fe717 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:11:53 +0200
Subject: [PATCH 08/22] generate the tooltip after the button
---
www/common/toolbar2.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 2165a3eb9..0b963a318 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -761,7 +761,6 @@ define([
var createUserAdmin = function (toolbar, config) {
var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
- $userAdmin.find('button').attr('title', Messages.userAccountButton);
var userMenuCfg = {
$initBlock: $userAdmin
};
@@ -776,6 +775,7 @@ define([
userMenuCfg.displayChangeName = 1;
}
Cryptpad.createUserAdminMenu(userMenuCfg);
+ $userAdmin.find('button').attr('title', Messages.userAccountButton);
var $userButton = toolbar.$userNameButton = $userAdmin.find('a.' + USERBUTTON_CLS);
$userButton.click(function (e) {
From d47e26efd5417fb908f8538e0babafe00b0bed58 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:17:14 +0200
Subject: [PATCH 09/22] add margin in code
---
www/code/code.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/code/code.less b/www/code/code.less
index 50026d340..ce7c7898e 100644
--- a/www/code/code.less
+++ b/www/code/code.less
@@ -72,7 +72,7 @@ body {
#preview {
max-width: 40vw;
- margin: auto;
+ margin: 1em auto;
.markdown_preformatted-code;
.markdown_gfm-table(black);
From a4aeada585eb48c72265245fc8bf7429e299d486 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:20:46 +0200
Subject: [PATCH 10/22] make the file dialog placeholder visible, center file
list
---
www/common/file-dialog.less | 2 ++
1 file changed, 2 insertions(+)
diff --git a/www/common/file-dialog.less b/www/common/file-dialog.less
index aac18f274..936152f8b 100644
--- a/www/common/file-dialog.less
+++ b/www/common/file-dialog.less
@@ -44,6 +44,7 @@
border: 0;
padding: 8px 12px;
margin: 1em;
+ width: 300px;
}
.close {
@@ -60,6 +61,7 @@
.fileContainer {
display: flex;
flex-wrap: wrap;
+ justify-content: center;
overflow-y: auto;
}
From 82352b422ff7ca411dc8589f0e5e348ac79609d3 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:24:28 +0200
Subject: [PATCH 11/22] unhide show help button
---
customize.dist/pages.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index d416c4d65..19d661c4a 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -488,8 +488,7 @@ define([
title: Msg.poll_admin_button
}, Msg.poll_admin_button),
h('button#help', {
- title: Msg.poll_show_help_button,
- style: { display: 'none' }
+ title: Msg.poll_show_help_button
}, Msg.poll_show_help_button)
]),
h('div.realtime', [
From 5821d3e72f2e48694090bf114e98ec7765273c53 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:25:58 +0200
Subject: [PATCH 12/22] remove useless title
---
www/poll/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/poll/main.js b/www/poll/main.js
index 7bef35e6d..300e5c8fd 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -458,7 +458,7 @@ define([
var msg = (help ? Messages.poll_hide_help_button : Messages.poll_show_help_button);
$('#howItWorks').toggle(help);
- $('#help').text(msg).attr('title', msg);
+ $('#help').text(msg);
};
var Title;
From 280c10c57d9a1bcd5f945d7c0e35951c7936f61d Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 11:48:04 +0200
Subject: [PATCH 13/22] alertify: use the right box-shadow
---
customize.dist/src/less2/include/alertify.less | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 3e9bec46a..a035f5bf0 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -114,8 +114,7 @@
text-align: left;
padding: @alertify_padding-base;
background: #fff;
- // FIXME
- box-shadow: 0 2px 4px -1px rgba(0,0,0,.14), 0 4px 5px 0 rgba(0,0,0,.098), 0 1px 10px 0 rgba(0,0,0,.084);
+ box-shadow: @alertify_box-shadow;
}
.msg {
From 8b2cb37c2f125a664f436a58bd91febaefb7d37c Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 12:33:40 +0200
Subject: [PATCH 14/22] improve poll looks
---
customize.dist/pages.js | 12 ++++++------
www/poll/main.js | 3 ++-
www/poll/poll.less | 30 ++++++++++++++++++++++++++++--
3 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 19d661c4a..90fe12537 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -480,14 +480,14 @@ define([
h('p', Msg.poll_p_encryption)
]),
h('div.upper', [
- h('button#publish', {
+ h('button#publish.btn.btn-success', {
style: { display: 'none' }
}, Msg.poll_publish_button),
- h('button#admin', {
+ h('button#admin.btn.btn-primary', {
style: { display: 'none' },
title: Msg.poll_admin_button
}, Msg.poll_admin_button),
- h('button#help', {
+ h('button#help.btn.btn-default', {
title: Msg.poll_show_help_button
}, Msg.poll_show_help_button)
]),
@@ -503,13 +503,13 @@ define([
]),
h('div#tableContainer', [
h('div#tableScroll'),
- h('button#create-user', {
+ h('button#create-user.btn.btn-default', {
title: Msg.poll_create_user
}, h('span.fa.fa-plus')),
- h('button#create-option', {
+ h('button#create-option.btn.btn-default', {
title: Msg.poll_create_option
}, h('span.fa.fa-plus')),
- h('button#commit', {
+ h('button#commit.btn.btn-default', {
title: Msg.poll_commit
}, h('span.fa.fa-check'))
])
diff --git a/www/poll/main.js b/www/poll/main.js
index 300e5c8fd..7455ee823 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -11,6 +11,7 @@ define([
'/bower_components/file-saver/FileSaver.min.js',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+ 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'less!/customize/src/less/toolbar.less',
'less!/customize/src/less/cryptpad.less',
'less!/poll/poll.less',
@@ -135,7 +136,7 @@ define([
var $commitCell = APP.$table.find('tfoot tr td:nth-child(2)');
$createOption.append(APP.$createRow);
$commitCell.append(APP.$commit);
- $('#create-user, #create-option').css('display', 'inline-block');
+ $('#create-user, #create-option').css('display', 'inline-flex');
if (!APP.proxy || !APP.proxy.table.rowsOrder || APP.proxy.table.rowsOrder.length === 0) { $('#create-user').hide(); }
var width = $('#table').outerWidth();
if (width) {
diff --git a/www/poll/poll.less b/www/poll/poll.less
index ddc0ea502..3a7547700 100644
--- a/www/poll/poll.less
+++ b/www/poll/poll.less
@@ -55,9 +55,14 @@ body {
width: 400px;
}
+input[type="text"], textarea {
+ background-color: white;
+ color: black;
+ border: 0;
+}
+
input[type="text"][disabled], textarea[disabled] {
background-color: transparent;
- font: white;
border: 0px;
}
@@ -114,6 +119,7 @@ table#table {
min-height: 5em;
font-size: 20px;
font-weight: bold;
+ border: 1px solid black;
}
#description[disabled] {
@@ -132,6 +138,10 @@ table#table {
div.upper {
width: 80%;
margin: auto;
+
+ & > * {
+ margin-right: 1em;
+ }
}
// from cryptpad.less
@@ -329,7 +339,6 @@ form.realtime, div.realtime {
input {
&[type="text"] {
height: auto;
- border: 1px solid @base;
width: 80%;
}
}
@@ -375,6 +384,7 @@ form.realtime, div.realtime {
//border-radius: 20px 0 0 20px;
input[type="text"] {
width: ~"calc(100% - 50px)";
+ padding: 0 0.5em;
}
.edit {
float:right;
@@ -460,3 +470,19 @@ form.realtime, div.realtime {
#adduser { .top-left; }
#addoption { .bottom-left; }
}
+
+.btn {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+
+ &.btn-default {
+ background-color: #BBB;
+ color: black;
+
+ &:hover {
+ background-color: #DDD;
+ }
+ }
+}
+
From b34e252edac20a6d403c5554cbf8b9b08ad240ea Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 14:43:32 +0200
Subject: [PATCH 15/22] improve whiteboard styles
---
customize.dist/pages.js | 58 ++++++++++++++++-----------
www/whiteboard/main.js | 14 +++----
www/whiteboard/whiteboard.less | 73 ++++++++++++++++++++++++++++------
3 files changed, 100 insertions(+), 45 deletions(-)
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 90fe12537..f233e8247 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -427,33 +427,43 @@ define([
display: 'block',
}
}, [
- h('button#clear', Msg.canvas_clear), ' ',
- h('button#toggleDraw', Msg.canvas_disable),
- h('button#delete', {
+ h('button#clear.btn.btn-danger', Msg.canvas_clear), ' ',
+ h('button#toggleDraw.btn.btn-default', Msg.canvas_disable),
+ h('button#delete.btn.btn-default', {
style: {
display: 'none',
}
- }),
- h('input#width', {
- type: 'range',
- value: "5",
- min: "1",
- max: "100"
- }),
- h('label', {
- 'for': 'width'
- }, Msg.canvas_width),
- h('input#opacity', {
- type: 'range',
- value: "1",
- min: "0.1",
- max: "1",
- step: "0.1"
- }),
- h('label', {
- 'for': 'width',
- }),
- h('span.selected')
+ }, Msg.canvas_delete),
+ h('div.range-group', [
+ h('label', {
+ 'for': 'width'
+ }, Msg.canvas_width),
+ h('input#width', {
+ type: 'range',
+ value: "5",
+ min: "1",
+ max: "100"
+ }),
+ h('span#width-val', '5px')
+ ]),
+ h('div.range-group', [
+ h('label', {
+ 'for': 'opacity',
+ }, Msg.canvas_opacity),
+ h('input#opacity', {
+ type: 'range',
+ value: "1",
+ min: "0.1",
+ max: "1",
+ step: "0.1"
+ }),
+ h('span#opacity-val', '100%')
+ ]),
+ h('span.selected', [
+ h('img', {
+ title: Msg.canvas_currentBrush
+ })
+ ])
]),
setHTML(h('div#colors'), ' '),
loadingScreen(),
diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js
index 8a0fcf415..337cd8794 100644
--- a/www/whiteboard/main.js
+++ b/www/whiteboard/main.js
@@ -15,6 +15,7 @@ define([
'/bower_components/file-saver/FileSaver.min.js',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+ 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'less!/customize/src/less/cryptpad.less',
'less!/whiteboard/whiteboard.less',
'less!/customize/src/less/toolbar.less',
@@ -89,13 +90,8 @@ window.canvas = canvas;
ctx.strokeStyle = '#000000';
ctx.stroke();
-
var img = ccanvas.toDataURL("image/png");
- var $img = $(' ', {
- src: img,
- title: Messages.canvas_currentBrush
- });
- $controls.find('.selected').html('').append($img);
+ $controls.find('.selected > img').attr('src', img);
canvas.freeDrawingCursor = 'url('+img+') '+size/2+' '+size/2+', crosshair';
};
@@ -103,6 +99,7 @@ window.canvas = canvas;
var val = $width.val();
canvas.freeDrawingBrush.width = Number(val);
$widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val]));
+ $('#width-val').text(val + 'px');
createCursor();
};
updateBrushWidth();
@@ -114,6 +111,7 @@ window.canvas = canvas;
brush.opacity = Number(val);
canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity);
$opacityLabel.text(Cryptpad.Messages._getKey("canvas_opacityLabel", [val]));
+ $('#opacity-val').text((Number(val) * 100) + '%');
createCursor();
};
updateBrushOpacity();
@@ -188,7 +186,7 @@ window.canvas = canvas;
var setEditable = function (bool) {
if (readOnly && bool) { return; }
- if (bool) { $controls.show(); }
+ if (bool) { $controls.css('display', 'flex'); }
else { $controls.hide(); }
canvas.isDrawingMode = bool ? module.draw : false;
@@ -199,7 +197,7 @@ window.canvas = canvas;
canvas.forEachObject(function (object) {
object.selectable = bool;
});
- $canvasContainer.css('border-color', bool? 'black': 'red');
+ $canvasContainer.find('canvas').css('border-color', bool? 'black': 'red');
};
var saveImage = module.saveImage = function () {
diff --git a/www/whiteboard/whiteboard.less b/www/whiteboard/whiteboard.less
index 81c7e0bfe..72ae28e51 100644
--- a/www/whiteboard/whiteboard.less
+++ b/www/whiteboard/whiteboard.less
@@ -27,20 +27,29 @@ body {
}
// created by fabricjs. styled so defaults don't break anything
.canvas-container {
- border: 1px solid black;
margin: auto;
background: white;
+ & > canvas {
+ border: 1px solid black;
+ }
}
// contains user tools
#controls {
- display: block;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
position: relative;
border-top: 1px solid black;
background: white;
- height: 100px;
- line-height: 100px;
- padding-bottom: 5px;
+
+ padding: 1em;
+
+ & > * + * {
+ margin: 0;
+ margin-left: 1em;
+ }
#width, #opacity {
.middle;
@@ -50,15 +59,36 @@ body {
vertical-align: middle;
}
.selected {
- margin-left: 20px;
- display: inline-block;
- height: 135px;
- width: 135px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
z-index: 9001;
- text-align: center;
- img {
- vertical-align: middle;
+
+ width: 100px;
+ height: 100px;
+ }
+
+ .range-group {
+ display: flex;
+ flex-direction: column;
+ position: relative;
+
+ input[type="range"] {
+ background-color: inherit;
}
+
+ & > span {
+ cursor: default;
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
+ }
+ .range-group:first-of-type {
+ margin-left: 2em;
+ }
+ .range-group:last-of-type {
+ margin-right: 1em;
}
}
@@ -70,13 +100,21 @@ body {
display: flex;
justify-content: space-between;
+ padding: 1em;
+
span.palette-color {
height: 4vw;
width: 4vw;
- display: inline-block;
+ display: block;
margin: 5px;
border: 1px solid black;
vertical-align: top;
+ border-radius: 50%;
+ transition: transform 0.1s;
+
+ &:hover {
+ transform: scale(1.2);
+ }
}
}
@@ -87,6 +125,7 @@ body {
// input[type=color] must exist in the dom to work correctly
// styled so that they don't break layouts
+
#pickers {
visibility: hidden;
position: absolute;
@@ -95,3 +134,11 @@ body {
z-index: -5;
}
+.btn.btn-default {
+ background-color: #BBB;
+ color: black;
+
+ &:hover {
+ background-color: #DDD;
+ }
+}
From c036bb26be2262f6877fad308b8725c7a0e3147d Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 15:46:17 +0200
Subject: [PATCH 16/22] use proper bootstrap class
---
customize.dist/pages.js | 12 ++++++------
www/poll/poll.less | 9 ---------
www/whiteboard/whiteboard.less | 9 ---------
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index f233e8247..89acf8e2f 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -428,8 +428,8 @@ define([
}
}, [
h('button#clear.btn.btn-danger', Msg.canvas_clear), ' ',
- h('button#toggleDraw.btn.btn-default', Msg.canvas_disable),
- h('button#delete.btn.btn-default', {
+ h('button#toggleDraw.btn.btn-secondary', Msg.canvas_disable),
+ h('button#delete.btn.btn-secondary', {
style: {
display: 'none',
}
@@ -497,7 +497,7 @@ define([
style: { display: 'none' },
title: Msg.poll_admin_button
}, Msg.poll_admin_button),
- h('button#help.btn.btn-default', {
+ h('button#help.btn.btn-secondary', {
title: Msg.poll_show_help_button
}, Msg.poll_show_help_button)
]),
@@ -513,13 +513,13 @@ define([
]),
h('div#tableContainer', [
h('div#tableScroll'),
- h('button#create-user.btn.btn-default', {
+ h('button#create-user.btn.btn-secondary', {
title: Msg.poll_create_user
}, h('span.fa.fa-plus')),
- h('button#create-option.btn.btn-default', {
+ h('button#create-option.btn.btn-secondary', {
title: Msg.poll_create_option
}, h('span.fa.fa-plus')),
- h('button#commit.btn.btn-default', {
+ h('button#commit.btn.btn-secondary', {
title: Msg.poll_commit
}, h('span.fa.fa-check'))
])
diff --git a/www/poll/poll.less b/www/poll/poll.less
index 3a7547700..e3d5faffa 100644
--- a/www/poll/poll.less
+++ b/www/poll/poll.less
@@ -475,14 +475,5 @@ form.realtime, div.realtime {
display: inline-flex;
align-items: center;
justify-content: center;
-
- &.btn-default {
- background-color: #BBB;
- color: black;
-
- &:hover {
- background-color: #DDD;
- }
- }
}
diff --git a/www/whiteboard/whiteboard.less b/www/whiteboard/whiteboard.less
index 72ae28e51..d1f899d9f 100644
--- a/www/whiteboard/whiteboard.less
+++ b/www/whiteboard/whiteboard.less
@@ -133,12 +133,3 @@ body {
height: 0;
z-index: -5;
}
-
-.btn.btn-default {
- background-color: #BBB;
- color: black;
-
- &:hover {
- background-color: #DDD;
- }
-}
From edad5deeac3248f2f682a00ee3434781a0d80059 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Wed, 9 Aug 2017 16:06:29 +0200
Subject: [PATCH 17/22] fix logo not showing sometimes in chrome
---
customize.dist/images/logo_white.png | Bin 0 -> 9843 bytes
www/common/toolbar2.js | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 customize.dist/images/logo_white.png
diff --git a/customize.dist/images/logo_white.png b/customize.dist/images/logo_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..81928ffb1ff1a465caef1500471a514f23a5e265
GIT binary patch
literal 9843
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', {
- src: '/customize/images/logo_white.svg'
+ src: '/customize/images/logo_white.png'
}));
var onClick = function (e) {
e.preventDefault();
From 41c2f9bd83b62b93fc174c61c96edbd8701e2558 Mon Sep 17 00:00:00 2001
From: CatalinScr
Date: Wed, 9 Aug 2017 18:35:36 +0300
Subject: [PATCH 18/22] Changed the footer, a modified the about page
---
customize.dist/bkabout.jpg | Bin 0 -> 17129 bytes
customize.dist/pages.js | 21 ++++++++++++----
.../src/less2/include/infopages.less | 21 +++++++++++++---
.../src/less2/pages/page-about.less | 23 ++++++++++++++++++
4 files changed, 56 insertions(+), 9 deletions(-)
create mode 100644 customize.dist/bkabout.jpg
diff --git a/customize.dist/bkabout.jpg b/customize.dist/bkabout.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..43de082685b0dd5ad25189e81a4585715d741b02
GIT binary patch
literal 17129
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
literal 0
HcmV?d00001
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index f233e8247..082ece252 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -14,7 +14,7 @@ define([
};
var footerCol = function (title, L, literal) {
- return h('div.col', [
+ return h('div.col-6.col-sm-3', [
h('ul.list-unstyled', [
h('li.footer-title', {
'data-localization': title,
@@ -46,10 +46,13 @@ define([
h('div.container', [
h('div.row', [
footerCol(null, [
+ setHTML(h('div.cp-bio-foot'), 'With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.
'),
+ ], ''),
+ /* footerCol(null, [
footLink('/about.html', 'about'),
footLink('/terms.html', 'terms'),
footLink('/privacy.html', 'privacy'),
- ], 'CryptPad'),
+ ], 'CryptPad'),*/
footerCol('footer_applications', [
footLink('/drive/', 'main_drive'),
footLink('/pad/', 'main_richText'),
@@ -109,13 +112,21 @@ define([
Pages['/about.html'] = function () {
return h('div#cp-main', [
infopageTopbar(),
+ h('div.container-fluid.cp-about-intro', [
+ h('div.container', [
+ h('center', [
+ h('h1', Msg.about),
+ setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS , a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),
+ ]),
+ ]),
+ ]),
h('div.container.cp-container', [
- h('center', [
+ /*h('center', [
h('h1', Msg.about)
]),
- setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS , a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),
- h('h2', 'Core Developers'),
+ setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS , a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),*/
h('div.row', [
+ h('h2.col-12', 'Core Developers'),
h('div.col-md-4', [
h('img.bio-avatar', {'src': '/customize/images/aaron.jpg'}),
h('h3', "Aaron MacSween"),
diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less
index 390877b40..db5172c75 100644
--- a/customize.dist/src/less2/include/infopages.less
+++ b/customize.dist/src/less2/include/infopages.less
@@ -74,7 +74,7 @@
}
footer {
- background-color: @cryptpad_color_grey;
+ background-color: @cryptpad_color_blue;
.container {
.col {
margin-top: 1em;
@@ -82,20 +82,33 @@
a {
color: #fff;
&:visited {
- color: darken(#fff, 20%);
+ color: darken(#fff, 10%);
};
}
margin-bottom: 1em;
ul.list-unstyled {
- margin: 0;
+ margin-top: 1em;
+ text-align: center;
}
}
+ .cp-bio-foot {
+ background-image: url(/customize/CryptPad-white-logo.svg);
+ background-size: 100%;
+ background-repeat: no-repeat;
+ p {
+ color: #fff;
+ padding-top: 30%;
+ margin-bottom: 0;
+
+ }
+ }
.cp-version-footer {
- background-color: #6C6C6C;
+ background-color: @cryptpad_color_blue;
color: #fff;
text-align: center;
padding: 0.5em;
+ border-top: 2px solid #fff;
}
}
};
diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less
index 66c72eec9..afce3ac9e 100644
--- a/customize.dist/src/less2/pages/page-about.less
+++ b/customize.dist/src/less2/pages/page-about.less
@@ -9,4 +9,27 @@
margin: 1em 0;
max-width: 300px;
max-height: 300px;
+}
+.cp-about-intro {
+ padding-top: 3em;
+ padding-bottom: 3em;
+ background-image: url(/customize/bkabout.jpg);
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-position: center;
+ .container {
+ color: #fff;
+ font-family: "Open Sans";
+ h1 {
+ font-weight: bold;
+ }
+ a {
+ color: #fff;
+ text-decoration: underline;
+ }
+ p {
+ padding-top: 1em;
+ }
+ }
+
}
\ No newline at end of file
From 4026994310b897cd84db9624eaf057541b6226e4 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Thu, 10 Aug 2017 14:25:31 +0200
Subject: [PATCH 19/22] make splitter work when scrolling
---
www/code/main.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/www/code/main.js b/www/code/main.js
index 7591f12a2..44cab6d36 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -388,11 +388,17 @@ define([
});
// add the splitter
+ var $preview = $iframe.find('#previewContainer');
var splitter = $('', {
'class': 'cp-splitter'
- }).appendTo($iframe.find('#previewContainer'));
+ }).appendTo($preview);
+
+ $preview.on('scroll', function() {
+ splitter.css('top', $preview.scrollTop() + 'px');
+ });
var $target = $iframe.find('.CodeMirror');
+
splitter.on('mousedown', function (e) {
e.preventDefault();
var x = e.pageX;
From 9dce40f3afe925ccf4d6cca08160d106ab4e0113 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Thu, 10 Aug 2017 14:34:48 +0200
Subject: [PATCH 20/22] only add the splitter once
---
www/code/main.js | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/www/code/main.js b/www/code/main.js
index 44cab6d36..ebdd52ede 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -388,30 +388,32 @@ define([
});
// add the splitter
- var $preview = $iframe.find('#previewContainer');
- var splitter = $('', {
- 'class': 'cp-splitter'
- }).appendTo($preview);
-
- $preview.on('scroll', function() {
- splitter.css('top', $preview.scrollTop() + 'px');
- });
+ if (!$iframe.has('.cp-splitter').length) {
+ var $preview = $iframe.find('#previewContainer');
+ var splitter = $('
', {
+ 'class': 'cp-splitter'
+ }).appendTo($preview);
+
+ $preview.on('scroll', function() {
+ splitter.css('top', $preview.scrollTop() + 'px');
+ });
- var $target = $iframe.find('.CodeMirror');
+ var $target = $iframe.find('.CodeMirror');
- splitter.on('mousedown', function (e) {
- e.preventDefault();
- var x = e.pageX;
- var w = $target.width();
+ splitter.on('mousedown', function (e) {
+ e.preventDefault();
+ var x = e.pageX;
+ var w = $target.width();
- $iframe.on('mouseup mousemove', function handler(evt) {
- if (evt.type === 'mouseup') {
- $iframe.off('mouseup mousemove', handler);
- return;
- }
- $target.css('width', (w - x + evt.pageX) + 'px');
+ $iframe.on('mouseup mousemove', function handler(evt) {
+ if (evt.type === 'mouseup') {
+ $iframe.off('mouseup mousemove', handler);
+ return;
+ }
+ $target.css('width', (w - x + evt.pageX) + 'px');
+ });
});
- });
+ }
Cryptpad.removeLoadingScreen();
setEditable(true);
From baf64114a6a69b95107e00437517d8fc949a128b Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Thu, 10 Aug 2017 14:45:56 +0200
Subject: [PATCH 21/22] point to homepage in drive
---
customize.dist/translations/messages.js | 1 +
www/common/toolbar2.js | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index ec7cac571..7c5c64ceb 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -611,6 +611,7 @@ define(function () {
out.header_support = ' ';
out.updated_0_header_logoTitle = 'Go to your CryptDrive';
out.header_logoTitle = out.updated_0_header_logoTitle;
+ out.header_homeTitle = 'Go to CryptPad homepage';
// Initial states
diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 4a8032ad4..519700624 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -624,9 +624,14 @@ define([
}).appendTo(toolbar.$top);
// We need to override the "a" tag action here because it is inside the iframe!
+ var inDrive = /^\/drive/;
+
+ var href = inDrive ? '/index.html' : '/drive/';
+ var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
+
var $aTag = $('', {
- href: "/drive/",
- title: Messages.header_logoTitle,
+ href: href,
+ title: buttonTitle,
'class': "cryptpad-logo"
}).append($(' ', {
src: '/customize/images/logo_white.png'
@@ -634,10 +639,10 @@ define([
var onClick = function (e) {
e.preventDefault();
if (e.ctrlKey) {
- window.open('/drive/');
+ window.open(href);
return;
}
- window.location = "/drive/";
+ window.location = href;
};
var onContext = function (e) { e.stopPropagation(); };
From 04b84538e16fb6fbdc862836dfafdbc51875e968 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer
Date: Thu, 10 Aug 2017 15:05:57 +0200
Subject: [PATCH 22/22] add Open Sans font (with bower)
---
bower.json | 3 +-
customize.dist/fonts/open-sans.less | 133 ++++++++++++++++++++++++++++
customize.dist/src/less2/main.less | 2 +
3 files changed, 137 insertions(+), 1 deletion(-)
create mode 100644 customize.dist/fonts/open-sans.less
diff --git a/bower.json b/bower.json
index b04ff3a6b..0880e56ef 100644
--- a/bower.json
+++ b/bower.json
@@ -39,6 +39,7 @@
"require-css": "0.1.10",
"less": "^2.7.2",
"bootstrap": "#v4.0.0-alpha.6",
- "diff-dom": "2.1.1"
+ "diff-dom": "2.1.1",
+ "open-sans-fontface": "^1.4.2"
}
}
diff --git a/customize.dist/fonts/open-sans.less b/customize.dist/fonts/open-sans.less
new file mode 100644
index 000000000..7a1bcbb90
--- /dev/null
+++ b/customize.dist/fonts/open-sans.less
@@ -0,0 +1,133 @@
+/* Open Sans @font-face kit */
+
+@OpenSansPath: "/bower_components/open-sans-fontface/fonts";
+
+/* BEGIN Light */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Light/OpenSans-Light.eot');
+ src: url('@{OpenSansPath}/Light/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Light/OpenSans-Light.woff') format('woff'),
+ url('@{OpenSansPath}/Light/OpenSans-Light.ttf') format('truetype'),
+ url('@{OpenSansPath}/Light/OpenSans-Light.svg#OpenSansLight') format('svg');
+ font-weight: 300;
+ font-style: normal;
+}
+/* END Light */
+
+/* BEGIN Light Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.eot');
+ src: url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.woff') format('woff'),
+ url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg');
+ font-weight: 300;
+ font-style: italic;
+}
+/* END Light Italic */
+
+/* BEGIN Regular */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Regular/OpenSans-Regular.eot');
+ src: url('@{OpenSansPath}/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Regular/OpenSans-Regular.woff') format('woff'),
+ url('@{OpenSansPath}/Regular/OpenSans-Regular.ttf') format('truetype'),
+ url('@{OpenSansPath}/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+/* END Regular */
+
+/* BEGIN Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Italic/OpenSans-Italic.eot');
+ src: url('@{OpenSansPath}/Italic/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Italic/OpenSans-Italic.woff') format('woff'),
+ url('@{OpenSansPath}/Italic/OpenSans-Italic.ttf') format('truetype'),
+ url('@{OpenSansPath}/Italic/OpenSans-Italic.svg#OpenSansItalic') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
+/* END Italic */
+
+/* BEGIN Semibold */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Semibold/OpenSans-Semibold.eot');
+ src: url('@{OpenSansPath}/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff') format('woff'),
+ url('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf') format('truetype'),
+ url('@{OpenSansPath}/Semibold/OpenSans-Semibold.svg#OpenSansSemibold') format('svg');
+ font-weight: 600;
+ font-style: normal;
+}
+/* END Semibold */
+
+/* BEGIN Semibold Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.eot');
+ src: url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.woff') format('woff'),
+ url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.svg#OpenSansSemiboldItalic') format('svg');
+ font-weight: 600;
+ font-style: italic;
+}
+/* END Semibold Italic */
+
+/* BEGIN Bold */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Bold/OpenSans-Bold.eot');
+ src: url('@{OpenSansPath}/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Bold/OpenSans-Bold.woff') format('woff'),
+ url('@{OpenSansPath}/Bold/OpenSans-Bold.ttf') format('truetype'),
+ url('@{OpenSansPath}/Bold/OpenSans-Bold.svg#OpenSansBold') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+/* END Bold */
+
+/* BEGIN Bold Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.eot');
+ src: url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.woff') format('woff'),
+ url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg');
+ font-weight: bold;
+ font-style: italic;
+}
+/* END Bold Italic */
+
+/* BEGIN Extrabold */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.eot');
+ src: url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff') format('woff'),
+ url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf') format('truetype'),
+ url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.svg#OpenSansExtrabold') format('svg');
+ font-weight: 800;
+ font-style: normal;
+}
+/* END Extrabold */
+
+/* BEGIN Extrabold Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot');
+ src: url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff') format('woff'),
+ url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg#OpenSansExtraboldItalic') format('svg');
+ font-weight: 800;
+ font-style: italic;
+}
+/* END Extrabold Italic */
diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less
index ecbe75cf2..2524b6d0f 100644
--- a/customize.dist/src/less2/main.less
+++ b/customize.dist/src/less2/main.less
@@ -2,6 +2,8 @@
font-family: Neuropolitical;
src: url(./customize/fonts/neuropolitical.ttf)
}
+@import (once) '/customize/fonts/open-sans.less';
+
body.cp-page-index { @import "./pages/page-index.less"; }
body.cp-page-contact { @import "./pages/page-contact.less"; }
body.cp-page-login { @import "./pages/page-login.less"; }