merge

16 files changed, 62 insertions, 71 deletions

diff --git a/img/add.svg b/img/add.svg
deleted file mode 100644
index ecbab6f13..000000000
--- a/img/add.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="matrix(-0.70711,-0.70711,0.70711,-0.70711,-724.84998,753.15998)">
-  <path d="m3.7547,1041.6,1.4142-1.4142,3.5355,3.5355,3.5355-3.5355,1.4142,1.4142-3.5355,3.5355,3.5355,3.5356-1.4142,1.4142-3.5355-3.5356-3.5164,3.5547-1.4333-1.4333,3.5355-3.5356z"/>
- </g>
-</svg>
diff --git a/img/app.png b/img/app.png
deleted file mode 100644
index 90b5b130b..000000000
--- a/img/app.png
+++ /dev/null
diff --git a/img/download.svg b/img/arrow.svg
index ef0618017..ec0462401 100644
--- a/img/download.svg
+++ b/img/arrow.svg
@@ -11,8 +11,8 @@
    width="16"
    version="1.1"
    id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="upload.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="confirm.svg">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -21,7 +21,6 @@
         <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>
@@ -36,22 +35,22 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
      id="namedview8"
      showgrid="false"
      inkscape:zoom="14.75"
-     inkscape:cx="8.1355932"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:window-x="0"
      inkscape:window-y="27"
-     inkscape:window-maximized="1"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
   <g
-     transform="matrix(-1,0,0,-1,16,1052.4)"
+     transform="matrix(-1,0,0,1,16,-1036.4)"
      id="g4">
     <path
-       d="M 10,1051.4 H 6 l -1,-7 H 1 l 7,-7 7,7 h -4 z"
+       d="m 1,1047.4 v -6 h 7 v -4 l 7,7 -7,7 v -4 z"
        id="path6"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/img/close.svg b/img/close.svg
