diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-20 10:21:26 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-20 10:21:26 -0800 |
| commit | 9ea83e76f67406755a3a1ca5a8ac1d544e157e43 (patch) | |
| tree | 08ae7a53990bd18fe6aeda34d28fdf756190c658 /indra/newview/skins | |
| parent | 2feff5fe7495dddbaa7878d4e804ad2bea149971 (diff) | |
| parent | ba1bf891e54fbf30c674d5526a5a2040e1e23a1a (diff) | |
mergining in latest changes
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index afd8ee4ba1..0de217fc0d 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -11,9 +11,9 @@ <color name="EmphasisColor_35" value="0.38 0.694 0.573 0.35" /> - <color - name="BeaconColor" - value="1 .67 .2 1" /> + <color + name="BeaconColor" + value="0.749 0.298 0 1" /> <color name="White" value="1 1 1 1" /> @@ -526,6 +526,9 @@ name="MenuItemHighlightBgColor" reference="EmphasisColor_35" /> <color + name="MenuItemFlashBgColor" + reference="BeaconColor" /> + <color name="MenuItemHighlightFgColor" reference="White" /> <color |