Misc FlatUI adjustments

Clean up tabs, checkboxes, marketplacebtn, etc

19 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0004259883..838b6da5a8 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1027,13 +1027,13 @@
         value="0.1 0.1 0.1 1"/>
     <color
         name="ChatMentionFont"
-        value="0.3 0.82 1 1" />
+        reference="EmphasisColor" />
     <color
         name="ChatMentionHighlight"
-        value="0.82 0.91 0.98 0.15" />
+        value="0.82 0.91 0.98 0.10" />
     <color
         name="ChatSelfMentionHighlight"
-        value="1 1 0 0.35" />
+        value="0.82 0.91 0.98 0.10" />
     <color
         name="MentionFlashBgColor"
         value="1 1 0 0.5" />
diff --git a/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png
index cc310bbc26..91e44a4ffe 100644
--- a/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png
index 686251d568..826d939954 100644
--- a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png
index 3ed4d988f8..c023486e3e 100644
--- a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png
index 9fec9c5e12..6996c3e065 100644
--- a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png
index 0233e6f081..c96a80b9eb 100644
--- a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png
index e14cff35e3..6e5e6ba15d 100644
--- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png
index 8ca9684012..a6944e1952 100644
--- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png
index 6399cd6715..ff26c7f55d 100644
--- a/indra/newview/skins/default/textures/navbar/Info_Off.png
+++ b/indra/newview/skins/default/textures/navbar/Info_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png
index a296d2014f..a45a3849f7 100644
--- a/indra/newview/skins/default/textures/navbar/Info_Over.png
+++ b/indra/newview/skins/default/textures/navbar/Info_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png
index 2afc4a9143..8e1f64609e 100644
--- a/indra/newview/skins/default/textures/navbar/Info_Press.png
+++ b/indra/newview/skins/default/textures/navbar/Info_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
index 07f90438f0..6c237f973a 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
index 9a94a4324c..de87071c05 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
index 0a8b3b5890..7be2cac5e1 100644
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index b2767c6174..ea45cfe3b7 100644
--- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index de50b29f79..0e1fd747fc 100644
--- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
index fbab10ca36..6880008fff 100644
--- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
+++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
index bf460e5a57..978b51f5a7 100644
--- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 115fa26c8d..523833d437 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -11,7 +11,7 @@ label_pad_left - padding to the left of tab button labels
                halign="center"
                font="SansSerif"
                font.size="Small"
-               tab_height="23"
+               tab_height="24"
                label_pad_bottom="1"
                label_pad_left="4">
   <!--