Merge branch 'master' into martin-t/dmgtext

[xonotic/xonotic-data.pk3dir.git] / gfx / menu / luma / skinvalues.txt

diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
index 1e87e8869ec5d9443c3147dde51298a675738f94..cfaa1e5804da071f55675621780791861d5b3fc2 100644 (file)
--- a/gfx/menu/luma/skinvalues.txt
+++ b/gfx/menu/luma/skinvalues.txt
@@ -33,8 +33,10 @@ COLOR_CAMPAIGN_SELECTABLE     '0.96 0.99 1'
 // charmap
 ALPHA_CHARMAP_CHAR            0.85
 COLOR_CHARMAP_CHAR            '1 1 1'
-ALPHA_CHARMAP_FOCUS           0.85
-COLOR_CHARMAP_FOCUS           '0.09 0.42 0.69'
+
+// crosshairpicker
+ALPHA_CROSSHAIRPICKER_CROSSHAIR 0.6
+COLOR_CROSSHAIRPICKER_CROSSHAIR '1 1 1'
 
 // checkbox
 COLOR_CHECKBOX_C              '1 1 1'
@@ -120,10 +122,13 @@ COLOR_HEADER                  '0.96 0.99 1'
 FONTSIZE_NORMAL               12
 FONTSIZE_TITLE                16
 FONTSIZE_TOOLTIP              12
-HEIGHT_NORMAL                 1.5
-HEIGHT_TITLE                  1.5
+HEIGHT_NORMAL                 1.45
+HEIGHT_TITLE                  1.45
 HEIGHT_ZOOMEDTITLE            -1
 
+// gametypelist
+BOOL_GAMETYPELIST_ICON_BLUR   0
+
 // inputbox
 COLOR_INPUTBOX_F              '1 1 1'
 COLOR_INPUTBOX_N              '1 1 1'
@@ -142,6 +147,9 @@ ALPHA_LISTBOX_SELECTED        1
 COLOR_LISTBOX_SELECTED        '0.97 0.56 0.27'
 ALPHA_LISTBOX_WAITING         0.8
 COLOR_LISTBOX_WAITING         '0.73 0.82 0.9'
+ALPHA_LISTBOX_FOCUSED         0.55
+FADEALPHA_LISTBOX_FOCUSED     0.3
+COLOR_LISTBOX_FOCUSED         '0.09 0.42 0.69'
 
 // mainmenu
 ALPHAS_MAINMENU               '0.8 0.9 1'
@@ -197,7 +205,6 @@ COLOR_SLIDER_D                '1 1 1'
 COLOR_SLIDER_F                '1 1 1'
 COLOR_SLIDER_N                '1 1 1'
 COLOR_SLIDER_S                '1 1 1'
-TOLERANCE_SLIDER              '0.2 2 0'
 WIDTH_SLIDERTEXT              0.333333333333
 
 // tooltip