Update luma sourcefiles

diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css
index 5e64f3082075a234b5accd61967c782f788e3e27..c92549ba13591c82819ec8254550ff1ec8267244 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.css
+++ b/gfx/luma/gfx/hud/luma/common.css
@@ -1,6 +1,6 @@
 /* Vitals */
 .armor  { fill:#81f13d }
 /* Vitals */
 .armor  { fill:#81f13d }

-.health { fill:#fd725d }
+.health { fill:#fd705b }

 
 /* Ammo */
 .bullets    { fill:#adf085 }
 
 /* Ammo */
 .bullets    { fill:#adf085 }


@@ -13,20 +13,20 @@
 .supercells { fill:#d0f08a }
 
 /* Weapons */
 .supercells { fill:#d0f08a }
 
 /* Weapons */

-.arc             { fill:#81f13d }
+.arc             { fill:#7c9ceb }

 .crylink         { fill:#ea6ff9 }
 .crylink         { fill:#ea6ff9 }

-.electro         { fill:#679ff3 }
+.electro         { fill:#6899f2 }

 .fireball        { fill:#f0855f }
 .fireball        { fill:#f0855f }

-.grenadelauncher { fill:#fd725d }
+.grenadelauncher { fill:#fd705b }

 .hagar           { fill:#e39160 }
 .hlac            { fill:#e5965b }
 .hagar           { fill:#e39160 }
 .hlac            { fill:#e5965b }

-.hmg             { fill:#fd725d }
+.hmg             { fill:#fd705b }

 .hook            { fill:#81f13d }
 .laser           { fill:#f7717b }
 .hook            { fill:#81f13d }
 .laser           { fill:#f7717b }

-.minelayer       { fill:#fd725d }
+.minelayer       { fill:#fd705b }

 .minstanex       { fill:#978ed2 }
 .nex             { fill:#75c3d5 }
 .minstanex       { fill:#978ed2 }
 .nex             { fill:#75c3d5 }

-.porto           { fill:#679ff3 }
+.porto           { fill:#6899f2 }

 .rifle           { fill:#e39160 }
 .rocketlauncher  { fill:#e9be57 }
 .rpc             { fill:#e9be57 }
 .rifle           { fill:#e39160 }
 .rocketlauncher  { fill:#e9be57 }
 .rpc             { fill:#e9be57 }


@@ -34,10 +34,11 @@
 .shotgun         { fill:#849ba8 }
 .shockwave       { fill:#77b38a }
 .tuba            { fill:#e9be57 }
 .shotgun         { fill:#849ba8 }
 .shockwave       { fill:#77b38a }
 .tuba            { fill:#e9be57 }

+.uzi             { fill:#81f13d }

 
 /* Powerups */
 .detonator    { fill:#e39160 }
 
 /* Powerups */
 .detonator    { fill:#e39160 }

-.invisibility { fill:#679ff3 }
+.invisibility { fill:#6899f2 }

 .resurrection { fill:#f7717b }
 .speed        { fill:#75c3d5 }
 .strength     { fill:#e39160 }
 .resurrection { fill:#f7717b }
 .speed        { fill:#75c3d5 }
 .strength     { fill:#e39160 }


@@ -49,34 +50,34 @@
 .ball     { fill:#8aa9c6 }
 
 /* Nades */
 .ball     { fill:#8aa9c6 }
 
 /* Nades */

-.nade        { fill:#77b38a }
-.nade_heal   { fill:#fd725d }
-.nade_ice    { fill:#75c3d5 }
-.nade_napalm { fill:#e39160 }
+.nade_default { fill:#77b38a }
+.nade_heal    { fill:#fd705b }
+.nade_ice     { fill:#75c3d5 }
+.nade_napalm  { fill:#e39160 }

 
 /* Notifications */
 .camping      { fill:#81f13d }
 .death        { fill:#8aa9c6 }
 
 /* Notifications */
 .camping      { fill:#81f13d }
 .death        { fill:#8aa9c6 }

-.fall         { fill:#fd725d }
+.fall         { fill:#fd705b }

 .lava         { fill:#e39160 }
 .melee        { fill:#81f13d }
 .outofammo    { fill:#8aa9c6 }
 .selfkill     { fill:#8aa9c6 }
 .shootingstar { fill:#e9be57 }
 .slime        { fill:#81f13d }
 .lava         { fill:#e39160 }
 .melee        { fill:#81f13d }
 .outofammo    { fill:#8aa9c6 }
 .selfkill     { fill:#8aa9c6 }
 .shootingstar { fill:#e9be57 }
 .slime        { fill:#81f13d }

-.telefrag     { fill:#679ff3 }
-.void         { fill:#679ff3 }
+.telefrag     { fill:#6899f2 }
+.void         { fill:#6899f2 }

 .water        { fill:#75c3d5 }
 
 /* Race */
 .water        { fill:#75c3d5 }
 
 /* Race */

-.newfail   { fill:#679ff3 }
+.newfail   { fill:#6899f2 }

 .newrank   { fill:#e9be57 }
 .newrank   { fill:#e9be57 }

-.newrecord { fill:#fd725d }
+.newrecord { fill:#fd705b }

 .newtime   { fill:#81f13d }
 
 /* Misc */
 .key         { fill:#8aa9c6 }
 .newtime   { fill:#81f13d }
 
 /* Misc */
 .key         { fill:#8aa9c6 }

-.no          { fill:#fd725d }
+.no          { fill:#fd705b }

 .progressbar { fill:#ffffff }
 .yes         { fill:#81f13d }
 
 .progressbar { fill:#ffffff }
 .yes         { fill:#81f13d }
 


@@ -85,7 +86,7 @@
 .border_corner      { fill:url(common.gradients#border_corner) }
 .border_default     { fill:url(common.gradients#border_default) }
 .border_fading      { fill:url(common.gradients#border_fading) }
 .border_corner      { fill:url(common.gradients#border_corner) }
 .border_default     { fill:url(common.gradients#border_default) }
 .border_fading      { fill:url(common.gradients#border_fading) }

-.border_small       { fill:#2f2f2f; opacity:0.7 }
+.border_small       { fill:#2f2f2f; opacity:0.6 }

 .border_highlighted { fill:#ffffff }
 
 /* Selectors */
 .border_highlighted { fill:#ffffff }
 
 /* Selectors */

diff --git a/gfx/luma/gfx/hud/luma/common.gradients b/gfx/luma/gfx/hud/luma/common.gradients
index 6a5fc2f9cd2cddfee15b6436398c2d2db283b4ce..eba33b61dc85ea78f2f166653d29bc01176a7b95 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common.gradients
+++ b/gfx/luma/gfx/hud/luma/common.gradients
@@ -6,11 +6,11 @@
                        <stop offset=".75" stop-color="#2f2f2f" stop-opacity=".6"/>
                </radialGradient>
                <linearGradient id="border_default" gradientUnits="userSpaceOnUse" x2="0%" y2="100%">
                        <stop offset=".75" stop-color="#2f2f2f" stop-opacity=".6"/>
                </radialGradient>
                <linearGradient id="border_default" gradientUnits="userSpaceOnUse" x2="0%" y2="100%">

-                       <stop offset="0" stop-color="#2f2f2f" stop-opacity=".8"/>
+                       <stop offset="0" stop-color="#2f2f2f" stop-opacity=".7"/>

                        <stop offset="1" stop-color="#1f1f1f" stop-opacity=".4"/>
                </linearGradient>
                <linearGradient id="border_fading" gradientUnits="userSpaceOnUse" x2="0%" y2="100%">
                        <stop offset="1" stop-color="#1f1f1f" stop-opacity=".4"/>
                </linearGradient>
                <linearGradient id="border_fading" gradientUnits="userSpaceOnUse" x2="0%" y2="100%">

-                       <stop offset="0"   stop-color="#2f2f2f" stop-opacity=".8"/>
+                       <stop offset="0"   stop-color="#2f2f2f" stop-opacity=".7"/>

                        <stop offset=".75" stop-color="#1f1f1f" stop-opacity=".4"/>
                        <stop offset="1"   stop-color="#1f1f1f" stop-opacity="0" />
                </linearGradient>
                        <stop offset=".75" stop-color="#1f1f1f" stop-opacity=".4"/>
                        <stop offset="1"   stop-color="#1f1f1f" stop-opacity="0" />
                </linearGradient>

diff --git a/gfx/luma/gfx/hud/luma/common_blue.css b/gfx/luma/gfx/hud/luma/common_blue.css
index 10b1effcecf70aac7f35e6c26596f4591e9dc1c6..c86d4b06b251d8804cc0d06f32270c7edb28411a 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common_blue.css
+++ b/gfx/luma/gfx/hud/luma/common_blue.css
@@ -1,3 +1,3 @@
 @import "common.css";
 
 @import "common.css";
 

-.teamcolor { fill:#679ff3 }
+.teamcolor { fill:#6f9cf1 }

diff --git a/gfx/luma/gfx/hud/luma/common_red.css b/gfx/luma/gfx/hud/luma/common_red.css
index afaa1e36382b25c7dc448003c92cbed20bdec2a9..ac038efbc4014c769d0f75ce20ce6d8bb54435ea 100755 (executable)
--- a/gfx/luma/gfx/hud/luma/common_red.css
+++ b/gfx/luma/gfx/hud/luma/common_red.css
@@ -1,3 +1,3 @@
 @import "common.css";
 
 @import "common.css";
 

-.teamcolor { fill:#fd725d }
+.teamcolor { fill:#fd705b }

diff --git a/gfx/luma/gfx/hud/luma/notify_nade.svg b/gfx/luma/gfx/hud/luma/notify_nade.svg
index 44981b02e95fc22e2fefbfb1f4c62109c5284fbe..38ae28a82edbdb60cced3d4a009c03459c69e3c8 100644 (file)
--- a/gfx/luma/gfx/hud/luma/notify_nade.svg
+++ b/gfx/luma/gfx/hud/luma/notify_nade.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">

-       <path class="nade shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
+       <path class="nade_default shining" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>

 </svg>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponarc.svg b/gfx/luma/gfx/hud/luma/weaponarc.svg
old mode 100755 (executable)
new mode 100644 (file)
index 0907237..449386d
--- a/gfx/luma/gfx/hud/luma/weaponarc.svg
+++ b/gfx/luma/gfx/hud/luma/weaponarc.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">

-       <path class="arc shining" d="M 84,16 C 8,42 4,71 64,71 84,71 88,88 44,116 120,90 124,61 64,61 44,61 40,44 84,16 z"/>
+       <path class="arc shining" d="m 86,20 -16,19 3,18 -30,-15 11,36 -11,-5 -23,32 5,4 L 51,86 l 17,7 L 59,63 92,80 90,55 108,42 108,20 z"/>

 </svg>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponelectro.svg b/gfx/luma/gfx/hud/luma/weaponelectro.svg
index 7b4843a418789b1f18a183f0cc6cf57ed581ff5e..a5b180b9a6e0a221dc6d0e16e40158701d230873 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weaponelectro.svg
+++ b/gfx/luma/gfx/hud/luma/weaponelectro.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">

-       <path class="electro shining" d="M 24.2,91 C 29.8,100.7 42,104.3 51.8,99.2 44.8,96.8 38.6,91.9 34.6,85 30.5,78.1 29.4,70.2 30.9,62.9 21.6,69 18.6,81.3 24.2,91 z M 103.8,91 C 109.4,81.3 106.4,69 97.1,62.9 98.6,70.2 97.5,78.1 93.4,85 89.4,91.9 83.2,96.8 76.2,99.2 86,104.3 98.2,100.7 103.8,91 z M 64,22 C 52.8,22 43.6,30.8 43,41.8 48.6,37 56,34 64,34 72,34 79.4,37 85,41.8 84.4,30.8 75.2,22 64,22 z M 88,68 C 88,81.3 77.3,92 64,92 50.7,92 40,81.3 40,68 40,54.7 50.7,44 64,44 77.3,44 88,54.7 88,68 z"/>
+       <path class="electro shining" d="m 64,23 c -8,0 -15.2,3.7 -20,9.4 L 44,43 c 5.5,-4.4 12.4,-7 20,-7 7.6,0 14.5,2.6 20,7 L 84,32.4 C 79.2,26.7 72,23 64,23 z m 0,21 C 50.7,44 40,54.7 40,68 40,81.3 50.7,92 64,92 77.3,92 88,81.3 88,68 88,54.7 77.3,44 64,44 z m -31.7,19.2 -9.1,5.3 c -2.6,7 -2.2,15 1.8,22 4.1,7 10.8,11.4 18.2,12.6 l 9.1,-5.3 C 45.8,95.3 40.1,90.5 36.3,84 c -3.8,-6.5 -5,-13.9 -4,-20.8 z m 63.4,0 c 1,6.9 -0.2,14.3 -4,20.8 -3.8,6.5 -9.5,11.3 -16,13.8 l 9.1,5.3 c 7.4,-1.2 14.1,-5.6 18.2,-12.6 4,-7 4.4,-15 1.8,-22 l -9.1,-5.3 z"/>

 </svg>
 </svg>

diff --git a/gfx/luma/gfx/hud/luma/weaponuzi.svg b/gfx/luma/gfx/hud/luma/weaponuzi.svg
index 38ae9a615c3c2753f4795bb4cbb0b0b8f3678fc8..29a497cdc25c282e440b4eedaa4a9ae7a69bcec3 100644 (file)
--- a/gfx/luma/gfx/hud/luma/weaponuzi.svg
+++ b/gfx/luma/gfx/hud/luma/weaponuzi.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">

-       <path class="arc shining" d="M 62,23 C 57.8,23 44.5,33 41.2,36.3 l 7.5,7.5 C 52,40.5 62,27.2 62,23 z m 40,3 C 97,26 81,38 77,42 l 9,9 c 4,-4 16,-20 16,-25 z M 38.7,37.2 20.3,55.5 29.5,64.7 47.8,46.3 38.7,37.2 z M 74,43 52,65 63,76 85,54 74,43 z M 18.7,57.2 17,59.7 25.3,68 27.8,66.3 18.7,57.2 z M 50,67 48,70 58,80 61,78 50,67 z m 48,5 C 94.2,72 82.1,81.1 79,84.2 L 85.8,91 C 88.9,87.9 98,75.8 98,72 z M 76.8,84.9 60,101.6 68.4,110 85.1,93.3 76.8,84.9 z m -18.3,18.2 -1.5,2.3 7.6,7.6 2.3,-1.5 -8.4,-8.4 z"/>
+       <path class="uzi shining" d="M 62,23 C 57.8,23 44.5,33 41.2,36.3 l 7.5,7.5 C 52,40.5 62,27.2 62,23 z m 40,3 C 97,26 81,38 77,42 l 9,9 c 4,-4 16,-20 16,-25 z M 38.7,37.2 20.3,55.5 29.5,64.7 47.8,46.3 38.7,37.2 z M 74,43 52,65 63,76 85,54 74,43 z M 18.7,57.2 17,59.7 25.3,68 27.8,66.3 18.7,57.2 z M 50,67 48,70 58,80 61,78 50,67 z m 48,5 C 94.2,72 82.1,81.1 79,84.2 L 85.8,91 C 88.9,87.9 98,75.8 98,72 z M 76.8,84.9 60,101.6 68.4,110 85.1,93.3 76.8,84.9 z m -18.3,18.2 -1.5,2.3 7.6,7.6 2.3,-1.5 -8.4,-8.4 z"/>

 </svg>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/colorbutton_c.svg b/gfx/luma/gfx/menu/luma/colorbutton_c.svg
index cbf1f8d07428bd059c31acb187e4fec0df774d2e..29133b7ba24a937224b7429e194b566a72f8c2e7 100644 (file)
--- a/gfx/luma/gfx/menu/luma/colorbutton_c.svg
+++ b/gfx/luma/gfx/menu/luma/colorbutton_c.svg
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>

-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g transform="matrix(1,0,0,0.8846,0,3.6923)">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="64" height="64">
+       <defs>
+               <clipPath id="glowclip" clipPathUnits="userSpaceOnUse">
+                       <path d="M 23.1,8 40.9,8 59.7,40 50.8,56 13.2,56 4.3,40 z"/>
+               </clipPath>
+               <clipPath id="markclip" clipPathUnits="userSpaceOnUse">
+                       <path d="M 0,0 0,64 64,64 64,0 0,0 z m 27.7,16 8.6,0 L 50.5,40.2 46.1,48 17.9,48 13.5,40.2 27.7,16 z"/>
+               </clipPath>
+               <filter id="glow">
+                       <feGaussianBlur stdDeviation="8"/>
+               </filter>
+       </defs>
+       <g transform="matrix(1,0,0,0.8462,0,4.9231)">

                <g class="blurred">
                <g class="blurred">

-                       <path class="colorbutton" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
-                       <path class="colormark" d="M 47.3,50 52.8,40.1 37.4,14 26.6,14 11.2,40.1 16.7,50 z"/>
+                       <g class="colorbutton" clip-path="url(#markclip)">
+                               <path class="colorbutton_glow" filter="url(#glow)" clip-path="url(#glowclip)" d="m 0,0 0,64 64,0 0,-64 z m 25.4,12 13.2,0 16.5,28.1 -6.6,11.9 -32.9,0 -6.6,-11.9 z"/>
+                               <path class="colorbutton_frame" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
+                       </g>
+                       <path class="colormark" d="m 27.7,16 8.6,0 14.2,24.2 L 46.1,48 17.9,48 13.5,40.2 z"/>

                </g>
        </g>
 </svg>
                </g>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/colorbutton_f.svg b/gfx/luma/gfx/menu/luma/colorbutton_f.svg
index 8bde6f5cfd6639cead7b82207a4269e5d35146f0..17a7cd838933907827aafdfa22c9ad611ac91fa8 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/colorbutton_f.svg
+++ b/gfx/luma/gfx/menu/luma/colorbutton_f.svg
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>

-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g transform="matrix(1,0,0,0.8846,0,3.6923)">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="64" height="64">
+       <defs>
+               <clipPath id="glowclip" clipPathUnits="userSpaceOnUse">
+                       <path d="M 23.1,8 40.9,8 59.7,40 50.8,56 13.2,56 4.3,40 z"/>
+               </clipPath>
+               <clipPath id="markclip" clipPathUnits="userSpaceOnUse">
+                       <path d="M 0,0 0,64 64,64 64,0 0,0 z m 27.7,16 8.6,0 L 50.5,40.2 46.1,48 17.9,48 13.5,40.2 27.7,16 z"/>
+               </clipPath>
+               <filter id="glow">
+                       <feGaussianBlur stdDeviation="8"/>
+               </filter>
+       </defs>
+       <g transform="matrix(1,0,0,0.8462,0,4.9231)">

                <g class="blurred">
                <g class="blurred">

-                       <path class="colorbutton" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
-                       <path class="colormark" d="M 47.3,50 52.8,40.1 37.4,14 26.6,14 11.2,40.1 16.7,50 z"/>
+                       <g class="colorbutton" clip-path="url(#markclip)">
+                               <path class="colorbutton_glow" filter="url(#glow)" clip-path="url(#glowclip)" d="m 0,0 0,64 64,0 0,-64 z m 25.4,12 13.2,0 16.5,28.1 -6.6,11.9 -32.9,0 -6.6,-11.9 z"/>
+                               <path class="colorbutton_frame" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
+                       </g>
+                       <path class="colormark" d="m 27.7,16 8.6,0 14.2,24.2 L 46.1,48 17.9,48 13.5,40.2 z"/>

                </g>
        </g>
 </svg>
                </g>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/colorbutton_n.svg b/gfx/luma/gfx/menu/luma/colorbutton_n.svg
index 551c1e9f4737b3906150d52fd28cea207ad00cca..79916d91bdb43355659f841c44aa684f90a5ce60 100644 (file)
--- a/gfx/luma/gfx/menu/luma/colorbutton_n.svg
+++ b/gfx/luma/gfx/menu/luma/colorbutton_n.svg
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>

-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-       <g transform="matrix(1,0,0,0.8846,0,3.6923)">
-               <g class="blurred">
-                       <path class="colorbutton" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>
-                       <path class="colormark" d="M 47.3,50 52.8,40.1 37.4,14 26.6,14 11.2,40.1 16.7,50 z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="64" height="64">
+       <defs>
+               <clipPath id="clip" clipPathUnits="userSpaceOnUse">
+                       <path d="M 23.1,8 40.9,8 59.7,40 50.8,56 13.2,56 4.3,40 z"/>
+               </clipPath>
+               <filter id="glow" x="-0.5" width="2" y="-0.5" height="2">
+                       <feGaussianBlur stdDeviation="8"/>
+               </filter>
+       </defs>
+       <g transform="matrix(1,0,0,0.8462,0,4.9231)">
+               <g class="colorbutton blurred">
+                       <path class="colorbutton_glow" filter="url(#glow)" clip-path="url(#clip)" d="m 0,0 0,64 64,0 0,-64 z m 25.4,12 13.2,0 16.5,28.1 -6.6,11.9 -32.9,0 -6.6,-11.9 z"/>
+                       <path class="colorbutton_frame" d="M 49.7,54 57.4,40.1 39.7,10 24.3,10 6.6,40.1 14.3,54 z M 12,58 2,40 22,6 42,6 62,40 52,58 z"/>

                </g>
        </g>
 </svg>
                </g>
        </g>
 </svg>

diff --git a/gfx/luma/gfx/menu/luma/common.css b/gfx/luma/gfx/menu/luma/common.css
index 2dcd72a96d58d8f330bfee71e085c30c1bdadeef..e5c917cceb0947f7750be1b6163367e8b666cb87 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common.css
+++ b/gfx/luma/gfx/menu/luma/common.css
@@ -10,6 +10,10 @@
 .mark        { fill:#f2fcff; opacity:0.9 }
 .nopreview   { fill:#37628a; opacity:0.75 }
 
 .mark        { fill:#f2fcff; opacity:0.9 }
 .nopreview   { fill:#37628a; opacity:0.75 }
 

+.colorbutton       { opacity:0.8; fill:#ffffff }
+.colorbutton_frame { opacity:1 }
+.colorbutton_glow  { opacity:0.65 }
+

 /* Icons */
 .aes   { fill:#e2d138 }
 .mod   { fill:#5ba4e1 }
 /* Icons */
 .aes   { fill:#e2d138 }
 .mod   { fill:#5ba4e1 }

diff --git a/gfx/luma/gfx/menu/luma/common_c.css b/gfx/luma/gfx/menu/luma/common_c.css
index 77b05d6aaedbc233946ad332df61e37354d68af7..0dca735e6aed77e035d060ffc3022f7b90528af6 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_c.css
+++ b/gfx/luma/gfx/menu/luma/common_c.css
@@ -9,7 +9,8 @@
 .selection   { fill:#f78f45 }
 
 /* Components */
 .selection   { fill:#f78f45 }
 
 /* Components */

-.colorbutton { fill:#ffffff; opacity:0.85 }
-.colormark   { fill:#ffffff }
-.detail      { fill:#f4cda2 }
-.frame       { fill:#eca169 }
+.colormark { fill:#ffffff; opacity:0.95 }
+.detail    { fill:#f4cda2 }
+.frame     { fill:#eca169 }
+
+

diff --git a/gfx/luma/gfx/menu/luma/common_f.css b/gfx/luma/gfx/menu/luma/common_f.css
index 623020c8ea9c5bcc035c414232260ff0a3fc009f..c0a892008b9d430e34a0c337481f2ebb8cb35d79 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_f.css
+++ b/gfx/luma/gfx/menu/luma/common_f.css
@@ -7,7 +7,6 @@
 .radiobutton { opacity:0.85; fill:url(common_f.gradients#radiobutton) }
 
 /* Components */
 .radiobutton { opacity:0.85; fill:url(common_f.gradients#radiobutton) }
 
 /* Components */

-.colorbutton { fill:#ffffff; opacity:0.85 }
-.colormark   { fill:#ffffff; opacity:0.4 }
-.detail      { fill:#eaf6fc }
-.frame       { fill:#c0d6e8 }
+.colormark { fill:#ffffff; opacity:0.4 }
+.detail    { fill:#eaf6fc }
+.frame     { fill:#c0d6e8 }

diff --git a/gfx/luma/gfx/menu/luma/common_n.css b/gfx/luma/gfx/menu/luma/common_n.css
index 68782a068845da5d9275c5087e354722c34963cc..baad87c54c1a7f6b7ae518b4b1c345fb2314ffc1 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_n.css
+++ b/gfx/luma/gfx/menu/luma/common_n.css
@@ -9,7 +9,5 @@
 .radiobutton { opacity:0.85; fill:url(common_n.gradients#radiobutton) }
 
 /* Components */
 .radiobutton { opacity:0.85; fill:url(common_n.gradients#radiobutton) }
 
 /* Components */

-.colorbutton { fill:#ffffff; opacity:0.75 }
-.colormark   { fill:#ffffff; opacity:0.2 }
-.detail      { fill:#c6e8f8 }
-.frame       { fill:#99c4e5 }
+.detail { fill:#c6e8f8 }
+.frame  { fill:#99c4e5 }

diff --git a/gfx/luma/gfx/menu/luma/common_n.gradients b/gfx/luma/gfx/menu/luma/common_n.gradients
index 7e29ef0377db6ae6828bdf89f0998c15080021f6..810db92e451009687f896a4d1f83445dde3e6690 100755 (executable)
--- a/gfx/luma/gfx/menu/luma/common_n.gradients
+++ b/gfx/luma/gfx/menu/luma/common_n.gradients
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
        <defs>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
        <defs>

+               <radialGradient id="colorbutton">
+                       <stop stop-color="#ffffff" offset="0" stop-opacity="0"/>
+                       <stop stop-color="#ffffff" offset="1"/>
+               </radialGradient>

                <linearGradient id="dialog" gradientUnits="userSpaceOnUse" x1="0%" y1="25%" x2="0%" y2="75%">
                        <stop stop-color="#082d54" offset="0"/>
                        <stop stop-color="#06101a" offset=".2"/>
                <linearGradient id="dialog" gradientUnits="userSpaceOnUse" x1="0%" y1="25%" x2="0%" y2="75%">
                        <stop stop-color="#082d54" offset="0"/>
                        <stop stop-color="#06101a" offset=".2"/>

diff --git a/gfx/luma/models/items/common.css b/gfx/luma/models/items/common.css
index 7eaade3ac35cad9f7a9a1b9a5fcf6531a7453729..aa03838fcf3fabb98ccfcc154ffc51d8476e8004 100755 (executable)
--- a/gfx/luma/models/items/common.css
+++ b/gfx/luma/models/items/common.css
@@ -13,7 +13,7 @@
 
 /* Powerups */
 .detonator    { fill:#db8247 }
 
 /* Powerups */
 .detonator    { fill:#db8247 }

-.invisibility { fill:#5598e9 }
+.invisibility { fill:#5e95e8 }

 .fuelregen    { fill:#c4a93c }
 .resurrection { fill:#f35d68 }
 .shield       { fill:#6ce820 }
 .fuelregen    { fill:#c4a93c }
 .resurrection { fill:#f35d68 }
 .shield       { fill:#6ce820 }

diff --git a/gfx/luma/models/weapons/common.css b/gfx/luma/models/weapons/common.css
index ded1ea1f0ca1a8dae1250169e97cd62fc5ab45c6..a67f807aea203ef83adf3f705f16cd1007bb49b9 100755 (executable)
--- a/gfx/luma/models/weapons/common.css
+++ b/gfx/luma/models/weapons/common.css
@@ -1,7 +1,7 @@
 /* Weapons */
 /* Weapons */

-.arc             { fill:#6ce820 }
+.arc             { fill:#7094e6 }

 .crylink         { fill:#d261e0 }
 .crylink         { fill:#d261e0 }

-.electro         { fill:#5598e9 }
+.electro         { fill:#5e95e8 }

 .fireball        { fill:#db7147 }
 .grenadelauncher { fill:#f85e46 }
 .hagar           { fill:#db8247 }
 .fireball        { fill:#db7147 }
 .grenadelauncher { fill:#f85e46 }
 .hagar           { fill:#db8247 }


@@ -11,13 +11,14 @@
 .minelayer       { fill:#f85e46 }
 .minstanex       { fill:#857bca }
 .nex             { fill:#50b1c5 }
 .minelayer       { fill:#f85e46 }
 .minstanex       { fill:#857bca }
 .nex             { fill:#50b1c5 }

-.porto           { fill:#5598e9 }
+.porto           { fill:#5e95e8 }

 .rifle           { fill:#db8247 }
 .rocketlauncher  { fill:#c49f3c }
 .seeker          { fill:#f35d68 }
 .shockwave       { fill:#53b871 }
 .shotgun         { fill:#8397a3 }
 .tuba            { fill:#c49f3c }
 .rifle           { fill:#db8247 }
 .rocketlauncher  { fill:#c49f3c }
 .seeker          { fill:#f35d68 }
 .shockwave       { fill:#53b871 }
 .shotgun         { fill:#8397a3 }
 .tuba            { fill:#c49f3c }

+.uzi             { fill:#6ce820 }

 
 /* Filters */
 .shining { filter:url(common.filters#shining) }
 
 /* Filters */
 .shining { filter:url(common.filters#shining) }

diff --git a/gfx/luma/models/weapons/g_arc_luma.svg b/gfx/luma/models/weapons/g_arc_luma.svg
index 1785446b3ac7688688ddf1a1aaab0575379e2dae..9c0baf30e9cb924af6511e39c1cfcc46e1829c53 100644 (file)
--- a/gfx/luma/models/weapons/g_arc_luma.svg
+++ b/gfx/luma/models/weapons/g_arc_luma.svg
@@ -3,6 +3,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
        <g class="arc shining">
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
        <g class="arc shining">
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>

-               <path transform="matrix(1.5,0,0,1.5,32,29)" d="M 84,16 C 8,42 4,71 64,71 84,71 88,88 44,116 120,90 124,61 64,61 44,61 40,44 84,16 z"/>
+               <path transform="matrix(1.45,0,0,1.45,30,34)" d="m 86,20 -16,19 3,18 -30,-15 11,36 -11,-5 -23,32 5,4 L 51,86 l 17,7 L 59,63 92,80 90,55 108,42 108,20 z"/>

        </g>
 </svg>
        </g>
 </svg>

diff --git a/gfx/luma/models/weapons/g_electro_luma.svg b/gfx/luma/models/weapons/g_electro_luma.svg
index 2186590b022171c0334f73cc1a3290c16bca76db..328d4f9b83591725c758a4238d2742b9fe9bdefe 100644 (file)
--- a/gfx/luma/models/weapons/g_electro_luma.svg
+++ b/gfx/luma/models/weapons/g_electro_luma.svg
@@ -3,6 +3,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
        <g class="electro shining">
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
        <g class="electro shining">
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>

-               <path transform="matrix(1.5,0,0,1.5,32,27)" d="M 24.2,91 C 29.8,100.7 42,104.3 51.8,99.2 44.8,96.8 38.6,91.9 34.6,85 30.5,78.1 29.4,70.2 30.9,62.9 21.6,69 18.6,81.3 24.2,91 z M 103.8,91 C 109.4,81.3 106.4,69 97.1,62.9 98.6,70.2 97.5,78.1 93.4,85 89.4,91.9 83.2,96.8 76.2,99.2 86,104.3 98.2,100.7 103.8,91 z M 64,22 C 52.8,22 43.6,30.8 43,41.8 48.6,37 56,34 64,34 72,34 79.4,37 85,41.8 84.4,30.8 75.2,22 64,22 z M 88,68 C 88,81.3 77.3,92 64,92 50.7,92 40,81.3 40,68 40,54.7 50.7,44 64,44 77.3,44 88,54.7 88,68 z"/>
+               <path transform="matrix(1.5,0,0,1.5,32,27)" d="m 64,23 c -8,0 -15.2,3.7 -20,9.4 L 44,43 c 5.5,-4.4 12.4,-7 20,-7 7.6,0 14.5,2.6 20,7 L 84,32.4 C 79.2,26.7 72,23 64,23 z m 0,21 C 50.7,44 40,54.7 40,68 40,81.3 50.7,92 64,92 77.3,92 88,81.3 88,68 88,54.7 77.3,44 64,44 z m -31.7,19.2 -9.1,5.3 c -2.6,7 -2.2,15 1.8,22 4.1,7 10.8,11.4 18.2,12.6 l 9.1,-5.3 C 45.8,95.3 40.1,90.5 36.3,84 c -3.8,-6.5 -5,-13.9 -4,-20.8 z m 63.4,0 c 1,6.9 -0.2,14.3 -4,20.8 -3.8,6.5 -9.5,11.3 -16,13.8 l 9.1,5.3 c 7.4,-1.2 14.1,-5.6 18.2,-12.6 4,-7 4.4,-15 1.8,-22 l -9.1,-5.3 z"/>

        </g>
 </svg>
        </g>
 </svg>

diff --git a/gfx/luma/models/weapons/g_uzi_luma.svg b/gfx/luma/models/weapons/g_uzi_luma.svg
index 494db2d518819e2a929278264ab21d94ffe994dc..c50677726e739afd39b6c6aad8e5bbc9b58034a0 100644 (file)
--- a/gfx/luma/models/weapons/g_uzi_luma.svg
+++ b/gfx/luma/models/weapons/g_uzi_luma.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">

-       <g class="arc shining">
+       <g class="uzi shining">

                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
                <path transform="matrix(1.5,0,0,1.5,30,34)" d="M 62,23 C 57.8,23 44.5,33 41.2,36.3 l 7.5,7.5 C 52,40.5 62,27.2 62,23 z m 40,3 C 97,26 81,38 77,42 l 9,9 c 4,-4 16,-20 16,-25 z M 38.7,37.2 20.3,55.5 29.5,64.7 47.8,46.3 38.7,37.2 z M 74,43 52,65 63,76 85,54 74,43 z M 18.7,57.2 17,59.7 25.3,68 27.8,66.3 18.7,57.2 z M 50,67 48,70 58,80 61,78 50,67 z m 48,5 C 94.2,72 82.1,81.1 79,84.2 L 85.8,91 C 88.9,87.9 98,75.8 98,72 z M 76.8,84.9 60,101.6 68.4,110 85.1,93.3 76.8,84.9 z m -18.3,18.2 -1.5,2.3 7.6,7.6 2.3,-1.5 -8.4,-8.4 z"/>
        </g>
                <path d="M 37.6,187.1 27.2,193.1 C 48.6,226.2 85.7,248 128,248 c 42.3,0 79.4,-21.8 100.8,-54.9 l -10.4,-6 c -5,7.7 -11,14.7 -17.8,20.9 l -15.4,-2.8 C 169.2,217 149.4,224 128,224 106.6,224 86.8,217 70.9,205.2 l -15.4,2.8 C 48.7,201.8 42.7,194.8 37.6,187.1 z M 122,8.1 C 34.7,13 -18.3,104.7 21.2,182.7 l 10.4,-6 c -4.1,-8.2 -7.2,-16.9 -9.2,-25.9 l 10.2,-12 C 27.8,96.8 51,56.7 89.7,39.9 L 95,25.1 c 8.7,-2.8 17.8,-4.5 27,-5 z M 234.8,182.7 C 274.3,104.7 221.3,13 134,8.1 l 0,12.1 c 9.2,0.5 18.3,2.2 27,5 l 5.3,14.8 c 38.7,16.8 61.9,57 57.1,98.9 l 10.2,12 c -1.9,9 -5,17.7 -9.2,25.9 z"/>
                <path transform="matrix(1.5,0,0,1.5,30,34)" d="M 62,23 C 57.8,23 44.5,33 41.2,36.3 l 7.5,7.5 C 52,40.5 62,27.2 62,23 z m 40,3 C 97,26 81,38 77,42 l 9,9 c 4,-4 16,-20 16,-25 z M 38.7,37.2 20.3,55.5 29.5,64.7 47.8,46.3 38.7,37.2 z M 74,43 52,65 63,76 85,54 74,43 z M 18.7,57.2 17,59.7 25.3,68 27.8,66.3 18.7,57.2 z M 50,67 48,70 58,80 61,78 50,67 z m 48,5 C 94.2,72 82.1,81.1 79,84.2 L 85.8,91 C 88.9,87.9 98,75.8 98,72 z M 76.8,84.9 60,101.6 68.4,110 85.1,93.3 76.8,84.9 z m -18.3,18.2 -1.5,2.3 7.6,7.6 2.3,-1.5 -8.4,-8.4 z"/>
        </g>