diff options
46 files changed, 42 insertions, 59 deletions
diff --git a/app/layout/header.phtml b/app/layout/header.phtml index a3c8c55c4..a0b603523 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -12,7 +12,7 @@ <div class="item title"> <h1> <a href="<?php echo _url ('index', 'index'); ?>"> - <img class="logo" width="32" height="32" src="<?php echo Url::display ('/themes/icons/icon-32.png'); ?>" alt="⊚" /> + <img class="logo" src="<?php echo Url::display ('/themes/icons/icon.svg'); ?>" alt="⊚" /> <?php echo Configuration::title (); ?> </a> </h1> diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index 62dccc334..78f76dd83 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -16,8 +16,10 @@ width: 250px; white-space: nowrap; } - .header > .item.title .logo { + .logo { display: inline-block; + height: 32px; + width: 32px; padding: 10px; } .header > .item.title h1 { @@ -177,7 +179,7 @@ visibility: hidden; cursor: pointer; } - .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, + .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, .categories .feeds .item:hover .dropdown-toggle > .icon, .categories .feeds .item.active .dropdown-toggle > .icon { background-color: #fff; diff --git a/public/themes/default/global.css b/public/themes/default/global.css index 58b4126b0..b5cae66db 100644 --- a/public/themes/default/global.css +++ b/public/themes/default/global.css @@ -489,110 +489,83 @@ input, select, textarea { background: center center no-repeat; } .i_refresh { - background-image: url("../icons/refresh.png"); background-image: url("../icons/refresh.svg"); } .i_bookmark { - background-image: url("../icons/starred.png"); background-image: url("../icons/starred.svg"); } .i_not_bookmark { - background-image: url("../icons/unstarred.png"); background-image: url("../icons/unstarred.svg"); } .i_read { - background-image: url("../icons/read.png"); background-image: url("../icons/read.svg"); } .i_unread { - background-image: url("../icons/unread.png"); background-image: url("../icons/unread.svg"); } .i_all { - background-image: url("../icons/all.png"); background-image: url("../icons/all.svg"); } .i_close { - background-image: url("../icons/close.png"); background-image: url("../icons/close.svg"); } .i_search { - background-image: url("../icons/search.png"); background-image: url("../icons/search.svg"); } .i_configure { - background-image: url("../icons/configure.png"); background-image: url("../icons/configure.svg"); } .i_login { - background-image: url("../icons/login.png"); background-image: url("../icons/login.svg"); } .i_logout { - background-image: url("../icons/logout.png"); background-image: url("../icons/logout.svg"); } .i_add { - background-image: url("../icons/add.png"); background-image: url("../icons/add.svg"); } .i_link { - background-image: url("../icons/link.png"); background-image: url("../icons/link.svg"); } .i_down { - background-image: url("../icons/down.png"); background-image: url("../icons/down.svg"); } .i_up { - background-image: url("../icons/up.png"); background-image: url("../icons/up.svg"); } .i_next { - background-image: url("../icons/next.png"); background-image: url("../icons/next.svg"); } .i_prev { - background-image: url("../icons/previous.png"); - background-image: url("../icons/previous.svg"); + background-image: url("../icons/prev.svg"); } .i_help { - background-image: url("../icons/help.png"); background-image: url("../icons/help.svg"); } .i_note { - background-image: url("../icons/note.png"); background-image: url("../icons/note.svg"); } .i_note_empty { - background-image: url("../icons/note_empty.png"); background-image: url("../icons/note_empty.svg"); } .i_category { - background-image: url("../icons/category.png"); background-image: url("../icons/category.svg"); } .i_category-white { - background-image: url("../icons/category-white.png"); background-image: url("../icons/category-white.svg"); } .i_rss { - background-image: url("../icons/rss.png"); background-image: url("../icons/rss.svg"); } .i_share { - background-image: url("../icons/share.png"); background-image: url("../icons/share.svg"); } .i_starred { - background-image: url("../icons/starred.png"); background-image: url("../icons/starred.svg"); } .i_non-starred { - background-image: url("../icons/non-starred.png"); background-image: url("../icons/non-starred.svg"); } .i_tag { - background-image: url("../icons/tag.png"); background-image: url("../icons/tag.svg"); } diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 8c3205e76..602845ef1 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -19,8 +19,9 @@ body { width: 250px; white-space: nowrap; } - .header > .item.title .logo { + .logo { display: inline-block; + height: 32px; width: 32px; padding: 10px; } @@ -166,7 +167,7 @@ body { visibility: hidden; cursor: pointer; } - .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, + .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, .categories .feeds .item:hover .dropdown-toggle > .icon, .categories .feeds .item.active .dropdown-toggle > .icon { background-color: #95a5a6; diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css index f2957d77a..0c731f74b 100644 --- a/public/themes/flat-design/global.css +++ b/public/themes/flat-design/global.css @@ -481,102 +481,77 @@ input, select, textarea { background: center center no-repeat; } .i_refresh { - background-image: url("icons/refresh.png"); background-image: url("icons/refresh.svg"); } .i_bookmark { - background-image: url("../icons/starred.png"); background-image: url("../icons/starred.svg"); } .i_not_bookmark { - background-image: url("../icons/unstarred.png"); background-image: url("../icons/unstarred.svg"); } .i_read { - background-image: url("../icons/read.png"); background-image: url("../icons/read.svg"); } .i_unread { - background-image: url("../icons/unread.png"); background-image: url("../icons/unread.svg"); } .i_all { - background-image: url("icons/all.png"); background-image: url("icons/all.svg"); } .i_close { - background-image: url("icons/close.png"); background-image: url("icons/close.svg"); } .i_search { - background-image: url("icons/search.png"); background-image: url("icons/search.svg"); } .i_configure { - background-image: url("icons/configure.png"); background-image: url("icons/configure.svg"); } .i_login { - background-image: url("../icons/login.png"); background-image: url("../icons/login.svg"); } .i_logout { - background-image: url("../icons/logout.png"); background-image: url("../icons/logout.svg"); } .i_add { - background-image: url("icons/add.png"); background-image: url("icons/add.svg"); } .i_link { - background-image: url("../icons/link.png"); background-image: url("../icons/link.svg"); } .i_down { - background-image: url("icons/down.png"); background-image: url("icons/down.svg"); } .i_up { - background-image: url("icons/up.png"); background-image: url("icons/up.svg"); } .i_next { - background-image: url("icons/next.png"); background-image: url("icons/next.svg"); } .i_prev { - background-image: url("icons/previous.png"); - background-image: url("icons/previous.svg"); + background-image: url("icons/prev.svg"); } .i_help { - background-image: url("../icons/help.png"); background-image: url("../icons/help.svg"); } .i_category { - background-image: url("../icons/category-white.png"); background-image: url("../icons/category-white.svg"); } .i_category-white { - background-image: url("../icons/category-white.png"); background-image: url("../icons/category-white.svg"); } .i_rss { - background-image: url("../icons/rss.png"); background-image: url("../icons/rss.svg"); } .i_share { - background-image: url("../icons/share.png"); background-image: url("../icons/share.svg"); } .i_starred { - background-image: url("../icons/starred.png"); background-image: url("../icons/starred.svg"); } .i_non-starred { - background-image: url("../icons/non-starred.png"); background-image: url("../icons/non-starred.svg"); } .i_tag { - background-image: url("../icons/tag.png"); background-image: url("../icons/tag.svg"); } diff --git a/public/themes/flat-design/icons/add.png b/public/themes/flat-design/icons/add.png Binary files differdeleted file mode 100644 index 237de3e15..000000000 --- a/public/themes/flat-design/icons/add.png +++ /dev/null diff --git a/public/themes/flat-design/icons/all.png b/public/themes/flat-design/icons/all.png Binary files differdeleted file mode 100644 index 6d8338ac7..000000000 --- a/public/themes/flat-design/icons/all.png +++ /dev/null diff --git a/public/themes/flat-design/icons/close.png b/public/themes/flat-design/icons/close.png Binary files differdeleted file mode 100644 index 1f91a4f4e..000000000 --- a/public/themes/flat-design/icons/close.png +++ /dev/null diff --git a/public/themes/flat-design/icons/configure.png b/public/themes/flat-design/icons/configure.png Binary files differdeleted file mode 100644 index 982c24619..000000000 --- a/public/themes/flat-design/icons/configure.png +++ /dev/null diff --git a/public/themes/flat-design/icons/down.png b/public/themes/flat-design/icons/down.png Binary files differdeleted file mode 100644 index 4603976ac..000000000 --- a/public/themes/flat-design/icons/down.png +++ /dev/null diff --git a/public/themes/flat-design/icons/next.png b/public/themes/flat-design/icons/next.png Binary files differdeleted file mode 100644 index d240ac6eb..000000000 --- a/public/themes/flat-design/icons/next.png +++ /dev/null diff --git a/public/themes/flat-design/icons/previous.svg b/public/themes/flat-design/icons/prev.svg index 9ba03ceb2..9ba03ceb2 100644 --- a/public/themes/flat-design/icons/previous.svg +++ b/public/themes/flat-design/icons/prev.svg diff --git a/public/themes/flat-design/icons/previous.png b/public/themes/flat-design/icons/previous.png Binary files differdeleted file mode 100644 index b541f6c0c..000000000 --- a/public/themes/flat-design/icons/previous.png +++ /dev/null diff --git a/public/themes/flat-design/icons/refresh.png b/public/themes/flat-design/icons/refresh.png Binary files differdeleted file mode 100644 index 2fdd1b0a5..000000000 --- a/public/themes/flat-design/icons/refresh.png +++ /dev/null diff --git a/public/themes/flat-design/icons/search.png b/public/themes/flat-design/icons/search.png Binary files differdeleted file mode 100644 index 60e25d121..000000000 --- a/public/themes/flat-design/icons/search.png +++ /dev/null diff --git a/public/themes/flat-design/icons/up.png b/public/themes/flat-design/icons/up.png Binary files differdeleted file mode 100644 index 3a6fcd898..000000000 --- a/public/themes/flat-design/icons/up.png +++ /dev/null diff --git a/public/themes/icons/add.png b/public/themes/icons/add.png Binary files differdeleted file mode 100644 index 90cdf4830..000000000 --- a/public/themes/icons/add.png +++ /dev/null diff --git a/public/themes/icons/all.png b/public/themes/icons/all.png Binary files differdeleted file mode 100644 index b0dbe5483..000000000 --- a/public/themes/icons/all.png +++ /dev/null diff --git a/public/themes/icons/bookmark.svg b/public/themes/icons/bookmark.svg new file mode 100644 index 000000000..d6e2cebb5 --- /dev/null +++ b/public/themes/icons/bookmark.svg @@ -0,0 +1,32 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' sodipodi:docname='starred-symbolic.svg' version='1.1' inkscape:version='0.48.1 r9760' height='16' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'> + <metadata id='metadata90'> + <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>Gnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview inkscape:cy='0.50817' pagecolor='#555753' borderopacity='1' showborder='false' inkscape:bbox-paths='false' guidetolerance='10' inkscape:object-paths='true' inkscape:window-width='1457' showguides='true' inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:snap-nodes='false' bordercolor='#666666' objecttolerance='10' id='namedview88' showgrid='false' inkscape:window-maximized='0' inkscape:window-x='86' inkscape:snap-global='true' inkscape:window-y='51' gridtolerance='10' inkscape:window-height='1093' inkscape:snap-to-guides='true' inkscape:current-layer='layer9' inkscape:snap-bbox-midpoints='false' inkscape:zoom='1' inkscape:cx='19.029058' inkscape:snap-grids='true' inkscape:pageopacity='1'> + <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' snapvisiblegridlinesonly='true' visible='true'/> + </sodipodi:namedview> + <title id='title9167'>Gnome Symbolic Icon Theme</title> + <defs id='defs7386'/> + <g inkscape:label='status' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer9' style='display:inline'> + <g inkscape:label='folder-remote' transform='translate(-186.9996,-599)' id='g11910-1'> + + </g> + <path sodipodi:cy='180.96373' sodipodi:r2='3.8276224' transform='matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)' inkscape:rounded='0.2104596' inkscape:flatsided='false' inkscape:transform-center-x='-0.0094346789' inkscape:transform-center-y='-0.69491065' d='m 530.9488,186.70897 c -0.77941,0.55189 -3.15759,-1.90601 -4.11253,-1.9179 -0.95532,-0.0119 -3.39494,2.38585 -4.16096,1.8149 -0.76573,-0.57072 0.83698,-3.59203 0.55319,-4.50391 -0.2839,-0.91223 -3.31818,-2.49151 -3.01189,-3.39647 0.30617,-0.90461 3.67487,-0.31399 4.45442,-0.86567 0.77986,-0.5519 1.3442,-3.92569 2.29952,-3.91404 0.95494,0.0116 1.43421,3.39798 2.19979,3.9689 0.76588,0.57114 4.14893,0.0653 4.43307,0.97746 0.28402,0.9118 -2.78848,2.41405 -3.09488,3.31858 -0.30652,0.90489 1.21999,3.96605 0.44027,4.51815 z' id='path11922-0' sodipodi:type='star' sodipodi:arg1='0.95492637' sodipodi:r1='7.0383992' style='color:#000000;fill:#f1c40f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' sodipodi:arg2='1.5829876' inkscape:randomized='0' sodipodi:cx='526.88293' sodipodi:sides='5'/> + </g> + <g inkscape:label='devices' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer10'/> + <g inkscape:label='apps' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer11'/> + <g inkscape:label='actions' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer12'/> + <g inkscape:label='places' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer13'/> + <g inkscape:label='mimetypes' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer14'/> + <g inkscape:label='emblems' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='layer15' style='display:inline'/> + <g inkscape:label='categories' transform='translate(-41.000202,-397)' inkscape:groupmode='layer' id='g4953' style='display:inline'/> +</svg> diff --git a/public/themes/icons/category-white.png b/public/themes/icons/category-white.png Binary files differdeleted file mode 100644 index 9243650da..000000000 --- a/public/themes/icons/category-white.png +++ /dev/null diff --git a/public/themes/icons/category.png b/public/themes/icons/category.png Binary files differdeleted file mode 100644 index e3a9bf34b..000000000 --- a/public/themes/icons/category.png +++ /dev/null diff --git a/public/themes/icons/close.png b/public/themes/icons/close.png Binary files differdeleted file mode 100644 index 452f1d1cf..000000000 --- a/public/themes/icons/close.png +++ /dev/null diff --git a/public/themes/icons/configure.png b/public/themes/icons/configure.png Binary files differdeleted file mode 100644 index 8c6fb531c..000000000 --- a/public/themes/icons/configure.png +++ /dev/null diff --git a/public/themes/icons/down.png b/public/themes/icons/down.png Binary files differdeleted file mode 100644 index 5a647245f..000000000 --- a/public/themes/icons/down.png +++ /dev/null diff --git a/public/themes/icons/help.png b/public/themes/icons/help.png Binary files differdeleted file mode 100644 index aa63c5411..000000000 --- a/public/themes/icons/help.png +++ /dev/null diff --git a/public/themes/icons/icon-128.png b/public/themes/icons/icon-128.png Binary files differdeleted file mode 100644 index 41f8eaa0f..000000000 --- a/public/themes/icons/icon-128.png +++ /dev/null diff --git a/public/themes/icons/icon-16.png b/public/themes/icons/icon-16.png Binary files differdeleted file mode 100644 index cc6efb54b..000000000 --- a/public/themes/icons/icon-16.png +++ /dev/null diff --git a/public/themes/icons/icon-256.png b/public/themes/icons/icon-256.png Binary files differdeleted file mode 100644 index 979581a75..000000000 --- a/public/themes/icons/icon-256.png +++ /dev/null diff --git a/public/themes/icons/icon-32.png b/public/themes/icons/icon-32.png Binary files differdeleted file mode 100644 index 00c4ce2a9..000000000 --- a/public/themes/icons/icon-32.png +++ /dev/null diff --git a/public/themes/icons/icon-64.png b/public/themes/icons/icon-64.png Binary files differdeleted file mode 100644 index e2dad000d..000000000 --- a/public/themes/icons/icon-64.png +++ /dev/null diff --git a/public/themes/icons/link.png b/public/themes/icons/link.png Binary files differdeleted file mode 100644 index de2b187d7..000000000 --- a/public/themes/icons/link.png +++ /dev/null diff --git a/public/themes/icons/login.png b/public/themes/icons/login.png Binary files differdeleted file mode 100644 index cebe0cf7d..000000000 --- a/public/themes/icons/login.png +++ /dev/null diff --git a/public/themes/icons/logout.png b/public/themes/icons/logout.png Binary files differdeleted file mode 100644 index 49255fccd..000000000 --- a/public/themes/icons/logout.png +++ /dev/null diff --git a/public/themes/icons/next.png b/public/themes/icons/next.png Binary files differdeleted file mode 100644 index ab3490c3b..000000000 --- a/public/themes/icons/next.png +++ /dev/null diff --git a/public/themes/icons/non-starred.png b/public/themes/icons/non-starred.png Binary files differdeleted file mode 100644 index 4aafb6d8a..000000000 --- a/public/themes/icons/non-starred.png +++ /dev/null diff --git a/public/themes/icons/previous.svg b/public/themes/icons/prev.svg index 67685c50c..67685c50c 100644 --- a/public/themes/icons/previous.svg +++ b/public/themes/icons/prev.svg diff --git a/public/themes/icons/previous.png b/public/themes/icons/previous.png Binary files differdeleted file mode 100644 index 10e40669e..000000000 --- a/public/themes/icons/previous.png +++ /dev/null diff --git a/public/themes/icons/read.png b/public/themes/icons/read.png Binary files differdeleted file mode 100644 index a402689c7..000000000 --- a/public/themes/icons/read.png +++ /dev/null diff --git a/public/themes/icons/refresh.png b/public/themes/icons/refresh.png Binary files differdeleted file mode 100644 index dba399981..000000000 --- a/public/themes/icons/refresh.png +++ /dev/null diff --git a/public/themes/icons/rss.png b/public/themes/icons/rss.png Binary files differdeleted file mode 100644 index c20455af0..000000000 --- a/public/themes/icons/rss.png +++ /dev/null diff --git a/public/themes/icons/search.png b/public/themes/icons/search.png Binary files differdeleted file mode 100644 index 48e7373c4..000000000 --- a/public/themes/icons/search.png +++ /dev/null diff --git a/public/themes/icons/share.png b/public/themes/icons/share.png Binary files differdeleted file mode 100644 index 74c4c5dda..000000000 --- a/public/themes/icons/share.png +++ /dev/null diff --git a/public/themes/icons/starred.png b/public/themes/icons/starred.png Binary files differdeleted file mode 100644 index ff2cf31a7..000000000 --- a/public/themes/icons/starred.png +++ /dev/null diff --git a/public/themes/icons/tag.png b/public/themes/icons/tag.png Binary files differdeleted file mode 100644 index cb1a13833..000000000 --- a/public/themes/icons/tag.png +++ /dev/null diff --git a/public/themes/icons/unread.png b/public/themes/icons/unread.png Binary files differdeleted file mode 100644 index ffcd323b1..000000000 --- a/public/themes/icons/unread.png +++ /dev/null diff --git a/public/themes/icons/up.png b/public/themes/icons/up.png Binary files differdeleted file mode 100644 index 8bfc2fb13..000000000 --- a/public/themes/icons/up.png +++ /dev/null |
