Skip to content

Commit 140b104

Browse files
sqvillesqville
committed
more updates to dark version
1 parent a665c00 commit 140b104

File tree

5 files changed

+90
-24
lines changed

5 files changed

+90
-24
lines changed

‎source/class/ville/theme/clean/Appearance.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ qx.Theme.define("ville.theme.clean.Appearance",
980980

981981
style : function(states)
982982
{
983-
983+
984984
return {
985985
decorator : "menu-checkbox-checked",
986986
width: 17,
@@ -1348,8 +1348,8 @@ qx.Theme.define("ville.theme.clean.Appearance",
13481348

13491349
return {
13501350
decorator : decorator,
1351-
width: 18,
1352-
height: 18,
1351+
width: 16,
1352+
height: 16,
13531353
backgroundColor : backgroundColor
13541354
};
13551355
}
@@ -1380,6 +1380,8 @@ qx.Theme.define("ville.theme.clean.Appearance",
13801380

13811381
style : function(states)
13821382
{
1383+
qx.Class.include(qx.ui.decoration.Decorator, ville.theme.clean.MClipPath);
1384+
13831385
//var icon;
13841386
var decorator = "checkbox";
13851387

@@ -1421,7 +1423,7 @@ qx.Theme.define("ville.theme.clean.Appearance",
14211423
return {
14221424
//icon: icon,
14231425
icon : "",
1424-
decorator : decorator,
1426+
//decorator : decorator,
14251427
backgroundColor : "background",
14261428
padding : 0,
14271429
gap: 10
@@ -1434,16 +1436,17 @@ qx.Theme.define("ville.theme.clean.Appearance",
14341436
style : function(states)
14351437
{
14361438

1437-
/*
1439+
14381440
var decorator = "checkbox";
14391441

14401442
if (states.focused && !states.invalid) {
14411443
decorator = "checkbox-focused";
14421444
}
14431445

14441446
decorator += states.invalid && !states.disabled ? "-invalid" : "";
1445-
*/
1447+
14461448

1449+
/*
14471450
var decorator = "ville-icon-checkbox-checked";
14481451
var sheet = qx.ui.style.Stylesheet.getInstance();
14491452
var prefix = qx.theme.manager.Decoration.CSS_CLASSNAME_PREFIX;
@@ -1455,8 +1458,9 @@ qx.Theme.define("ville.theme.clean.Appearance",
14551458
var css1 = 'clip-path: path("M 14.05 3.49 c 0.28 0.3 0.27 0.77 -0.04 1.06 l -7.93 7.47 A 0.85 0.85 0 0 1 4.9 12 L 2.22 9.28 a 0.75 0.75 0 1 1 1.06 -1.06 l 2.24 2.27 l 7.47 -7.04 a 0.75 0.75 0 0 1 1.06 0.04 Z")';
14561459
sheet.addRule(rule1, css1);
14571460
}
1458-
1459-
//var padding;
1461+
*/
1462+
1463+
decorator = "ville-icon-checkbox-checked";
14601464
var bgcolor = "text";
14611465
// Checked
14621466
if (states.checked) {
@@ -1497,7 +1501,7 @@ qx.Theme.define("ville.theme.clean.Appearance",
14971501
decorator: decorator,
14981502
width: 17,
14991503
height: 17,
1500-
padding : 0,
1504+
padding : 1,
15011505
//padding: padding,
15021506
//backgroundColor : states.undetermined ? bckgrdcolr : "background"
15031507
backgroundColor : bgcolor

‎source/class/ville/theme/clean/Color.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ qx.Theme.define("ville.theme.clean.Color",
7171
"button-box-bright-checked" : "#babbbc",
7272
"button-box-dark-pressed" : "#F5F5F5",
7373
"border-lead" : "#888888",
74-
"button-text" : "rgba(0, 0, 0, 0.6)",
75-
"button-text-hovered" : "rgba(0, 0, 0, 0.8)",
76-
"button-text-pressed" : "rgba(0, 0, 0, 0.9)",
74+
"button-text" : "rgba(0, 0, 0, 1)",
75+
"button-text-hovered" : "rgba(0, 0, 0, 1)",
76+
"button-text-pressed" : "rgba(0, 0, 0, 1)",
7777
"button-focus-shadow" : "rgba(81, 167, 232, 0.8)",
7878

7979
//SQ New
@@ -87,9 +87,9 @@ qx.Theme.define("ville.theme.clean.Color",
8787
"progressbar-warning" : qx.core.Environment.get("css.rgba") ? "rgba(242, 192, 55, 1)" : "#F2C037",
8888
"progressbar-error" : qx.core.Environment.get("css.rgba") ? "rgba(219, 40, 40, 1)" : "#DB2828",
8989

90-
"ville-icon-base" : "rgba(0, 0, 0, 1)",
91-
"ville-arrow-gray" : qx.core.Environment.get("css.rgba") ? "rgba(0, 0, 0, 0.6)" : "#444444",
92-
"ville-arrow-med-gray" : qx.core.Environment.get("css.rgba") ? "rgba(0, 0, 0, 0.4)" : "#444444",
90+
"ville-icon-base" : [0, 0, 0],
91+
"ville-arrow-gray" : [0, 0, 0],
92+
"ville-arrow-med-gray" : [0, 0, 0],
9393

9494
// window
9595
"window-border" : "#2E3A46",
@@ -118,8 +118,8 @@ qx.Theme.define("ville.theme.clean.Color",
118118

119119
// text
120120
"text-combobox-listitem" : "rgba(0, 0, 0, 0.6)", //NOT USED
121-
"text" : "rgba(0, 0, 0, 0.8)",
122-
"text-darker" : "rgba(0, 0, 0, 0.9)",
121+
"text" : [0, 0, 0],
122+
"text-darker" : [0, 0, 0],
123123
"text-disabled" : "rgba(0, 0, 0, 0.4)",
124124
"text-selected" : "#000000",
125125
"text-placeholder" : "rgba(0, 0, 0, 0.4)",

‎source/class/ville/theme/clean/ColorDark.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ qx.Theme.define("ville.theme.clean.ColorDark",
114114
"border-separator" : "#858585",
115115

116116
// text
117-
"text-combobox-listitem" : "rgba(0, 0, 0, 0.6)", //NOT USED
117+
"text-combobox-listitem" : "rgba(255, 255, 255, 0.6)", //NOT USED
118118
"text" : "#ffffff",//"rgba(0, 0, 0, 0.8)",
119119
"text-darker" : "rgba(255, 255, 255, 0.8)",
120-
"text-disabled" : "#ffffff",//"rgba(0, 0, 0, 0.4)",
121-
"text-selected" : "#000000",
122-
"text-placeholder" : "rgba(0, 0, 0, 0.4)",
120+
"text-disabled" : "rgba(255, 255, 255, 0.4)",
121+
"text-selected" : "#ffffff",
122+
"text-placeholder" : "rgba(255, 255, 255, 0.4)",
123123

124124
// tooltip
125125
"tooltip" : "#FFFFE1",

‎source/class/ville/theme/clean/Decoration.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -325,18 +325,24 @@ qx.Theme.define("ville.theme.clean.Decoration",
325325
{
326326
style :
327327
{
328-
radius : 1,
328+
radius : 3,
329329
color : "text",
330330
style : "solid",
331-
width : 0
331+
width : 1,
332+
innerColor: "text",
333+
innerWidth: 1,
334+
clipPath: 'path("M 14.05 3.49 c 0.28 0.3 0.27 0.77 -0.04 1.06 l -7.93 7.47 A 0.85 0.85 0 0 1 4.9 12 L 2.22 9.28 a 0.75 0.75 0 1 1 1.06 -1.06 l 2.24 2.27 l 7.47 -7.04 a 0.75 0.75 0 0 1 1.06 0.04 Z")'
332335
}
333336
},
334337

335338
"ville-icon-checkbox-unchecked" :
336339
{
337340
style :
338341
{
339-
width : 0
342+
radius : 3,
343+
color : "text",
344+
style : "solid",
345+
width : 1
340346
}
341347
},
342348

‎source/class/ville/theme/clean/MClipPath.js

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/* ************************************************************************
2+
3+
SQville
4+
5+
Copyright:
6+
None
7+
8+
License:
9+
MIT
10+
11+
Authors:
12+
* Chris Eskew (sqville@gmail.com)
13+
14+
************************************************************************ */
15+
/**
16+
* Mixin responsible for setting the css transition properties of a widget
17+
* This mixin is usually used by {@link qx.ui.decoration.Decorator}.
18+
*
19+
*/
20+
qx.Mixin.define("ville.theme.clean.MClipPath", {
21+
properties: {
22+
/** clip-path */
23+
clipPath: {
24+
nullable: true,
25+
apply: "_applyClipPath"
26+
}
27+
},
28+
29+
members: {
30+
/**
31+
* Takes a styles map and adds the box shadow styles in place to the
32+
* given map. This is the needed behavior for
33+
* {@link qx.ui.decoration.Decorator}.
34+
*
35+
* @param styles {Map} A map to add the styles.
36+
*/
37+
_styleClipPath(styles) {
38+
var clippath = this.getClipPath();
39+
40+
if (clippath) {
41+
styles["clip-path"] = clippath;
42+
}
43+
},
44+
45+
// property apply
46+
_applyClipPath() {
47+
if (qx.core.Environment.get("qx.debug")) {
48+
if (this._isInitialized()) {
49+
throw new Error(
50+
"This decorator is already in-use. Modification is not possible anymore!"
51+
);
52+
}
53+
}
54+
}
55+
}
56+
});

0 commit comments

Comments
 (0)