diff options
author | Andrew Dolgov <[email protected]> | 2010-12-03 12:03:44 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-12-03 12:03:44 +0300 |
commit | 07a0c540d8372f78a31a0380e9560ee156210372 (patch) | |
tree | 970ce477c7b625875e6988ffe080e97324d02639 | |
parent | a0ce6eb7dbc547356628e87c96d46254d68bcadd (diff) |
update logo
-rw-r--r-- | images/logo.png | bin | 2092 -> 1855 bytes | |||
-rw-r--r-- | images/logo_big.png | bin | 0 -> 15916 bytes | |||
-rw-r--r-- | images/logo_wide.png | bin | 0 -> 9052 bytes | |||
-rw-r--r-- | images/ttrss_logo.png | bin | 6346 -> 0 bytes | |||
-rw-r--r-- | images/ttrss_logo.svg | 142 | ||||
-rw-r--r-- | images/ttrss_logo_big.png | bin | 7391 -> 0 bytes | |||
-rw-r--r-- | images/ttrss_logo_blackred.svg | 144 | ||||
-rw-r--r-- | login_form.php | 2 | ||||
-rw-r--r-- | prefs.php | 20 | ||||
-rw-r--r-- | tt-rss.css | 2 |
10 files changed, 11 insertions, 299 deletions
diff --git a/images/logo.png b/images/logo.png Binary files differindex 0f6dfaf33..4a73c23b1 100644 --- a/images/logo.png +++ b/images/logo.png diff --git a/images/logo_big.png b/images/logo_big.png Binary files differnew file mode 100644 index 000000000..e869f7730 --- /dev/null +++ b/images/logo_big.png diff --git a/images/logo_wide.png b/images/logo_wide.png Binary files differnew file mode 100644 index 000000000..8ca691f89 --- /dev/null +++ b/images/logo_wide.png diff --git a/images/ttrss_logo.png b/images/ttrss_logo.png Binary files differdeleted file mode 100644 index 243e8948b..000000000 --- a/images/ttrss_logo.png +++ /dev/null diff --git a/images/ttrss_logo.svg b/images/ttrss_logo.svg deleted file mode 100644 index c5174ec18..000000000 --- a/images/ttrss_logo.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="155.00000pt" - height="25.000000pt" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.43" - sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/images" - sodipodi:docname="ttrss_logo.svg" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/ttrss_logo.png" - inkscape:export-xdpi="101.71" - inkscape:export-ydpi="101.71"> - <defs - id="defs4"> - <linearGradient - id="linearGradient3112"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3114" /> - <stop - style="stop-color:#b5cdf6;stop-opacity:1;" - offset="1" - id="stop3116" /> - </linearGradient> - <linearGradient - id="linearGradient2800"> - <stop - style="stop-color:#000000;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2802" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop2804" /> - </linearGradient> - <linearGradient - id="linearGradient2782"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop2784" /> - <stop - style="stop-color:#f6d6b5;stop-opacity:1;" - offset="1" - id="stop2786" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3112" - id="linearGradient3118" - x1="50" - y1="12.985595" - x2="50" - y2="31.920942" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-0.474438,0.321428)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2782" - id="linearGradient3124" - gradientUnits="userSpaceOnUse" - x1="50" - y1="12.985595" - x2="50" - y2="31.920942" - gradientTransform="translate(139.6953,0.37974)" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="109.86875" - inkscape:cy="3.8105931" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1596" - inkscape:window-height="1153" - inkscape:window-x="0" - inkscape:window-y="0" - showguides="true" - inkscape:guide-bbox="true" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:url(#linearGradient3118);fill-opacity:1;stroke:#88b0f0;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="3.2755625" - y="24.07143" - id="text1306" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan1308" - x="3.2755625" - y="24.07143" - style="fill:url(#linearGradient3118);fill-opacity:1;stroke:#88b0f0;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:url(#linearGradient3124);fill-opacity:1.0;stroke:#ff8e00;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="143.44531" - y="24.129744" - id="text3120" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan3122" - x="143.44531" - y="24.129744" - style="fill:url(#linearGradient3124);fill-opacity:1.0;stroke:#ff8e00;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text> - </g> -</svg> diff --git a/images/ttrss_logo_big.png b/images/ttrss_logo_big.png Binary files differdeleted file mode 100644 index b2c59d176..000000000 --- a/images/ttrss_logo_big.png +++ /dev/null diff --git a/images/ttrss_logo_blackred.svg b/images/ttrss_logo_blackred.svg deleted file mode 100644 index 6205a40f4..000000000 --- a/images/ttrss_logo_blackred.svg +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="155.00000pt" - height="25.000000pt" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.45" - sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/images" - sodipodi:docname="ttrss_logo_blackred.svg" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/ttrss_logo_blackred.png" - inkscape:export-xdpi="120.76" - inkscape:export-ydpi="120.76" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:modified="TRUE"> - <defs - id="defs4"> - <linearGradient - id="linearGradient3112"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3114" /> - <stop - style="stop-color:#d6d6d6;stop-opacity:1;" - offset="1" - id="stop3116" /> - </linearGradient> - <linearGradient - id="linearGradient2800"> - <stop - style="stop-color:#000000;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2802" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop2804" /> - </linearGradient> - <linearGradient - id="linearGradient2782"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop2784" /> - <stop - style="stop-color:#f6b5b5;stop-opacity:1;" - offset="1" - id="stop2786" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3112" - id="linearGradient3118" - x1="50" - y1="12.985595" - x2="50" - y2="31.920942" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-0.474438,0.321428)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2782" - id="linearGradient3124" - gradientUnits="userSpaceOnUse" - x1="50" - y1="12.985595" - x2="50" - y2="31.920942" - gradientTransform="translate(139.6953,0.37974)" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="109.86875" - inkscape:cy="3.8105931" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1600" - inkscape:window-height="1125" - inkscape:window-x="0" - inkscape:window-y="25" - showguides="true" - inkscape:guide-bbox="true" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:url(#linearGradient3118);fill-opacity:1;stroke:#676767;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="3.2755625" - y="24.07143" - id="text1306" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan1308" - x="3.2755625" - y="24.07143" - style="fill:url(#linearGradient3118);fill-opacity:1;stroke:#676767;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text> - <text - xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:url(#linearGradient3124);fill-opacity:1.0;stroke:#ff3d3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana" - x="143.44531" - y="24.129744" - id="text3120" - sodipodi:linespacing="125%" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" - inkscape:export-xdpi="180.00000" - inkscape:export-ydpi="180.00000"><tspan - sodipodi:role="line" - id="tspan3122" - x="143.44531" - y="24.129744" - style="fill:url(#linearGradient3124);fill-opacity:1.0;stroke:#ff3d3d;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text> - </g> -</svg> diff --git a/login_form.php b/login_form.php index eb6475bf7..e6f2753a9 100644 --- a/login_form.php +++ b/login_form.php @@ -108,7 +108,7 @@ function validateLoginForm(f) { <table width="100%" class="loginForm2"> <tr> <td class="loginTop" valign="bottom" align="left"> - <img src="images/ttrss_logo_big.png" alt="Logo"> + <img src="images/logo_wide.png"> </td> </tr><tr> <td align="center" valign="middle" class="loginMiddle" height="100%"> @@ -80,18 +80,16 @@ <div id="main" dojoType="dijit.layout.BorderContainer"> <div id="header" dojoType="dijit.layout.ContentPane" region="top"> - <div class="topLinks"> - <?php if (!SINGLE_USER_MODE) { ?> - <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> | - <?php } ?> - <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> | - <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> - <?php if (!SINGLE_USER_MODE) { ?> - | <a href="logout.php"><?php echo __('Logout') ?></a> - <?php } ?> + <img style="float : left" src="<?php echo theme_image($link, 'images/logo_wide.png') ?>" title="Tiny Tiny RSS"/> - </div> - <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/> + <?php if (!SINGLE_USER_MODE) { ?> + <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> | + <?php } ?> + <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> | + <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> + <?php if (!SINGLE_USER_MODE) { ?> + | <a href="logout.php"><?php echo __('Logout') ?></a> + <?php } ?> </div> <div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs"> diff --git a/tt-rss.css b/tt-rss.css index 07f66e369..3137cbd52 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -12,7 +12,7 @@ body#ttrssPrefs { } body#ttrssPrefs #footer, body#ttrssPrefs #header { - background-color : #ecf4ff; + background-color : #ecf4ff; padding-left : 8px; padding-right : 8px; } |