new file mode 100644
index 000000000..ca18e241e
--- /dev/null
+++ b/img/close.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="close.svg">
+  <metadata
+     id="metadata10">
+    <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>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M12.95,11.536,11.536,12.95,8,9.4142,4.4645,12.95,3.0503,11.536,6.5858,8,3.0503,4.4644,4.4645,3.0502,8,6.5858,11.516,3.0311,12.95,4.4644,9.4143,8z"
+     fill="#000"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
diff --git a/img/delete.svg b/img/delete.svg
deleted file mode 100644
index ef564bfd4..000000000
--- a/img/delete.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
- </g>
-</svg>
diff --git a/img/eye_all.png b/img/eye_all.png
deleted file mode 100644
index f01c615d6..000000000
--- a/img/eye_all.png
+++ /dev/null
diff --git a/img/eye_all.svg b/img/eye_all.svg
deleted file mode 100644
index 1b774a19b..000000000
--- a/img/eye_all.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 16 9" xml:space="preserve" overflow="visible" height="9px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 16 9">
-<path d="m7.999 0c-3.109 0-5.926 1.719-7.999 4.5 2.073 2.781 4.89 4.5 7.999 4.5 3.111 0 5.928-1.719 8.001-4.5-2.073-2.781-4.892-4.5-8.001-4.5zm0.001 7.5c-1.657 0-3-1.343-3-3s1.343-3 3-3c1.657 0 3 1.343 3 3s-1.343 3-3 3z" fill="#222"/>
-<circle cy="4.501" cx="8" r="1.5" fill="#222"/>
-</svg>
diff --git a/img/eye_unread.png b/img/eye_unread.png
deleted file mode 100644
index 99942ecbf..000000000
--- a/img/eye_unread.png
+++ /dev/null
diff --git a/img/eye_unread.svg b/img/eye_unread.svg
deleted file mode 100644
index 524a2be09..000000000
--- a/img/eye_unread.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 16 9" xml:space="preserve" overflow="visible" height="9px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 16 9">
-<path d="m7.999 0c-3.109 0-5.926 1.719-7.999 4.5 2.073 2.781 4.89 4.5 7.999 4.5 3.111 0 5.928-1.719 8.001-4.5-2.073-2.781-4.892-4.5-8.001-4.5zm0.001 7.5c-1.657 0-3-1.343-3-3s1.343-3 3-3c1.657 0 3 1.343 3 3s-1.343 3-3 3z" fill="#aaa"/>
-<circle cy="4.501" cx="8" r="1.5" fill="#aaa"/>
-</svg>
diff --git a/img/mark_read.svg b/img/mark_read.svg
deleted file mode 100644
index 879e682ef..000000000
--- a/img/mark_read.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new -0.5 -0.5 16 16" xml:space="preserve" overflow="visible" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="-0.5 -0.5 16 16">
-<circle opacity="0" cx="7.5" transform="translate(.066667 .4)" cy="7.5" r="7.5"/>
-<g transform="translate(.066667 1.0667)">
-	<path fill="#575756" d="m7.3832 11.62c-0.54975 0.54975-1.4486 0.54975-1.9983 0l-0.5003-0.5c-0.54975-0.54975-0.54834-1.4486 0-1.9983l5.9949-5.9949c0.54975-0.54975 1.4486-0.54975 1.9983 0l0.49887 0.49887c0.54975 0.54975 0.54975 1.45 0 1.9997l-5.9938 5.9946z"/>
-</g>
-<g transform="translate(.066667 1.0667)">
-	<path fill="#575756" d="m7.3832 11.62c-0.54975 0.54975-1.4486 0.54975-1.9983 0l-3.4949-3.4987c-0.5512-0.5498-0.5498-1.4486 0.0014-1.9983l0.4975-0.4961c0.55116-0.54975 1.45-0.54834 1.9997 0l3.4949 3.4935c0.54975 0.54975 0.54975 1.4486 0 1.9983l-0.50029 0.5017z"/>
-</g>
-</svg>
diff --git a/img/opml-icon-16x16.png b/img/opml-icon-16x16.png
deleted file mode 100644
index a6b2b5021..000000000
--- a/img/opml-icon-16x16.png
+++ /dev/null
diff --git a/img/opml-icon.svg b/img/opml-icon.svg
deleted file mode 100644
index 8e7dd2568..000000000
--- a/img/opml-icon.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xml:space="preserve" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"><defs>
-			<linearGradient id="a" y2="186.5" gradientUnits="userSpaceOnUse" x2="149.5" gradientTransform="translate(-56,-56)" y1="186.5" x1="149.5"><stop stop-color="#264fa1" offset="0"/><stop stop-color="#2658a1" offset=".1134"/><stop stop-color="#2570a1" offset=".29840"/><stop stop-color="#2492a1" offset=".5"/><stop stop-color="#2489a0" offset=".61470"/><stop stop-color="#26719f" offset=".8017"/><stop stop-color="#27509d" offset="1"/></linearGradient><filter id="g" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0"><feColorMatrix type="saturate" values="0"/></filter><filter id="f" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0"><feColorMatrix type="saturate" values="0"/></filter><filter id="e" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0"><feColorMatrix type="saturate" values="0"/></filter><filter id="d" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0"><feColorMatrix type="saturate" values="0"/></filter><filter id="c" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0"><feColorMatrix type="saturate" values="0"/></filter><linearGradient id="b" y2="11.994" gradientUnits="userSpaceOnUse" x2="11.993" gradientTransform="scale(.125)" y1="116.01" x1="116"><stop stop-color="#264fa1" offset="0"/><stop stop-color="#2658a1" offset=".1134"/><stop stop-color="#2570a1" offset=".29840"/><stop stop-color="#2492a1" offset=".5"/><stop stop-color="#2489a0" offset=".61470"/><stop stop-color="#26719f" offset=".8017"/><stop stop-color="#27509d" offset="1"/></linearGradient></defs>
-	<path filter="url(#c)" fill="#244fa1" d="m16 12.588c0.054 1.893-1.708 3.554-3.592 3.412-3.0575-0.003-6.1153 0.006-9.1728-0.004-1.8471-0.046-3.3884-1.8-3.2352-3.634 0.0029306-3.042-0.0058797-6.084 0.0044379-9.1258 0.044816-1.847 1.7985-3.3896 3.6326-3.2362 3.0425 0.0029304 6.0852-0.0058799 9.128 0.004439 1.847 0.045102 3.388 1.7997 3.235 3.6336v8.9501z"/><path filter="url(#d)" fill="#2492a1" d="m15.714 12.424c0.05243 1.8278-1.6513 3.4306-3.4701 3.2901-2.9462-0.0028-5.8926 0.0057-8.8387-0.0043-1.7843-0.044-3.2706-1.741-3.1194-3.512 0.00286-2.9307-0.00565-5.8614 0.0043-8.7918 0.04316-1.7843 1.7397-3.2719 3.5109-3.1206 2.9311 0.002831 5.8624-0.005677 8.7935 0.00428 1.7846 0.043339 3.2712 1.7408 3.1199 3.5119v8.6224z"/><path filter="url(#e)" fill="url(#b)" d="m15.428 12.261c0.05049 1.7625-1.5945 3.3062-3.3478 3.168-2.835-0.0027-5.6702 0.0055-8.5051-0.0041-1.7213-0.042-3.1527-1.683-3.0035-3.391 0.00273-2.8189-0.00547-5.6383 0.00412-8.4574 0.04136-1.7219 1.681-3.1545 3.3893-3.0052 2.8199 0.00271 5.6399-0.0055 8.4601 0.0041 1.7219 0.041871 3.153 1.6825 3.0039 3.3904v8.2947z"/><path filter="url(#f)" fill="#fff" d="m9.4665 8.1364c0.0538 1.0993-1.3456 1.8438-2.2272 1.1846-0.9329-0.5661-0.7814-2.1244 0.2426-2.501 0.9068-0.412 2.0115 0.3195 1.9846 1.3164z"/><path filter="url(#g)" fill="#fff" d="m2.2188 8.0101c-0.050683 2.6828 2.0084 5.1986 4.6426 5.6942 2.5355 0.56756 5.3193-0.82178 6.4084-3.1764 1.171-2.3273 0.495-5.3808-1.544-7.0014-2.0151-1.7287-5.2247-1.7674-7.2812-0.0877-1.3893 1.0796-2.239 2.8098-2.226 4.5712zm1.75 0c-0.0473-2.0562 1.6974-3.9384 3.7503-4.0506 2.0492-0.206 4.0589 1.3931 4.3279 3.4328 0.353 1.9947-1.033 4.0867-3.0016 4.5527-1.9184 0.539-4.1009-0.582-4.7944-2.4467-0.187-0.4724-0.2827-0.9802-0.2822-1.4882z"/><path fill="url(#a)" d="m93.5 130.5"/>
-</svg>
diff --git a/img/problem.svg b/img/problem.svg
deleted file mode 100644
index 2795e0587..000000000
--- a/img/problem.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <g fill="#f00" transform="translate(-.14973 7.5119e-7)">
-  <path opacity=".6" d="m5.1496 8.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0167-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.01736-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.5419-0.598-0.96979-1.1471-0.9291h-0.000001z"/>
-  <path opacity=".7" d="m5.1496 7.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0169-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.54186-0.598-0.96979-1.1471-0.92912h-0.000001z"/>
- </g>
-</svg>
diff --git a/img/rename.svg b/img/rename.svg
deleted file mode 100644
index d6779709d..000000000
--- a/img/rename.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m12.594 1.3438c-0.532-0.0313-1.094 0.1562-1.594 0.6562l3 3c1.5-1.5 0.188-3.5625-1.406-3.6562zm-2.594 1.6562l-7 7-2 5 5-2 7-7-3-3zm-6.5 7.5l2 2-2.5 1.5-1-1 1.5-2.5z" transform="translate(0 1036.4)"/>
- </g>
-</svg>
diff --git a/img/share.svg b/img/share.svg
deleted file mode 100644
index d67d35c6e..000000000
--- a/img/share.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
- </g>
-</svg>
diff --git a/img/upload.svg b/img/upload.svg
deleted file mode 100644
index eae4515c7..000000000
--- a/img/upload.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z"/>
- </g>
-</svg>