From bb2e773ca035e31969e82912484a64cadf8a833e Mon Sep 17 00:00:00 2001 From: Arrehn Date: Sun, 20 Mar 2011 12:26:32 -0400 Subject: [PATCH 1/5] Toy / Toystorm - fix group notices to be draggable. --HG-- branch : Firestorm_2.4.2 --- indra/newview/skins/default/xui/en/floater_script.xml | 4 ++-- .../skins/default/xui/en/panel_notification_script.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index e6c7ad61a0..90456fbf84 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -1,6 +1,6 @@ diff --git a/indra/newview/skins/default/xui/en/panel_notification_script.xml b/indra/newview/skins/default/xui/en/panel_notification_script.xml index b646de6548..14a8919edf 100644 --- a/indra/newview/skins/default/xui/en/panel_notification_script.xml +++ b/indra/newview/skins/default/xui/en/panel_notification_script.xml @@ -3,7 +3,7 @@ Date: Sun, 20 Mar 2011 13:36:51 -0400 Subject: [PATCH 2/5] Metaharper color changes for dialogs and notices, example of skinning color change --HG-- branch : Firestorm_2.4.2 --- indra/newview/skins/metaharper/colors.xml | 4 +++- .../newview/skins/metaharper/xui/en/panel_notification.xml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/metaharper/colors.xml b/indra/newview/skins/metaharper/colors.xml index 9159a590e1..2a36db1bdc 100644 --- a/indra/newview/skins/metaharper/colors.xml +++ b/indra/newview/skins/metaharper/colors.xml @@ -11,7 +11,9 @@ --> - + diff --git a/indra/newview/skins/metaharper/xui/en/panel_notification.xml b/indra/newview/skins/metaharper/xui/en/panel_notification.xml index f1385d15bc..f35ec1c091 100644 --- a/indra/newview/skins/metaharper/xui/en/panel_notification.xml +++ b/indra/newview/skins/metaharper/xui/en/panel_notification.xml @@ -2,10 +2,10 @@ Date: Sun, 20 Mar 2011 14:05:32 -0400 Subject: [PATCH 3/5] FIRE-635 - Starlight skins now have sane vertical tab button flash highlights --HG-- branch : Firestorm_2.4.2 --- indra/newview/skins/starlight/colors.xml | 2 +- .../newview/skins/starlight/themes/nostalgia_blue/colors.xml | 2 +- .../newview/skins/starlight/themes/original_orange/colors.xml | 2 +- indra/newview/skins/starlight/themes/original_teal/colors.xml | 2 +- indra/newview/skins/starlight/themes/silver_blue/colors.xml | 4 ++-- indra/newview/skins/starlight/themes/silver_pink/colors.xml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/skins/starlight/colors.xml b/indra/newview/skins/starlight/colors.xml index a8fd936bca..892013f6a1 100644 --- a/indra/newview/skins/starlight/colors.xml +++ b/indra/newview/skins/starlight/colors.xml @@ -332,7 +332,7 @@ reference="Unused?" /> + reference="White_25" /> + reference="White_25" /> + reference="White_25" /> + reference="White_25" /> + reference="White_25" /> - \ No newline at end of file + diff --git a/indra/newview/skins/starlight/themes/silver_pink/colors.xml b/indra/newview/skins/starlight/themes/silver_pink/colors.xml index 11e76664eb..70a2ad6202 100644 --- a/indra/newview/skins/starlight/themes/silver_pink/colors.xml +++ b/indra/newview/skins/starlight/themes/silver_pink/colors.xml @@ -334,7 +334,7 @@ reference="Unused?" /> + reference="White_25" /> - \ No newline at end of file + From 4b7d805ae0b3b5d64af70786c98e93213fb7c327 Mon Sep 17 00:00:00 2001 From: Arrehn Date: Sun, 20 Mar 2011 14:37:34 -0400 Subject: [PATCH 4/5] Temporary fix for transparent favorites bar. Has some issues, will be replaced. --HG-- branch : Firestorm_2.4.2 --- .../starlight/xui/en/panel_navigation_bar.xml | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml index d8bb0bce64..6e52059441 100644 --- a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml @@ -1,11 +1,10 @@ @@ -135,10 +135,9 @@ Date: Sun, 20 Mar 2011 15:19:20 -0400 Subject: [PATCH 5/5] Further refinements for starlight topbars --HG-- branch : Firestorm_2.4.2 --- indra/newview/skins/starlight/xui/en/main_view.xml | 4 ++-- .../newview/skins/starlight/xui/en/panel_navigation_bar.xml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/indra/newview/skins/starlight/xui/en/main_view.xml b/indra/newview/skins/starlight/xui/en/main_view.xml index 5ced147b4e..7019bf7cfe 100644 --- a/indra/newview/skins/starlight/xui/en/main_view.xml +++ b/indra/newview/skins/starlight/xui/en/main_view.xml @@ -86,7 +86,7 @@ width="500"> - \ No newline at end of file + diff --git a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml index 6e52059441..138c6ab2fb 100644 --- a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml @@ -17,7 +17,7 @@ bg_alpha_color="DkGray" background_opaque="true" follows="left|top|right" - height="27" + height="22" top_delta="0" top_pad="0" layout="topleft" @@ -134,12 +134,11 @@