Merge branch 'releases'0.3.0

1 files changed, 14 insertions, 1 deletions

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;
 			}