diff options
Diffstat (limited to 'common/metacity-1')
-rw-r--r-- | common/metacity-1/button-bg.svg | 8 | ||||
-rw-r--r-- | common/metacity-1/button-border.svg | 4 | ||||
-rw-r--r-- | common/metacity-1/close-icon.svg | 8 | ||||
-rw-r--r-- | common/metacity-1/max-icon.svg | 6 | ||||
-rw-r--r-- | common/metacity-1/metacity-theme-1-dark.xml | 60 | ||||
-rw-r--r-- | common/metacity-1/metacity-theme-1.xml | 48 | ||||
-rw-r--r-- | common/metacity-1/metacity-theme-2-dark.xml | 60 | ||||
-rw-r--r-- | common/metacity-1/metacity-theme-2.xml | 48 | ||||
-rw-r--r-- | common/metacity-1/metacity-theme-3.xml | 54 | ||||
-rw-r--r-- | common/metacity-1/min-icon.svg | 10 |
10 files changed, 113 insertions, 193 deletions
diff --git a/common/metacity-1/button-bg.svg b/common/metacity-1/button-bg.svg index 49a6f1e..1f225b5 100644 --- a/common/metacity-1/button-bg.svg +++ b/common/metacity-1/button-bg.svg @@ -15,10 +15,10 @@ width="16" xml:space="preserve" inkscape:version="0.91 r13725" - sodipodi:docname="button_bg.svg"><metadata + sodipodi:docname="button-bg.svg"><metadata id="metadata26"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs id="defs24" /><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ id="namedview22" showgrid="true" inkscape:zoom="16" - inkscape:cx="4.4272827" + inkscape:cx="-6.6664673" inkscape:cy="4.949103" inkscape:window-x="0" inkscape:window-y="27" @@ -65,7 +65,7 @@ r="7" cy="255" cx="1376" - style="fill:#7d7d7d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4068-7-5-9-6" /></g></g><g id="g4778-2-68" transform="translate(1323,246.86719)" diff --git a/common/metacity-1/button-border.svg b/common/metacity-1/button-border.svg index 0822007..a1ab948 100644 --- a/common/metacity-1/button-border.svg +++ b/common/metacity-1/button-border.svg @@ -33,7 +33,7 @@ id="namedview22" showgrid="true" inkscape:zoom="16" - inkscape:cx="-5.1352173" + inkscape:cx="-16.228967" inkscape:cy="2.449103" inkscape:window-x="0" inkscape:window-y="27" @@ -56,7 +56,7 @@ id="g4891" style="display:inline;opacity:1" transform="translate(-781,-432.63782)"><path - style="display:inline;opacity:1;fill:#7d7d7d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 1302,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z" id="path4068-7-5-9-6-7-2-5-78" inkscape:connector-curvature="0" /><g diff --git a/common/metacity-1/close-icon.svg b/common/metacity-1/close-icon.svg index 1f717ab..312fa9e 100644 --- a/common/metacity-1/close-icon.svg +++ b/common/metacity-1/close-icon.svg @@ -32,9 +32,9 @@ inkscape:window-height="718" id="namedview22" showgrid="true" - inkscape:zoom="16" - inkscape:cx="-17.197717" - inkscape:cy="-0.050897" + inkscape:zoom="11.313709" + inkscape:cx="-6.97609" + inkscape:cy="12.311381" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -86,7 +86,7 @@ inkscape:connector-curvature="0" d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z" id="path10839-9-2-2" - style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /></g></g></g><g + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /></g></g></g><g id="layer13-2-6-11" transform="translate(-60,-518)" style="fill:#ffffff;fill-opacity:1" /><g diff --git a/common/metacity-1/max-icon.svg b/common/metacity-1/max-icon.svg index 4120785..6b80028 100644 --- a/common/metacity-1/max-icon.svg +++ b/common/metacity-1/max-icon.svg @@ -18,7 +18,7 @@ sodipodi:docname="max-icon.svg"><metadata id="metadata26"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs id="defs24" /><sodipodi:namedview pagecolor="#d7d7d7" bordercolor="#666666" @@ -33,7 +33,7 @@ id="namedview22" showgrid="true" inkscape:zoom="16" - inkscape:cx="-0.5727173" + inkscape:cx="-11.666467" inkscape:cy="2.449103" inkscape:window-x="0" inkscape:window-y="27" @@ -63,7 +63,7 @@ style="display:inline" transform="translate(58,0)" /></g><path id="path4293-5-95" - style="display:inline;opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="display:inline;opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384" inkscape:connector-curvature="0" sodipodi:nodetypes="csscccsscc" /></g><rect diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml index 113dce4..38fc8b5 100644 --- a/common/metacity-1/metacity-theme-1-dark.xml +++ b/common/metacity-1/metacity-theme-1-dark.xml @@ -10,39 +10,32 @@ <!-- meaningfull constants --> -<constant name="C_title_focused" value="#afb8c5" /> -<constant name="C_title_unfocused" value="#686f78" /> +<constant name="C_title_focused" value="#70788d" /> +<constant name="C_title_unfocused" value="#979dac" /> -<constant name="C_wm_bg_focused" value="#2f343b" /> -<constant name="C_wm_bg_unfocused" value="#32383f" /> +<constant name="C_wm_bg_focused" value="#e7e8eb" /> +<constant name="C_wm_bg_unfocused" value="#eff0f2" /> -<constant name="C_wm_highlight" value="#353b44" /> +<constant name="C_wm_highlight" value="#eeeff1" /> <!-- window button colors --> <!-- close --> -<constant name="C_button_close_bg_focused" value="#e45e65" /> -<constant name="C_button_close_bg_hover" value="#f48085" /> -<constant name="C_button_close_bg_active" value="#e6262f" /> +<constant name="C_button_close_bg_focused" value="#cc575d" /> +<constant name="C_button_close_bg_hover" value="#d7787d" /> +<constant name="C_button_close_bg_active" value="#be3841" /> -<constant name="C_icon_close_bg_focused" value="#ffffff" /> -<constant name="C_icon_close_bg_hover" value="#ffffff" /> -<constant name="C_icon_close_bg_active" value="#ffffff" /> +<constant name="C_icon_close_bg" value="#2f343f" /> <!-- minimize, maximize --> -<constant name="C_button_bg_focused" value="#272c32" /> -<constant name="C_button_bg_unfocused" value="#2a3035" /> -<constant name="C_button_bg_hover" value="#272c32" /> +<constant name="C_button_bg_hover" value="#454C5C" /> <constant name="C_button_bg_active" value="#5294E2" /> -<constant name="C_button_border_focused" value="#191C21" /> -<constant name="C_button_border_unfocused" value="#1F2328" /> -<constant name="C_button_border_hover" value="#5294E2" /> -<constant name="C_button_border_active" value="#5294E2" /> +<constant name="C_button_border_hover" value="#262932" /> -<constant name="C_icon_bg_focused" value="#939ca8" /> -<constant name="C_icon_bg_unfocused" value="#686f78" /> -<constant name="C_icon_bg_hover" value="#afb8c5" /> +<constant name="C_icon_bg_focused" value="#90939B" /> +<constant name="C_icon_bg_unfocused" value="#666A74" /> +<constant name="C_icon_bg_hover" value="#C4C7CC" /> <constant name="C_icon_bg_active" value="#ffffff" /> <!-- geometries --> @@ -157,39 +150,36 @@ <!--close--> <draw_ops name="close_focused"> <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_pressed"> <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <!--maximize--> <draw_ops name="maximize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -205,8 +195,6 @@ </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -223,8 +211,6 @@ <!--minimize--> <draw_ops name="minimize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -240,8 +226,6 @@ </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml index 13c50a8..1556013 100644 --- a/common/metacity-1/metacity-theme-1.xml +++ b/common/metacity-1/metacity-theme-1.xml @@ -21,28 +21,21 @@ <!-- window button colors --> <!-- close --> -<constant name="C_button_close_bg_focused" value="#f37076" /> -<constant name="C_button_close_bg_hover" value="#f79da1" /> -<constant name="C_button_close_bg_active" value="#ef4048" /> +<constant name="C_button_close_bg_focused" value="#f46067" /> +<constant name="C_button_close_bg_hover" value="#f68086" /> +<constant name="C_button_close_bg_active" value="#f13039" /> -<constant name="C_icon_close_bg_focused" value="#ffffff" /> -<constant name="C_icon_close_bg_hover" value="#ffffff" /> -<constant name="C_icon_close_bg_active" value="#ffffff" /> +<constant name="C_icon_close_bg" value="#F8F8F9" /> <!-- minimize, maximize --> -<constant name="C_button_bg_focused" value="#ffffff" /> -<constant name="C_button_bg_unfocused" value="#ffffff" /> <constant name="C_button_bg_hover" value="#fdfdfd" /> <constant name="C_button_bg_active" value="#5294E2" /> -<constant name="C_button_border_focused" value="#d8dae0" /> -<constant name="C_button_border_unfocused" value="#dddee2" /> -<constant name="C_button_border_hover" value="#5294E2" /> -<constant name="C_button_border_active" value="#5294E2" /> +<constant name="C_button_border_hover" value="#D1D3DA" /> -<constant name="C_icon_bg_focused" value="#a7adb9" /> -<constant name="C_icon_bg_unfocused" value="#babec7" /> -<constant name="C_icon_bg_hover" value="#757d91" /> +<constant name="C_icon_bg_focused" value="#90949E" /> +<constant name="C_icon_bg_unfocused" value="#B6B8C0" /> +<constant name="C_icon_bg_hover" value="#7A7F8B" /> <constant name="C_icon_bg_active" value="#ffffff" /> <!-- geometries --> @@ -157,39 +150,36 @@ <!--close--> <draw_ops name="close_focused"> <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_pressed"> <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <!--maximize--> <draw_ops name="maximize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -205,8 +195,6 @@ </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -223,8 +211,6 @@ <!--minimize--> <draw_ops name="minimize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -240,8 +226,6 @@ </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml index 113dce4..38fc8b5 100644 --- a/common/metacity-1/metacity-theme-2-dark.xml +++ b/common/metacity-1/metacity-theme-2-dark.xml @@ -10,39 +10,32 @@ <!-- meaningfull constants --> -<constant name="C_title_focused" value="#afb8c5" /> -<constant name="C_title_unfocused" value="#686f78" /> +<constant name="C_title_focused" value="#70788d" /> +<constant name="C_title_unfocused" value="#979dac" /> -<constant name="C_wm_bg_focused" value="#2f343b" /> -<constant name="C_wm_bg_unfocused" value="#32383f" /> +<constant name="C_wm_bg_focused" value="#e7e8eb" /> +<constant name="C_wm_bg_unfocused" value="#eff0f2" /> -<constant name="C_wm_highlight" value="#353b44" /> +<constant name="C_wm_highlight" value="#eeeff1" /> <!-- window button colors --> <!-- close --> -<constant name="C_button_close_bg_focused" value="#e45e65" /> -<constant name="C_button_close_bg_hover" value="#f48085" /> -<constant name="C_button_close_bg_active" value="#e6262f" /> +<constant name="C_button_close_bg_focused" value="#cc575d" /> +<constant name="C_button_close_bg_hover" value="#d7787d" /> +<constant name="C_button_close_bg_active" value="#be3841" /> -<constant name="C_icon_close_bg_focused" value="#ffffff" /> -<constant name="C_icon_close_bg_hover" value="#ffffff" /> -<constant name="C_icon_close_bg_active" value="#ffffff" /> +<constant name="C_icon_close_bg" value="#2f343f" /> <!-- minimize, maximize --> -<constant name="C_button_bg_focused" value="#272c32" /> -<constant name="C_button_bg_unfocused" value="#2a3035" /> -<constant name="C_button_bg_hover" value="#272c32" /> +<constant name="C_button_bg_hover" value="#454C5C" /> <constant name="C_button_bg_active" value="#5294E2" /> -<constant name="C_button_border_focused" value="#191C21" /> -<constant name="C_button_border_unfocused" value="#1F2328" /> -<constant name="C_button_border_hover" value="#5294E2" /> -<constant name="C_button_border_active" value="#5294E2" /> +<constant name="C_button_border_hover" value="#262932" /> -<constant name="C_icon_bg_focused" value="#939ca8" /> -<constant name="C_icon_bg_unfocused" value="#686f78" /> -<constant name="C_icon_bg_hover" value="#afb8c5" /> +<constant name="C_icon_bg_focused" value="#90939B" /> +<constant name="C_icon_bg_unfocused" value="#666A74" /> +<constant name="C_icon_bg_hover" value="#C4C7CC" /> <constant name="C_icon_bg_active" value="#ffffff" /> <!-- geometries --> @@ -157,39 +150,36 @@ <!--close--> <draw_ops name="close_focused"> <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_pressed"> <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <!--maximize--> <draw_ops name="maximize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -205,8 +195,6 @@ </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -223,8 +211,6 @@ <!--minimize--> <draw_ops name="minimize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -240,8 +226,6 @@ </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml index 79fee42..1556013 100644 --- a/common/metacity-1/metacity-theme-2.xml +++ b/common/metacity-1/metacity-theme-2.xml @@ -21,28 +21,21 @@ <!-- window button colors --> <!-- close --> -<constant name="C_button_close_bg_focused" value="#f37076" /> -<constant name="C_button_close_bg_hover" value="#f79da1" /> -<constant name="C_button_close_bg_active" value="#ef4048" /> +<constant name="C_button_close_bg_focused" value="#f46067" /> +<constant name="C_button_close_bg_hover" value="#f68086" /> +<constant name="C_button_close_bg_active" value="#f13039" /> -<constant name="C_icon_close_bg_focused" value="#ffffff" /> -<constant name="C_icon_close_bg_hover" value="#ffffff" /> -<constant name="C_icon_close_bg_active" value="#ffffff" /> +<constant name="C_icon_close_bg" value="#F8F8F9" /> <!-- minimize, maximize --> -<constant name="C_button_bg_focused" value="#ffffff" /> -<constant name="C_button_bg_unfocused" value="#ffffff" /> <constant name="C_button_bg_hover" value="#fdfdfd" /> <constant name="C_button_bg_active" value="#5294E2" /> -<constant name="C_button_border_focused" value="#d8dae0" /> -<constant name="C_button_border_unfocused" value="#dddee2" /> -<constant name="C_button_border_hover" value="#5294E2" /> -<constant name="C_button_border_active" value="#5294E2" /> +<constant name="C_button_border_hover" value="#D1D3DA" /> -<constant name="C_icon_bg_focused" value="#8d93a4" /> -<constant name="C_icon_bg_unfocused" value="#b8bcc7" /> -<constant name="C_icon_bg_hover" value="#70788d" /> +<constant name="C_icon_bg_focused" value="#90949E" /> +<constant name="C_icon_bg_unfocused" value="#B6B8C0" /> +<constant name="C_icon_bg_hover" value="#7A7F8B" /> <constant name="C_icon_bg_active" value="#ffffff" /> <!-- geometries --> @@ -157,39 +150,36 @@ <!--close--> <draw_ops name="close_focused"> <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_pressed"> <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <!--maximize--> <draw_ops name="maximize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -205,8 +195,6 @@ </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -223,8 +211,6 @@ <!--minimize--> <draw_ops name="minimize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -240,8 +226,6 @@ </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml index 1949098..49b5dd7 100644 --- a/common/metacity-1/metacity-theme-3.xml +++ b/common/metacity-1/metacity-theme-3.xml @@ -21,29 +21,22 @@ <!-- window button colors --> <!-- close --> -<constant name="C_button_close_bg_focused" value="gtk:custom(wm_button_close_bg,#eeeff1)" /> -<constant name="C_button_close_bg_hover" value="gtk:custom(wm_button_close_hover_bg,#eeeff1)" /> -<constant name="C_button_close_bg_active" value="gtk:custom(wm_button_close_active_bg,#eeeff1)" /> +<constant name="C_button_close_bg_focused" value="gtk:custom(wm_button_close_bg,#f46067)" /> +<constant name="C_button_close_bg_hover" value="gtk:custom(wm_button_close_hover_bg,#f68086)" /> +<constant name="C_button_close_bg_active" value="gtk:custom(wm_button_close_active_bg,#f13039)" /> -<constant name="C_icon_close_bg_focused" value="gtk:custom(wm_icon_close_bg,#eeeff1)" /> -<constant name="C_icon_close_bg_hover" value="gtk:custom(wm_icon_close_hover_bg,#eeeff1)" /> -<constant name="C_icon_close_bg_active" value="gtk:custom(wm_icon_close_active_bg,#eeeff1)" /> +<constant name="C_icon_close_bg" value="gtk:custom(wm_icon_close_bg,#F8F8F9)" /> <!-- minimize, maximize --> -<constant name="C_button_bg_focused" value="gtk:custom(wm_button_bg,#eeeff1)" /> -<constant name="C_button_bg_unfocused" value="gtk:custom(wm_button_unfocused_bg,#eeeff1)" /> -<constant name="C_button_bg_hover" value="gtk:custom(wm_button_hover_bg,#eeeff1)" /> -<constant name="C_button_bg_active" value="gtk:custom(wm_button_active_bg,#eeeff1)" /> +<constant name="C_button_bg_hover" value="gtk:custom(wm_button_hover_bg,#fdfdfd)" /> +<constant name="C_button_bg_active" value="gtk:custom(wm_button_active_bg,#5294E2)" /> -<constant name="C_button_border_focused" value="gtk:custom(wm_button_border,#eeeff1)" /> -<constant name="C_button_border_unfocused" value="gtk:custom(wm_button_unfocused_border,#eeeff1)" /> -<constant name="C_button_border_hover" value="gtk:custom(wm_button_hover_border,#eeeff1)" /> -<constant name="C_button_border_active" value="gtk:custom(wm_button_active_border,#eeeff1)" /> +<constant name="C_button_border_hover" value="gtk:custom(wm_button_hover_border,#D1D3DA)" /> -<constant name="C_icon_bg_focused" value="gtk:custom(wm_icon_bg,#eeeff1)" /> -<constant name="C_icon_bg_unfocused" value="gtk:custom(wm_icon_unfocused_bg,#eeeff1)" /> -<constant name="C_icon_bg_hover" value="gtk:custom(wm_icon_hover_bg,#eeeff1)" /> -<constant name="C_icon_bg_active" value="gtk:custom(wm_icon_active_bg,#eeeff1)" /> +<constant name="C_icon_bg_focused" value="gtk:custom(wm_icon_bg,#90949E)" /> +<constant name="C_icon_bg_unfocused" value="gtk:custom(wm_icon_unfocused_bg,#B6B8C0)" /> +<constant name="C_icon_bg_hover" value="gtk:custom(wm_icon_hover_bg,#7A7F8B)" /> +<constant name="C_icon_bg_active" value="gtk:custom(wm_icon_active_bg,#ffffff)" /> <!-- geometries --> @@ -196,39 +189,36 @@ <!--close--> <draw_ops name="close_focused"> <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_pressed"> <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_focused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_prelight"> <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/> + <image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> <!--maximize--> <draw_ops name="maximize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -244,8 +234,6 @@ </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -262,8 +250,6 @@ <!--minimize--> <draw_ops name="minimize_focused"> - <image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> @@ -279,8 +265,6 @@ </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> - <image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> <image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/> </draw_ops> diff --git a/common/metacity-1/min-icon.svg b/common/metacity-1/min-icon.svg index cac4f61..92920b5 100644 --- a/common/metacity-1/min-icon.svg +++ b/common/metacity-1/min-icon.svg @@ -18,7 +18,7 @@ sodipodi:docname="min-icon.svg"><metadata id="metadata26"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs id="defs24" /><sodipodi:namedview pagecolor="#e2e2e2" bordercolor="#666666" @@ -32,9 +32,9 @@ inkscape:window-height="718" id="namedview22" showgrid="true" - inkscape:zoom="16" - inkscape:cx="-20.135217" - inkscape:cy="2.449103" + inkscape:zoom="22.627417" + inkscape:cx="6.164106" + inkscape:cy="8.4082271" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -65,7 +65,7 @@ inkscape:connector-curvature="0" d="m 1373,254 0,2 6,0 0,-2 z" id="rect9057-4-3" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7d7d7d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" sodipodi:nodetypes="ccccc" /></g><rect y="-185.63782" x="587" |