Merge branch 'releases'0.3.0

26 files changed, 260 insertions, 13 deletions

diff --git a/public/theme/fallback.css b/public/theme/fallback.css
new file mode 100644
index 000000000..579b2eaa8
--- /dev/null
+++ b/public/theme/fallback.css
@@ -0,0 +1,65 @@
+.btn {
+	background: #fff;
+	background: -moz-linear-gradient(top, #fff 0%, #eee 100%);
+	background: -webkit-linear-gradient(top, #fff 0%, #eee 100%);
+	background: -o-linear-gradient(top, #fff 0%, #eee 100%);
+	background: -ms-linear-gradient(top, #fff 0%, #eee 100%);
+}
+	.btn:hover {
+		background: #f0f0f0;
+		background: -moz-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+		background: -webkit-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+		background: -o-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+		background: -ms-linear-gradient(top, #f8f8f8 0%, #f0f0f0 100%);
+	}
+	.btn.btn-important {
+		background: #0084CC;
+		background: -moz-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+		background: -webkit-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+		background: -o-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+		background: -ms-linear-gradient(top, #0084CC 0%, #0045CC 100%);
+	}
+		.btn.btn-important:hover {
+			background: -moz-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+			background: -webkit-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+			background: -o-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+			background: -ms-linear-gradient(top, #0066CC 0%, #0045CC 100%);
+		}
+	.btn.btn-attention {
+		background: #E95B57;
+		background: -moz-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+		background: -webkit-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+		background: -o-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+		background: -ms-linear-gradient(top, #E95B57 0%, #BD362F 100%);
+	}
+		.btn.btn-attention:hover {
+			background: -moz-linear-gradient(top, #D14641 0%, #BD362F 100%);
+			background: -webkit-linear-gradient(top, #D14641 0%, #BD362F 100%);
+			background: -o-linear-gradient(top, #D14641 0%, #BD362F 100%);
+			background: -ms-linear-gradient(top, #D14641 0%, #BD362F 100%);
+		}
+
+
+.nav-head {
+	background: #fff;
+	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -webkit-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+}
+
+.header > .item.search input {
+	-moz-transition: width 200ms linear;
+	 -webkit-transition: width 200ms linear;
+	-o-transition: width 200ms linear;
+	-ms-transition: width 200ms linear;
+}
+
+@media(max-width: 840px) {
+	.aside {
+		-moz-transition: width 200ms linear;
+		 -webkit-transition: width 200ms linear;
+		-o-transition: width 200ms linear;
+		-ms-transition: width 200ms linear;
+	}
+}
diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css
index ed6646269..880b45085 100644
--- a/public/theme/freshrss.css
+++ b/public/theme/freshrss.css
@@ -15,16 +15,23 @@
 		.header > .item.title {
 			width: 250px;
 		}
+			.header > .item.title .logo {
+				display: inline-block;
+				width: 32px;
+				padding: 10px;
+			}
 			.header > .item.title h1 {
+				display: inline-block;
 				margin: 0;
 				text-shadow: 1px -1px 0 #ccc;
+				vertical-align: bottom;
 			}
 			.header > .item.title a:hover {
 				text-decoration: none;
 			}
 		.header > .item.search input {
 			width: 200px;
-			transition: all 200ms linear;
+			transition: width 200ms linear;
 		}
 			.header .item.search input:focus {
 				width: 300px;
@@ -127,6 +134,7 @@
 		}
 			.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle i,
 			.categories .feeds .item:hover .dropdown-toggle i {
+				background-image: url("icons/configure.png");
 				background-image: url("icons/configure.svg");
 			}
 	.categories .notRead {
@@ -199,6 +207,7 @@
 				display: inline-block;
 				width: 30px;
 				height: 40px;
+				background: url("icons/read.png") center center no-repeat;
 				background: url("icons/read.svg") center center no-repeat;
 				vertical-align: middle;
 			}
@@ -206,12 +215,14 @@
 					text-decoration: none;
 				}
 				.flux.not_read .flux_header .item.manage .read {
+					background: url("icons/unread.png") center center no-repeat;
 					background: url("icons/unread.svg") center center no-repeat;
 				}
 			.flux_header .item.manage .bookmark {
 				display: inline-block;
 				width: 30px;
 				height: 40px;
+				background: url("icons/non-starred.png") center center no-repeat;
 				background: url("icons/non-starred.svg") center center no-repeat;
 				vertical-align: middle;
 			}
@@ -219,6 +230,7 @@
 					text-decoration: none;
 				}
 				.flux.favorite .flux_header .item.manage .bookmark {
+					background: url("icons/starred.png") center center no-repeat;
 					background: url("icons/starred.svg") center center no-repeat;
 				}
 		.flux_header .item.website {
@@ -260,6 +272,7 @@
 				display: inline-block;
 				width: 35px;
 				height: 40px;
+				background: url("icons/link.png") center center no-repeat;
 				background: url("icons/link.svg") center center no-repeat;
 				vertical-align: middle;
 			}
diff --git a/public/theme/global.css b/public/theme/global.css
index c08463b8b..99b335585 100644
--- a/public/theme/global.css
+++ b/public/theme/global.css
@@ -42,6 +42,7 @@ h1, h2, h3 {
 
 /* IMG */
 img {
+	height: auto;
 	max-width: 100%;
 	vertical-align: middle;
 }
@@ -172,8 +173,7 @@ input, select, textarea {
 	min-height: 37px;
 	min-width: 15px;
 	padding: 5px 10px;
-	background: #fff;
-	background: linear-gradient(#fff, #eee);
+	background: linear-gradient(to bottom, #fff 0%, #eee 100%);
 	border-radius: 3px;
 	border: 1px solid #ddd;
 	border-bottom: 1px solid #aaa;
@@ -189,8 +189,7 @@ input, select, textarea {
 		line-height: 25px;
 	}
 	.btn:hover {
-		background: #f0f0f0;
-		background: linear-gradient(#f8f8f8, #f0f0f0);
+		background: linear-gradient(to bottom, #f8f8f8, #f0f0f0);
 		text-decoration: none;
 	}
 	.btn.active,
@@ -200,14 +199,13 @@ input, select, textarea {
 	}
 
 	.btn.btn-important {
-		background: #0084CC;
-		background: linear-gradient(#0084CC, #0045CC);
+		background: linear-gradient(to bottom, #0084CC, #0045CC);
 		color: #fff;
 		border: 1px solid #0062B7;
 		text-shadow: 0px -1px 0 #aaa;
 	}
 		.btn.btn-important:hover {
-			background: linear-gradient(#0066CC, #0045CC);
+			background: linear-gradient(to bottom, #0066CC, #0045CC);
 		}
 		.btn.btn-important:active {
 			background: #0044CB;
@@ -215,14 +213,13 @@ input, select, textarea {
 		}
 
 	.btn.btn-attention {
-		background: #E95B57;
-		background: linear-gradient(#E95B57, #BD362F);
+		background: linear-gradient(to bottom, #E95B57, #BD362F);
 		color: #fff;
 		border: 1px solid #C44742;
 		text-shadow: 0px -1px 0px #666;
 	}
 		.btn.btn-attention:hover {
-			background: linear-gradient(#D14641, #BD362F);
+			background: linear-gradient(to bottom, #D14641, #BD362F);
 		}
 		.btn.btn-attention:active {
 			background: #BD362F;
@@ -288,8 +285,7 @@ input, select, textarea {
 .nav-head {
 	display: block;
 	margin: 0;
-	background: #fff;
-	background: linear-gradient(#fff, #f0f0f0);
+	background: linear-gradient(to bottom, #fff, #f0f0f0);
 	border-bottom: 1px solid #ddd;
 	text-align: right;
 }
@@ -360,6 +356,20 @@ input, select, textarea {
 					color: #fff;
 					text-decoration: none;
 				}
+		.dropdown .dropdown-menu .input {
+			display: block;
+			height: 40px;
+			font-size: 90%;
+			line-height: 30px;
+		}
+			.dropdown .dropdown-menu .input input {
+				display: block;
+				height: 20px;
+				width: 95%;
+				margin: auto;
+				padding: 2px 5px;
+				border-radius: 3px;
+			}
 		.dropdown .dropdown-menu .separator {
 			display: block;
 			height: 0;
@@ -432,65 +442,90 @@ input, select, textarea {
 	background: center center no-repeat;
 }
 	.icon.i_refresh {
+		background-image: url("icons/refresh.png");
 		background-image: url("icons/refresh.svg");
 	}
 	.icon.i_bookmark {
+		background-image: url("icons/starred.png");
 		background-image: url("icons/starred.svg");
 	}
 	.icon.i_not_bookmark {
+		background-image: url("icons/unstarred.png");
 		background-image: url("icons/unstarred.svg");
 	}
 	.icon.i_read {
+		background-image: url("icons/read.png");
 		background-image: url("icons/read.svg");
 	}
 	.icon.i_unread {
+		background-image: url("icons/unread.png");
 		background-image: url("icons/unread.svg");
 	}
 	.icon.i_all {
+		background-image: url("icons/all.png");
 		background-image: url("icons/all.svg");
 	}
 	.icon.i_close {
+		background-image: url("icons/close.png");
 		background-image: url("icons/close.svg");
 	}
 	.icon.i_search {
+		background-image: url("icons/search.png");
 		background-image: url("icons/search.svg");
 	}
 	.icon.i_configure {
+		background-image: url("icons/configure.png");
 		background-image: url("icons/configure.svg");
 	}
 	.icon.i_login {
+		background-image: url("icons/login.png");
 		background-image: url("icons/login.svg");
 	}
 	.icon.i_logout {
+		background-image: url("icons/logout.png");
 		background-image: url("icons/logout.svg");
 	}
 	.icon.i_add {
+		background-image: url("icons/add.png");
 		background-image: url("icons/add.svg");
 	}
 	.icon.i_link {
+		background-image: url("icons/link.png");
 		background-image: url("icons/link.svg");
 	}
 	.icon.i_down {
+		background-image: url("icons/down.png");
 		background-image: url("icons/down.svg");
 	}
 	.icon.i_up {
+		background-image: url("icons/up.png");
 		background-image: url("icons/up.svg");
 	}
 	.icon.i_help {
+		background-image: url("icons/help.png");
 		background-image: url("icons/help.svg");
 	}
 	.icon.i_note {
+		background-image: url("icons/note.png");
 		background-image: url("icons/note.svg");
 	}
 	.icon.i_note_empty {
+		background-image: url("icons/note_empty.png");
 		background-image: url("icons/note_empty.svg");
 	}
 	.icon.i_category {
+		background-image: url("icons/category.png");
 		background-image: url("icons/category.svg");
 	}
 	.icon.i_rss {
+		background-image: url("icons/rss.png");
 		background-image: url("icons/rss.svg");
 	}
 	.icon.i_share {
+		background-image: url("icons/share.png");
 		background-image: url("icons/share.svg");
 	}
+	.icon.i_tag {
+		background-image: url("icons/tag.png");
+		background-image: url("icons/tag.svg");
+	}
diff --git a/public/theme/icons/add.png b/public/theme/icons/add.png
new file mode 100644
index 000000000..90cdf4830
--- /dev/null
+++ b/public/theme/icons/add.png
diff --git a/public/theme/icons/all.png b/public/theme/icons/all.png
new file mode 100644
index 000000000..b0dbe5483
--- /dev/null
+++ b/public/theme/icons/all.png
diff --git a/public/theme/icons/category.png b/public/theme/icons/category.png
new file mode 100644
index 000000000..e3a9bf34b
--- /dev/null
+++ b/public/theme/icons/category.png
diff --git a/public/theme/icons/close.png b/public/theme/icons/close.png
new file mode 100644
index 000000000..452f1d1cf
--- /dev/null
+++ b/public/theme/icons/close.png
diff --git a/public/theme/icons/configure.png b/public/theme/icons/configure.png
new file mode 100644
index 000000000..8c6fb531c
--- /dev/null
+++ b/public/theme/icons/configure.png
diff --git a/public/theme/icons/down.png b/public/theme/icons/down.png
new file mode 100644
index 000000000..5a647245f
--- /dev/null
+++ b/public/theme/icons/down.png
diff --git a/public/theme/icons/help.png b/public/theme/icons/help.png
new file mode 100644
index 000000000..aa63c5411
--- /dev/null
+++ b/public/theme/icons/help.png
diff --git a/public/theme/icons/link.png b/public/theme/icons/link.png
new file mode 100644
index 000000000..de2b187d7
--- /dev/null
+++ b/public/theme/icons/link.png
diff --git a/public/theme/icons/login.png b/public/theme/icons/login.png
new file mode 100644
index 000000000..cebe0cf7d
--- /dev/null
+++ b/public/theme/icons/login.png
diff --git a/public/theme/icons/logout.png b/public/theme/icons/logout.png
new file mode 100644
index 000000000..49255fccd
--- /dev/null
+++ b/public/theme/icons/logout.png
diff --git a/public/theme/icons/non-starred.png b/public/theme/icons/non-starred.png
new file mode 100644
index 000000000..4aafb6d8a
--- /dev/null
+++ b/public/theme/icons/non-starred.png
diff --git a/public/theme/icons/note.png b/public/theme/icons/note.png
new file mode 100644
index 000000000..d819ebd02
--- /dev/null
+++ b/public/theme/icons/note.png
diff --git a/public/theme/icons/note_empty.png b/public/theme/icons/note_empty.png
new file mode 100644
index 000000000..c26ad2b16
--- /dev/null
+++ b/public/theme/icons/note_empty.png
diff --git a/public/theme/icons/read.png b/public/theme/icons/read.png
new file mode 100644
index 000000000..a402689c7
--- /dev/null
+++ b/public/theme/icons/read.png
diff --git a/public/theme/icons/refresh.png b/public/theme/icons/refresh.png
new file mode 100644
index 000000000..dba399981
--- /dev/null
+++ b/public/theme/icons/refresh.png
diff --git a/public/theme/icons/rss.png b/public/theme/icons/rss.png
new file mode 100644
index 000000000..c20455af0
--- /dev/null
+++ b/public/theme/icons/rss.png
diff --git a/public/theme/icons/search.png b/public/theme/icons/search.png
new file mode 100644
index 000000000..48e7373c4
--- /dev/null
+++ b/public/theme/icons/search.png
diff --git a/public/theme/icons/share.png b/public/theme/icons/share.png
new file mode 100644
index 000000000..74c4c5dda
--- /dev/null
+++ b/public/theme/icons/share.png
diff --git a/public/theme/icons/starred.png b/public/theme/icons/starred.png
new file mode 100644
index 000000000..a6c076358
--- /dev/null
+++ b/public/theme/icons/starred.png
diff --git a/public/theme/icons/tag.png b/public/theme/icons/tag.png
new file mode 100644
index 000000000..cb1a13833
--- /dev/null
+++ b/public/theme/icons/tag.png
diff --git a/public/theme/icons/tag.svg b/public/theme/icons/tag.svg
new file mode 100644
index 000000000..688aca7a4
--- /dev/null
+++ b/public/theme/icons/tag.svg
@@ -0,0 +1,134 @@
+<?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://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"
+   sodipodi:docname="tag.svg"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.48.4 r9939"
+   version="1.1"
+   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:bbox-paths="false"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="63.620645"
+     inkscape:cy="27.761176"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#555753"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="709"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1366"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="4">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-141.0002,-807)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 149.0002,809 0,13 4,-4 4,4 c 0.0525,-6.84943 -0.0285,-10.58353 0,-13 z"
+       id="path12292"
+       sodipodi:nodetypes="cccccc"
+       style="fill:#bebebe;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/public/theme/icons/unread.png b/public/theme/icons/unread.png
new file mode 100644
index 000000000..ab6e3fb39
--- /dev/null
+++ b/public/theme/icons/unread.png
diff --git a/public/theme/icons/up.png b/public/theme/icons/up.png
new file mode 100644
index 000000000..8bfc2fb13
--- /dev/null
+++ b/public/theme/icons/up.png