Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.

This was SVN commit r15144.
This commit is contained in:
JoshuaJB 2014-05-11 03:25:34 +00:00
parent 056d740e7f
commit d70abd548a
20 changed files with 198 additions and 18 deletions

View File

@ -273,6 +273,7 @@
- Buttons - - Buttons -
========================================== ==========================================
--> -->
<!-- RED -->
<sprite name="ModernButtonRed"> <sprite name="ModernButtonRed">
<!-- Left --> <!-- Left -->
<image texture="global/modern/button/red-unselected-left-top.png" <image texture="global/modern/button/red-unselected-left-top.png"
@ -413,6 +414,147 @@
size="100%-8 100%-8 100% 100%" size="100%-8 100%-8 100% 100%"
/> />
</sprite> </sprite>
<!-- YELLOW -->
<sprite name="ModernButtonYellow">
<!-- Left -->
<image texture="global/modern/button/yellow-unselected-left-top.png"
real_texture_placement="0 0 8 8"
size="0 0 8 8"
/>
<image texture="global/modern/button/yellow-unselected-left-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="0 8 8 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-left-bottom.png"
real_texture_placement="0 0 8 8"
size="0 100%-8 8 100%"
/>
<!-- Center -->
<image texture="global/modern/button/yellow-unselected-center-top.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 0 100%-8 8"
/>
<image texture="global/modern/button/yellow-unselected-center-center.png"
real_texture_placement="0 0 128 16"
texture_size="0 0 128 16"
size="8 8 100%-8 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-center-bottom.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 100%-8 100%-8 100%"
/>
<!-- Right -->
<image texture="global/modern/button/yellow-unselected-right-top.png"
real_texture_placement="0 0 8 8"
size="100%-8 0 100% 8"
/>
<image texture="global/modern/button/yellow-unselected-right-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="100%-8 8 100% 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-right-bottom.png"
real_texture_placement="0 0 8 8"
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<sprite name="ModernButtonYellowOver">
<effect add_color="60 42 42 0"/>
<!-- Left -->
<image texture="global/modern/button/yellow-unselected-left-top.png"
real_texture_placement="0 0 8 8"
size="0 0 8 8"
/>
<image texture="global/modern/button/yellow-unselected-left-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="0 8 8 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-left-bottom.png"
real_texture_placement="0 0 8 8"
size="0 100%-8 8 100%"
/>
<!-- Center -->
<image texture="global/modern/button/yellow-unselected-center-top.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 0 100%-8 8"
/>
<image texture="global/modern/button/yellow-unselected-center-center.png"
real_texture_placement="0 0 128 16"
texture_size="0 0 128 16"
size="8 8 100%-8 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-center-bottom.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 100%-8 100%-8 100%"
/>
<!-- Right -->
<image texture="global/modern/button/yellow-unselected-right-top.png"
real_texture_placement="0 0 8 8"
size="100%-8 0 100% 8"
/>
<image texture="global/modern/button/yellow-unselected-right-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="100%-8 8 100% 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-right-bottom.png"
real_texture_placement="0 0 8 8"
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<sprite name="ModernButtonYellowDisabled">
<effect grayscale=""/>
<!-- Left -->
<image texture="global/modern/button/yellow-unselected-left-top.png"
real_texture_placement="0 0 8 8"
size="0 0 8 8"
/>
<image texture="global/modern/button/yellow-unselected-left-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="0 8 8 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-left-bottom.png"
real_texture_placement="0 0 8 8"
size="0 100%-8 8 100%"
/>
<!-- Center -->
<image texture="global/modern/button/yellow-unselected-center-top.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 0 100%-8 8"
/>
<image texture="global/modern/button/yellow-unselected-center-center.png"
real_texture_placement="0 0 128 16"
texture_size="0 0 128 16"
size="8 8 100%-8 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-center-bottom.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 100%-8 100%-8 100%"
/>
<!-- Right -->
<image texture="global/modern/button/yellow-unselected-right-top.png"
real_texture_placement="0 0 8 8"
size="100%-8 0 100% 8"
/>
<image texture="global/modern/button/yellow-unselected-right-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="100%-8 8 100% 100%-8"
/>
<image texture="global/modern/button/yellow-unselected-right-bottom.png"
real_texture_placement="0 0 8 8"
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<!-- <!--
========================================== ==========================================
- Basic. - - Basic. -

View File

@ -142,4 +142,15 @@
text_valign="center" text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg" sound_pressed="audio/interface/ui/ui_button_click.ogg"
/> />
<style name="ModernButtonYellow"
sprite="ModernButtonYellow"
sprite_disabled="ModernButtonYellowDisabled"
sprite_over="ModernButtonYellowOver"
sprite_pressed="ModernButtonRed"
font="sans-bold-14"
textcolor="black"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
</styles> </styles>