UI Theme: Minor improvements on contrast and consistency.

* 3D Viewport grid adjustment to work with both bright/dark viewports (e.g. 2D Animation)
* Match header/grid of NLA with Dopesheet/Graph Editor.
* Avoid pure whites in unselected/inactive text.
* Darken the scrollbar numbers.

1 files changed, 44 insertions, 44 deletions

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index eae3f0bf5be..b7b9c1aa9b8 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -24,7 +24,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x585858ff),
 			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0x3e3e3eff),
-			.text = RGBA(0xebebebff),
+			.text = RGBA(0xd9d9d9ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadedown = -5,
 			.roundness = 0.2f,
@@ -34,17 +34,17 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x585858ff),
 			.inner_sel = RGBA(0x5680c2ff),
 			.item = RGBA(0xffffffff),
-			.text = RGBA(0xf2f2f2ff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadedown = -5,
 			.roundness = 0.2f,
 		},
 		.wcol_toolbar_item = {
 			.outline = RGBA(0x373737ff),
-			.inner = RGBA(0x585858ff),
+			.inner = RGBA(0x313131ff),
 			.inner_sel = RGBA(0x5680c2ff),
 			.item = RGBA(0xffffff8f),
-			.text = RGBA(0xffffffff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -53,7 +53,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x1f1f1fff),
 			.inner_sel = RGBA(0x808080ff),
 			.item = RGBA(0x333333ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shaded = 1,
 			.shadetop = -3,
@@ -64,7 +64,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x595959ff),
 			.inner_sel = RGBA(0x597cb3e6),
 			.item = RGBA(0xffffffff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 5,
 			.shadedown = -5,
@@ -75,7 +75,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x666666ff),
 			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0xffffffff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadedown = -15,
 			.roundness = 0.2f,
@@ -85,7 +85,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x595959ff),
 			.inner_sel = RGBA(0x5680c2e6),
 			.item = RGBA(0x191919ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -94,7 +94,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x595959ff),
 			.inner_sel = RGBA(0xb3b3b366),
 			.item = RGBA(0x333333ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -103,18 +103,18 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x595959ff),
 			.inner_sel = RGBA(0x333333ff),
 			.item = RGBA(0x5680c2e6),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shaded = 1,
 			.shadetop = -4,
 			.roundness = 0.2f,
 		},
 		.wcol_tab = {
-			.outline = RGBA(0x2d2d2dff),
+			.outline = RGBA(0x202020ff),
 			.inner = RGBA(0x2b2b2bff),
 			.inner_sel = RGBA(0x424242ff),
 			.item = RGBA(0x2d2d2dff),
-			.text = RGBA(0xa6a6a6ff),
+			.text = RGBA(0x989898ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -123,7 +123,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x2c2c2cff),
 			.inner_sel = RGBA(0x696e76ff),
 			.item = RGBA(0xe6e6e6ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xd9d9d9ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 10,
 			.shadedown = -10,
@@ -131,10 +131,10 @@ const bTheme U_theme_default = {
 		},
 		.wcol_pulldown = {
 			.outline = RGBA(0x4d4d4dff),
-			.inner = RGBA(0x2e2e2e99),
+			.inner = RGBA(0x2e2e2ecc),
 			.inner_sel = RGBA(0x597cb3ff),
 			.item = RGBA(0x727272ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xd9d9d9ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 25,
 			.shadedown = -20,
@@ -145,7 +145,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x1f1f1fef),
 			.inner_sel = RGBA(0x585858ff),
 			.item = RGBA(0x727272ff),
-			.text = RGBA(0xb3b3b3ff),
+			.text = RGBA(0xa5a5a5ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 25,
 			.shadedown = -20,
@@ -154,7 +154,7 @@ const bTheme U_theme_default = {
 		.wcol_menu_item = {
 			.inner_sel = RGBA(0x597cb3e6),
 			.item = RGBA(0xffffff8f),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 38,
 			.roundness = 0.2f,
@@ -164,7 +164,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x19191aef),
 			.inner_sel = RGBA(0x19191aef),
 			.item = RGBA(0x19191aef),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 25,
 			.shadedown = -20,
@@ -175,7 +175,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x00000033),
 			.inner_sel = RGBA(0x696e76ff),
 			.item = RGBA(0x191919ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -184,7 +184,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x67676700),
 			.inner_sel = RGBA(0xb3b3b3ff),
 			.item = RGBA(0x676767ff),
-			.text = RGBA(0xffffffff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 5,
 			.shadedown = -5,
@@ -195,7 +195,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x2c2c2cff),
 			.inner_sel = RGBA(0x5680c2ff),
 			.item = RGBA(0x5680c2ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -204,7 +204,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x2d2d2d00),
 			.inner_sel = RGBA(0x696e76ff),
 			.item = RGBA(0xb3b3b3ff),
-			.text = RGBA(0xe1e1e1ff),
+			.text = RGBA(0xe6e6e6ff),
 			.text_sel = RGBA(0xffffffff),
 			.roundness = 0.2f,
 		},
@@ -213,7 +213,7 @@ const bTheme U_theme_default = {
 			.inner = RGBA(0x212121ef),
 			.inner_sel = RGBA(0x597cb3ff),
 			.item = RGBA(0x585858ff),
-			.text = RGBA(0xeeeeeeff),
+			.text = RGBA(0xd9d9d9ff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 10,
 			.shadedown = -10,
@@ -253,7 +253,7 @@ const bTheme U_theme_default = {
 	.tbuts = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xd4d4d4ff),
-		.text = RGBA(0xe5e5e5ff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -278,7 +278,7 @@ const bTheme U_theme_default = {
 	},
 	.tv3d = {
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x42424200),
 		.header_text = RGBA(0xeeeeeeff),
@@ -300,7 +300,7 @@ const bTheme U_theme_default = {
 			.gradient = RGBA(0x39393900),
 			.high_gradient = RGBA(0x393939ff),
 		},
-		.grid = RGBA(0x232323ff),
+		.grid = RGBA(0xa7a7a733),
 		.wire = RGBA(0x000000ff),
 		.wire_edit = RGBA(0x111111ff),
 		.select = RGBA(0xed5700ff),
@@ -369,7 +369,7 @@ const bTheme U_theme_default = {
 	.tfile = {
 		.back = RGBA(0x35353500),
 		.title = RGBA(0xffffffff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x2e2e2eff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -395,7 +395,7 @@ const bTheme U_theme_default = {
 	.tipo = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xffffffff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0x000000ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x2e2e2eff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -446,7 +446,7 @@ const bTheme U_theme_default = {
 	.tinfo = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -480,7 +480,7 @@ const bTheme U_theme_default = {
 	.tact = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0x000000ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -535,11 +535,11 @@ const bTheme U_theme_default = {
 		.anim_preview_range = RGBA(0xa14d0066),
 	},
 	.tnla = {
-		.back = RGBA(0x35353500),
+		.back = RGBA(0x42424200),
 		.title = RGBA(0xffffffff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0x000000ff),
 		.text_hi = RGBA(0xffffffff),
-		.header = RGBA(0x212121ff),
+		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x4b4b4bff),
@@ -550,9 +550,9 @@ const bTheme U_theme_default = {
 		.button_title = RGBA(0xffffffff),
 		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
-		.list = RGBA(0x2e2e2eff),
+		.list = RGBA(0x333333ff),
 		.list_title = RGBA(0xffffffff),
-		.list_text = RGBA(0xccccccff),
+		.list_text = RGBA(0xb8b8b8ff),
 		.list_text_hi = RGBA(0xccccccff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -560,7 +560,7 @@ const bTheme U_theme_default = {
 			.sub_back = RGBA(0x0000003e),
 		},
 		.shade1 = RGBA(0x96969600),
-		.grid = RGBA(0x5e5e5eff),
+		.grid = RGBA(0x2a2a2aff),
 		.strip = RGBA(0x0c0a0a80),
 		.strip_select = RGBA(0xff8c00ff),
 		.cframe = RGBA(0x5680c2ff),
@@ -587,7 +587,7 @@ const bTheme U_theme_default = {
 	.tseq = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0x000000ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -629,7 +629,7 @@ const bTheme U_theme_default = {
 	.tima = {
 		.back = RGBA(0x44444400),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -683,7 +683,7 @@ const bTheme U_theme_default = {
 	.text = {
 		.back = RGBA(0x30303000),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x42424200),
 		.header_text = RGBA(0xeeeeeeff),
@@ -751,7 +751,7 @@ const bTheme U_theme_default = {
 	.tnode = {
 		.back = RGBA(0x23232300),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -806,7 +806,7 @@ const bTheme U_theme_default = {
 	.tuserpref = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -831,7 +831,7 @@ const bTheme U_theme_default = {
 	.tconsole = {
 		.back = RGBA(0x30303000),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -862,7 +862,7 @@ const bTheme U_theme_default = {
 	.tclip = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xeeeeeeff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
@@ -907,7 +907,7 @@ const bTheme U_theme_default = {
 	.ttopbar = {
 		.back = RGBA(0x42424200),
 		.title = RGBA(0xffffffff),
-		.text = RGBA(0xffffffff),
+		.text = RGBA(0xe6e6e6ff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x232323ff),
 		.header_text = RGBA(0xeeeeeeff),