x4js 1.4.6 → 1.4.9

package/src/x4.less

@@ -1,37 +1,113 @@
-// out: false
-
+// out: ../x4.css
+
+/**
+*  ___   ___ __
+*  \  \_/  /  / _
+*   \     /  /_| |_
+*   /  _  \____   _|  
+*  /__/ \__\   |_|
+*        
+* @file x4.less
+* @author Etienne Cochard 
+*
+* Copyright (c) 2019-2022 R-libre ingenierie
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy 
+* of this software and associated documentation files (the "Software"), to deal 
+* in the Software without restriction, including without limitation the rights 
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+* of the Software, and to permit persons to whom the Software is furnished to do so, 
+* subject to the following conditions:
+* The above copyright notice and this permission notice shall be included in all copies
+* or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**/
 
 :root {
-	--background: #161717;
-	
-	--button-color: rgb(54,54,54);
-	--button-border: rgb(0,0,0);
-	--button-icon-color: rgb( 255, 255, 255);
-
-	--scrollbar-width: 6px;
-	--scrollbar-bk: white;
-	--scrollbar-thumb: grey;
-}
+	--x4-font: "Inter";
+	--x4-font-size: 13px;
 
-* {
-	user-select: none;
-	box-sizing: border-box;
-}
-
-html {
-	font-family: @def-font;
-	font-size: @def-font-size;
-}
-
-body {
+	--x4-base-color: #266888;
+	
+	--x4-selection-color: #2458B3;
+	--x4-hover-color: fadeout( #2458B3, 10% );
+	--x4-mask-color: fadeout( #2458B3, 40% );
+	--x4-focus-color: #2458B3;
+	--x4-error-color: #b92a09;
+	--x4-success-color: #0A6640;
+	--x4-form-color: white;
+	--x4-tip-background: rgba(0,0,0,0.5);
+
+	--x4-button-color: white;
+	--x4-button-text-color: rgb(54,54,54);
+	
+	--x4-scrollbar-width: 6px;
+	--x4-scrollbar-background: white;
+	--x4-scrollbar-thumb: grey;
+
+	--x4-sizer-size: 4px;
+	--x4-default-border-color: rgba(0,0,0,0.1);
+
+	// todo: svg
+	--x4-icon-font-family: "fonteawesome";
+
+	--x4-icon-circle-exclamation: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 0C114.6 0 0 114.6 0 256s114.6 256 256 256s256-114.6 256-256S397.4 0 256 0zM232 152C232 138.8 242.8 128 256 128s24 10.75 24 24v128c0 13.25-10.75 24-24 24S232 293.3 232 280V152zM256 400c-17.36 0-31.44-14.08-31.44-31.44c0-17.36 14.07-31.44 31.44-31.44s31.44 14.08 31.44 31.44C287.4 385.9 273.4 400 256 400z"/></svg>';
+	--x4-icon-chevron-right: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M96 480c-8.188 0-16.38-3.125-22.62-9.375c-12.5-12.5-12.5-32.75 0-45.25L242.8 256L73.38 86.63c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0l192 192c12.5 12.5 12.5 32.75 0 45.25l-192 192C112.4 476.9 104.2 480 96 480z"/></svg>';
+	--x4-icon-window-restore: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentColor"><path d="M432 64H208C199.2 64 192 71.16 192 80V96H128V80C128 35.82 163.8 0 208 0H432C476.2 0 512 35.82 512 80V304C512 348.2 476.2 384 432 384H416V320H432C440.8 320 448 312.8 448 304V80C448 71.16 440.8 64 432 64zM0 192C0 156.7 28.65 128 64 128H320C355.3 128 384 156.7 384 192V448C384 483.3 355.3 512 320 512H64C28.65 512 0 483.3 0 448V192zM96 256H288C305.7 256 320 241.7 320 224C320 206.3 305.7 192 288 192H96C78.33 192 64 206.3 64 224C64 241.7 78.33 256 96 256z"/></svg>';
+	--x4-icon-arrow-down: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="currentColor"><path d="M9.375 329.4c12.51-12.51 32.76-12.49 45.25 0L128 402.8V32c0-17.69 14.31-32 32-32s32 14.31 32 32v370.8l73.38-73.38c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-128 128c-12.5 12.5-32.75 12.5-45.25 0l-128-128C-3.125 362.1-3.125 341.9 9.375 329.4z"/></svg>';
+	--x4-icon-arrow-up: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="currentColor"><path d="M310.6 182.6c-12.51 12.51-32.76 12.49-45.25 0L192 109.3V480c0 17.69-14.31 32-32 32s-32-14.31-32-32V109.3L54.63 182.6c-12.5 12.5-32.75 12.5-45.25 0s-12.5-32.75 0-45.25l128-128c12.5-12.5 32.75-12.5 45.25 0l128 128C323.1 149.9 323.1 170.1 310.6 182.6z"/></svg>';
+	--x4-icon-exclamation: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 512" fill="currentColor"><path d="M64 352c17.69 0 32-14.32 32-31.1V64.01c0-17.67-14.31-32.01-32-32.01S32 46.34 32 64.01v255.1C32 337.7 46.31 352 64 352zM64 400c-22.09 0-40 17.91-40 40s17.91 39.1 40 39.1s40-17.9 40-39.1S86.09 400 64 400z"/></svg>';
+	--x4-icon-window-minimize: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentColor"><path d="M0 448C0 430.3 14.33 416 32 416H480C497.7 416 512 430.3 512 448C512 465.7 497.7 480 480 480H32C14.33 480 0 465.7 0 448z"/></svg>';
+	--x4-icon-window-maximize: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentColor"><path d="M448 32C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96C0 60.65 28.65 32 64 32H448zM96 96C78.33 96 64 110.3 64 128C64 145.7 78.33 160 96 160H416C433.7 160 448 145.7 448 128C448 110.3 433.7 96 416 96H96z"/></svg>';
+	--x4-icon-window-restore: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentColor"><path d="M432 64H208C199.2 64 192 71.16 192 80V96H128V80C128 35.82 163.8 0 208 0H432C476.2 0 512 35.82 512 80V304C512 348.2 476.2 384 432 384H416V320H432C440.8 320 448 312.8 448 304V80C448 71.16 440.8 64 432 64zM0 192C0 156.7 28.65 128 64 128H320C355.3 128 384 156.7 384 192V448C384 483.3 355.3 512 320 512H64C28.65 512 0 483.3 0 448V192zM96 256H288C305.7 256 320 241.7 320 224C320 206.3 305.7 192 288 192H96C78.33 192 64 206.3 64 224C64 241.7 78.33 256 96 256z"/></svg>';
+	--x4-icon-rectangle-times: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentColor"><path d="M448 32C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96C0 60.65 28.65 32 64 32H448zM175 208.1L222.1 255.1L175 303C165.7 312.4 165.7 327.6 175 336.1C184.4 346.3 199.6 346.3 208.1 336.1L255.1 289.9L303 336.1C312.4 346.3 327.6 346.3 336.1 336.1C346.3 327.6 346.3 312.4 336.1 303L289.9 255.1L336.1 208.1C346.3 199.6 346.3 184.4 336.1 175C327.6 165.7 312.4 165.7 303 175L255.1 222.1L208.1 175C199.6 165.7 184.4 165.7 175 175C165.7 184.4 165.7 199.6 175 208.1V208.1z"/></svg>';
+	--x4-icon-xmark: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="currentColor"><path d="M310.6 361.4c12.5 12.5 12.5 32.75 0 45.25C304.4 412.9 296.2 416 288 416s-16.38-3.125-22.62-9.375L160 301.3L54.63 406.6C48.38 412.9 40.19 416 32 416S15.63 412.9 9.375 406.6c-12.5-12.5-12.5-32.75 0-45.25l105.4-105.4L9.375 150.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 210.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-105.4 105.4L310.6 361.4z"/></svg>';
+	--x4-icon-angle-down: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" fill="currentColor"><path d="M192 384c-8.188 0-16.38-3.125-22.62-9.375l-160-160c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L192 306.8l137.4-137.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-160 160C208.4 380.9 200.2 384 192 384z"/></svg>';
+}
+
+@BLACK10:	rgba(0,0,0,0.1);
+@BLACK20:	rgba(0,0,0,0.2);
+@BLACK30:	rgba(0,0,0,0.3);
+@BLACK40:	rgba(0,0,0,0.4);
+@BLACK50:	rgba(0,0,0,0.5);
+@BLACK60:	rgba(0,0,0,0.6);
+@BLACK70:	rgba(0,0,0,0.7);
+@BLACK80:	rgba(0,0,0,0.8);
+@BLACK90:	rgba(0,0,0,0.9);
+@BLACK:	#000;
+
+@WHITE5: rgba(255,255,255,0.05);
+@WHITE10: rgba(255,255,255,0.1);
+@WHITE20: rgba(255,255,255,0.2);
+@WHITE25: rgba(255,255,255,0.25);
+@WHITE30: rgba(255,255,255,0.3);
+@WHITE40: rgba(255,255,255,0.4);
+@WHITE50: rgba(255,255,255,0.5);
+@WHITE60: rgba(255,255,255,0.6);
+@WHITE70: rgba(255,255,255,0.7);
+@WHITE80: rgba(255,255,255,0.8);
+@WHITE90: rgba(255,255,255,0.9);
+@WHITE:	#fff;
+
+.x4-root-element {
 	padding: 0;
 	margin: 0;
-	position: fixed;
-    left: 0;
+	left: 0;
     top: 0;
     right: 0;
 	bottom: 0;    
-	-webkit-font-smoothing: antialiased;
+	
+	-webkit-font-smoothing: subpixel-antialiased;
+    text-rendering: geometricprecision;
+
+	font-family: var( --x4-font );
+	font-size: var( --x4-font-size );
 }
 
 input,
@@ -46,11 +122,11 @@ textarea {
 	border: 1px solid transparent;
 	
 	&:focus {
-		border: 1px solid @selection-color;
+		border: 1px solid var( --x4-selection-color );
 	}
 
 	&::selection {
-		background-color: @selection-color;
+		background-color: var( --x4-selection-color );
 		color: #fff;
 	}
 }
@@ -72,6 +148,8 @@ textarea {
 }
 
 .x-comp {
+	user-select: none;
+	box-sizing: border-box;
 	position: relative;
 }
 
@@ -133,14 +211,12 @@ textarea {
 	}
 }
 
-@sizer-size: 4px;
-
 .x-sizer-overlay {
 	position: absolute;
 
 	&.top {
 		width: 100%;
-		height: @sizer-size;
+		height: var( --x4-sizer-size );
 		cursor: n-resize;
 		left: 0;
 		top: 0;
@@ -148,7 +224,7 @@ textarea {
 
 	&.bottom {
 		width: 100%;
-		height: @sizer-size;
+		height: var( --x4-sizer-size );
 		cursor: n-resize;
 		left: 0;
 		bottom: 0;
@@ -157,7 +233,7 @@ textarea {
 	&.right {
 		top: 0;
 		right: 0;
-		width: @sizer-size;
+		width: var( --x4-sizer-size );
 		height: 100%;
 		cursor: e-resize;
 	}
@@ -165,19 +241,19 @@ textarea {
 	&.left {
 		top: 0;
 		left: 0;
-		width: @sizer-size;
+		width: var( --x4-sizer-size );
 		height: 100%;
 		cursor: e-resize;
 	}
 }
 
 .x-sizer-bottom {
-    padding-bottom: @sizer-size;
+    padding-bottom: var( --x4-sizer-size );
 }
 
 .x-icon {
 	&:before {
-		font-family: @fa-style-family;
+		font-family: var( --x4-icon-font-family );
 	}
 	
 	display: inline-flex;
@@ -185,7 +261,7 @@ textarea {
 	text-align: center;
 	flex-direction: column;
 
-	&.x-svg-icon {
+	&.x-svg-icon, svg {
 		width: 1em;
 		height: 1em;
 	}
@@ -198,29 +274,23 @@ textarea {
 	outline: none;
 	cursor: pointer;
 
-	height: 2.5em;
+	height: 2rem;
 	padding: 8px;
-	border: 1px solid var( --button-border );
 	overflow: hidden;
 	
-	background-color: var( --button-color );
-	color: @WHITE60;
+	border: 1px solid var( --x4-default-border-color );
+	background-color: var( --x4-button-color );
+	color: var( --x4-button-text-color );
 
 	.x-icon {
 		margin: 0 4px;
-		//width: 1em;
-		color: var( --button-icon-color );
+		color: inherit;
 	}
 
-	&:not(.x-disable) {
-		&:focus {
-			border-color: white;
-		}
-
-		&.x-active {
-			color: white;
-			background-color: @WHITE20;
-		}
+	&:focus {
+		border-color: var( --x4-focus-color );
+		background-color: var( --x4-focus-color );
+		color: white;
 	}
 
 	&.x-disable {
@@ -289,15 +359,15 @@ textarea {
 }
 
 ::-webkit-scrollbar {
-	width: var( --scrollbar-width );
-	height: var( --scrollbar-width );
-	background-color: var( --scrollbar-bk );
+	width: var( --x4-scrollbar-width );
+	height: var( --x4-scrollbar-width );
+	background-color: var( --x4-scrollbar-background );
 	box-sizing: border-box;
 }
 
 ::-webkit-scrollbar-thumb {
-	background-color: var( --scrollbar-thumb );
-	//border-radius: calc( var( --scrollbar-width ) / 2 - 1px );
+	background-color: var( --x4-scrollbar-thumb );
+	//border-radius: calc( var( --x4-scrollbar-width ) / 2 - 1px );
 }
 
 .x-circular-chart {
@@ -378,23 +448,25 @@ textarea {
 		}
 
 		&::selection {
-			background-color: @selection-color;
+			background-color: var( --x4-selection-color );
 			color: #fff;
 		}
-	}
 
-	&:focus {
-		outline: none;
+		&:focus {
+			border-bottom-color: var( --x4-focus-color );
+		}
+	}
 
+	&:focus-within {
 		&> .x-label {
-			color: @focus-color;
+			color: var( --x4-focus-color );
 		}
 	}
 
 	.x-button.gadget {
-
-		font-size: @def-font-size;
-		background-color: @BLACK10;
+		background-color: transparent;
+		font-size: var( --x4-font-size );
+		color: black;
 		border: none;
 
 		margin: 0;
@@ -402,28 +474,27 @@ textarea {
 		height: 2em;
 		margin-top: 1px;
 
-		.x-icon {
-			font-size: 85%;
-			padding-right: 2px;
+		&:focus {
+			color: var( --x4-focus-color );
 		}
 	}
 
 	&:focus {
 		.x-button.gadget,
 		input {
-			border-color: @focus-color;
+			border-color: var( --x4-focus-color );
 		}
 
 		input {
-			border-bottom: 1px solid @focus-color;
+			border-bottom: 1px solid var( --x4-focus-color );
 		}
 	
 		.x-button.gadget {
-			color: @focus-color;
+			color: var( --x4-focus-color );
 		}			
 	
 		.x-label {
-			color: @focus-color;
+			color: var( --x4-focus-color );
 		}
 	}
 
@@ -438,15 +509,6 @@ textarea {
 		position: absolute;
 		top: -2px;
 		z-index: 1;
-		
-		&:before {
-			font-family: @fa-style-family;
-			content: @fa-var-circle-exclamation;
-			padding-right: 3px;
-			position: absolute;
-			left: 1px;
-			top: 6px;
-		}
 	}
 
 	&.x-required .label1:before {
@@ -457,7 +519,7 @@ textarea {
 	&.x-error {
 		input {
 			border-bottom: none;
-			border-left: 4px solid @error-color;
+			border-left: 4px solid var( --x4-error-color );
 		}
 	}
 }
@@ -488,20 +550,20 @@ textarea {
 		.x-button.gadget,
 		input,
 		.x-fake-input {
-			border-color: @focus-color;
+			border-color: var( --x4-focus-color );
 		}
 
 		input,
 		.x-fake-input {
-			border-bottom: 1px solid @focus-color;
+			border-bottom: 1px solid var( --x4-focus-color );
 		}
 	
 		.x-button.gadget {
-			color: @focus-color;
+			color: var( --x4-focus-color );
 		}			
 	
 		.x-label {
-			color: @focus-color;
+			color: var( --x4-focus-color );
 		}
 	}
 	
@@ -577,7 +639,7 @@ textarea {
 
 	&:focus-within {
 		text-decoration: underline;
-		color: @selection-color;
+		color: var( --x4-selection-color );
 	}
 }
 
@@ -623,7 +685,7 @@ textarea {
 	}
 
 	input:checked + .x-label:before {
-		background-color: @selection-color;
+		background-color: var( --x4-selection-color );
 	}
 
 	input:checked + .x-label:after {
@@ -688,15 +750,6 @@ textarea {
 	}
 }
 
-
-.x-popup-menu-item {
-	&:after {
-		content: @fa-var-chevron-right;
-		font-family: @fa-style-family;
-		font-size: 80%;
-	}
-}
-
 .x-menu-separator {
 	margin-top: 4px;
 	border-top: 1px solid @BLACK10;
@@ -705,7 +758,7 @@ textarea {
 
 .x-link {
 	padding: 4px;
-    color: @selection-color;
+    color: var( --x4-selection-color );
 	cursor: pointer;
 	outline: none;
 	
@@ -713,7 +766,7 @@ textarea {
 	align-items: center;
 	
 	&:focus {
-		color: @selection-color;
+		color: var( --x4-selection-color );
 		text-decoration: underline;
 	}
 
@@ -747,17 +800,13 @@ textarea {
 	}
 
 	.h-container {
-		margin-right: var( --scrollbar-width );
+		margin-right: var( --x4-scrollbar-width );
 	}
 }
 
 .x-list-view {
 	
-	border: 1px solid transparent;
-
-	&:focus {
-		outline: none;
-	}
+	border: 1px solid var( --x4-default-border-color );
 
 	.x-list-item {
 		padding: 4px;
@@ -765,12 +814,12 @@ textarea {
 		white-space: nowrap;
 		
 		&:hover {
-			background-color: fadeout( @selection-color, 10% );
+			background-color: var( --x4-hover-color );
 			color: white;
 		}
 		
 		&.x-selected {
-			background-color: @selection-color;
+			background-color: var( --x4-selection-color );
 			color: white;
 		}
 	
@@ -779,6 +828,11 @@ textarea {
 		}
 	}
 
+	&:focus {
+		outline: none;
+		border-color: var( --x4-focus-color );
+	}
+
 	.gadgets {
 		border-top: 1px solid @BLACK50;
 		background-color: @BLACK10;
@@ -804,7 +858,7 @@ textarea {
 		width: 200vw;
 		height: 200vh;
 	
-		background-color: fadeout( @selection-color, 40% );
+		background-color: var( --x4-mask-color );
 		z-index: 999;
 	}
 }
@@ -813,6 +867,9 @@ textarea {
 	position: absolute;
 	z-index: 1000;
 
+	font-family: var( --x4-font );
+	font-size: var( --x4-font-size );
+	
 	&:focus {
 		outline: none;
 	}
@@ -837,6 +894,8 @@ textarea {
 				color: black;
 			}
 		}
+
+		border-bottom: 1px solid var( --x4-default-border-color );
 	}
 	
 	&>.body {
@@ -846,19 +905,23 @@ textarea {
 }
 
 .x-dialog {
-
 	border: 0.5px solid @BLACK20;
+
 	.z-float-8;
 		
 	& > .title {
-		height: 3rem;
+		height: 2rem;
 		color: white;
 		padding: 0 8px;
 		display: flex;
 		align-items: center;
+		background-color: var( --x4-selection-color );
 		
 		.x-icon {
-			width: 1.7em;
+			width: 2em;
+			height: 1.9em;
+			padding: 4px;
+
 			text-align: center;
 			cursor: pointer;
 			
@@ -867,15 +930,29 @@ textarea {
 			}
 		}
 
+		.x-icon.close-btn:hover {
+			background-color: var( --x4-error-color );
+			color: white;
+		}
+
 		.x-label {
 			border-bottom: none;
 			padding: 0;
 		}
+
+		.res-btn {
+			display: none;
+		}
 	}
 
 	&.maximized > .title {
-		.max-btn:before {
-			content: @fa-var-window-restore;
+		.min-btn,
+		.max-btn {
+			display: none;
+		}
+
+		.res-btn {
+			display: block;
 		}
 	}
 
@@ -986,7 +1063,8 @@ textarea {
 }
 
 .x-form {
-	background-color: @form-color;
+	background-color: var( --x4-form-color );
+	margin-block-end: 0;
 	padding: 8px;
 	min-width: 250px;
 	min-height: 50px;
@@ -1016,28 +1094,6 @@ textarea {
 	}
 }
 
-.x-panel {
-	&>.title {
-		border-bottom: 1px solid @BLACK10;
-	}
-}
-
-.x-button {
-	background-color: @WHITE25;
-	border-color: transparent;
-	font-family: @def-font;
-	font-size: @def-font-size;
-
-	.x-icon {
-		width: 1.5em;
-	}
-	
-	&:focus {
-		border-color: @WHITE40;
-		color: black;
-	}
-}
-
 .x-hidden {
 	display: none ! important;
 }
@@ -1078,7 +1134,7 @@ textarea {
 
 	&>.title {
 		background: none;
-		background-color: @error-color;
+		background-color: var( --x4-error-color );
 		height: 2.5em;
 
 		.x-label {
@@ -1101,7 +1157,7 @@ textarea {
 		
 		.icon {
 			font-size: 48px;
-			color: @error-color;
+			color: var( --x4-error-color );
 			margin-right: 8px;
 		}
 
@@ -1118,7 +1174,7 @@ textarea {
 			padding-top: 8px;
 
 			.x-button {
-				background-color: @error-color;
+				background-color: var( --x4-error-color );
 				color: white;
 			}
 
@@ -1165,20 +1221,27 @@ textarea {
 			//text-transform: capitalize;
 			height: unset;
 
-			&.sort:before {
-				content: @fa-var-arrow-down-long;
-				font-family: @fa-style-family;
-				padding-right: 4px;
+			&.sort {
+				background-image: var( --x4-icon-arrow-down-long );
+				background-repeat: no-repeat;
+				background-size: 1rem 1rem;
+				background-position: right 0 top 6px;
+				padding-right: calc( 1rem + 4px );
 			}
 
-			&.sort.desc:before {
-				content: @fa-var-arrow-up-long;
-				font-family: @fa-style-family;
-				padding-right: 4px;
+			&.sort.desc {
+				background-image: var( --x4-icon-arrow-up-long );
 			}
 		}
 	}
 
+	.x-header {
+		.x-cell {
+			display: flex;
+			align-items: center;
+		}
+	}
+
 	.x-row {
 		position: absolute;
 		width: 100%;
@@ -1223,7 +1286,7 @@ textarea {
 		}
 
 		&.x-selected {
-			background-color: @selection-color;
+			background-color: var( --x4-selection-color );
 
 			.x-cell {
 				color: white;
@@ -1257,7 +1320,7 @@ textarea {
 
 	&:focus {
 		.x-cell.x-selected {
-			background-color: @selection-color;
+			background-color: var( --x4-selection-color );
 			color: white;
 		}
 	}
@@ -1278,17 +1341,18 @@ textarea {
 
 	.x-button {
 		background-color: transparent;
-		color: var( --base-color );
+		color: var( --x4-base-color );
 		border: none;
-		border-bottom: 1px solid fadeout(@base-color,90%);
+		//border-bottom: 1px solid fadeout(var( --x4-base-color ),90%);
+		
 		min-height: 2em;
 
-		.x-icon {
-			color: fadeout( @base-color, 50% );
-		}
+		//.x-icon {
+		//	color: fadeout( var( --x4-base-color ), 50% );
+		//}
 
 		&:hover {
-			background-color: fadeout(@base-color,30%);
+			background-color: var( --x4-hover-color );
 			color: white;
 
 			.x-icon {
@@ -1297,7 +1361,7 @@ textarea {
 		}		
 
 		&.x-active {
-			background-color: @base-color;
+			background-color: var( --x4-base-color );
 			color: white;
 
 			.x-icon {
@@ -1306,7 +1370,7 @@ textarea {
 		}
 
 		&.x-active:hover {
-			background-color: fadeout(@base-color,20%);
+			//background-color: fadeout(var( --x4-base-color ),20%);
 			color: white;
 
 			.x-icon {
@@ -1354,11 +1418,11 @@ textarea {
 		position: absolute;
 		left: 6px;
 		top: 7px;
-		color: fadeout(darken(@base-color,5%),10%);
+		color: var( --x4-tip-background );	
 	}
 
 	.x-label {
-		background-color: @selection-color;
+		background-color: var( --x4-selection-color );
 		white-space: break-spaces;
 		display: inline-block;
 		padding: 6px;
@@ -1367,7 +1431,7 @@ textarea {
 }
 
 .x-search-bar {
-	background-color: @base-color;
+	background-color: var( --x4-base-color );
 	height: 2em;
 }
 
@@ -1466,7 +1530,7 @@ textarea {
 		//border-bottom: 1px solid @BLACK10;
 
 		&:hover {
-			background-color: fadeout(@selection-color,90%);
+			background-color: var( --x4-hover-color );
 			border-radius: 4px;
 		}
 
@@ -1481,7 +1545,7 @@ textarea {
 
 		.today {
 			font-weight: bold;
-			background-color: @error-color;
+			background-color: var( --x4-error-color );
 				
 			span {
 				//border: 2px solid #013e69;
@@ -1506,7 +1570,7 @@ textarea {
 		}
 
 		.day:hover {
-			background-color: fadeout(@selection-color,50%);
+			background-color: var( --x4-hover-color );
 			color: white;
 		}
 	}
@@ -1790,7 +1854,7 @@ textarea {
 
 		//&::before {
 		//	content: attr( icon );
-		//	font-family: @fa-style-family;
+		//	font-family: var( --x4-icon-font-family );
 		//	display: inline-block;
 		//	width: 1em;
 		//	color: @BLACK40;
@@ -1835,7 +1899,7 @@ textarea {
 }
 
 .x-tooltip.error {
-	background-color: @error-color;
+	background-color: var( --x4-error-color );
 	padding: 0 6px;
     margin-left: 3px;
 	position: absolute;
@@ -1872,7 +1936,7 @@ textarea {
 	
 	textarea {
 		font-family: monospace;
-		font-size: @def-font-size;
+		font-size: var( --x4-font-size );
 		padding: 2px;
 
 		resize: none;
@@ -1881,7 +1945,7 @@ textarea {
 		width: 100%;
 
 		&:focus {
-			border: 1px solid @selection-color
+			border: 1px solid var( --x4-selection-color )
 		}
 
 		color: transparent;
@@ -1895,7 +1959,7 @@ textarea {
 
 	.x-syntax-hiliter {
 		font-family: monospace;
-		font-size: @def-font-size;
+		font-size: var( --x4-font-size );
 		padding: 2px;
 		border: 1px solid transparent;
 		overflow: hidden;