use local images to reflect changes in oc 7, fix #471

4 files changed, 27 insertions, 27 deletions

diff --git a/css/addnew.css b/css/addnew.css
index c069ce25c..82c3405ec 100644
--- a/css/addnew.css
+++ b/css/addnew.css
@@ -73,19 +73,19 @@
 
 .add-new .back-button {
 	border-radius: 0;
-	background-image: url('%webroot%/core/img/actions/delete.svg');
+	background-image: url('../img/delete.svg');
 }
 
 .add-new .new-button {
 	border-radius: 0;
-	background-image: url('%appswebroot%/news/img/add.svg');
+	background-image: url('../img/add.svg');
 	border-top-right-radius: 5px; 
 	border-bottom-right-radius: 5px; 
 }
 
 .add-new .create-button {
 	border-radius: 0;
-	background-image: url('%appswebroot%/news/img/mark_read.svg');
+	background-image: url('../img/mark_read.svg');
 	border-top-right-radius: 5px; 
 	border-bottom-right-radius: 5px; 
 }
diff --git a/css/feeds.css b/css/feeds.css
index 80f7825a6..027cf094b 100644
--- a/css/feeds.css
+++ b/css/feeds.css
@@ -54,11 +54,11 @@
 
 
 .starred-icon {
-	background-image: url('%appswebroot%/news/img/starred.png');
+	background-image: url('../img/starred.png');
 }
 
 .subscriptions-icon {
-	background-image: url('%appswebroot%/news/img/rss.svg');
+	background-image: url('../img/rss.svg');
 }
 
 .unread > a,
@@ -188,15 +188,15 @@ button.action:hover {
 }
 
 .delete-icon {
-	background-image: url('%webroot%/core/img/actions/delete.svg');
+	background-image: url('../img/delete.svg');
 }
 
 .rename-feed-icon {
-	background-image: url('%webroot%/core/img/actions/rename.svg');
+	background-image: url('../img/rename.svg');
 }
 
 .mark-read-icon {
-	background-image: url('%appswebroot%/news/img/mark_read.svg');
+	background-image: url('../img/mark_read.svg');
 }
 
 .rename-feed input {
@@ -223,16 +223,16 @@ button.action:hover {
 
 .rename-feed .back-button {
 	border-radius: 3px;
-	background-image: url('%webroot%/core/img/actions/delete.svg');
+	background-image: url('../img/delete.svg');
 }
 
 .rename-feed .create-button {
 	border-radius: 0;
-	background-image: url('%appswebroot%/news/img/mark_read.svg');
+	background-image: url('../img/mark_read.svg');
 }
 
 .rss-icon {
-	background-image: url('%appswebroot%/news/img/rss.svg');
+	background-image: url('../img/rss.svg');
 }
 
 #app-navigation .ui-draggable-dragging {
@@ -244,11 +244,11 @@ button.action:hover {
 }
 
 .progress-icon {
-	background-image: url('%webroot%/core/img/loading.gif'); 
+	background-image: url('../img/loading.gif'); 
 }
 
 .problem-icon {
-	background-image: url('%appswebroot%/news/img/problem.svg') !important;
+	background-image: url('../img/problem.svg') !important;
 }
 
 .failed {
diff --git a/css/items.css b/css/items.css
index eb54f6955..e19d0e3aa 100644
--- a/css/items.css
+++ b/css/items.css
@@ -27,7 +27,7 @@
 
 #app-content.autopaging:after {
 	content: '';
-	background-image: url('%webroot%/core/img/loading.gif');
+	background-image: url('../img/loading.gif');
 	background-position: center;
 	background-repeat: no-repeat;
 	background-size: 18px;
@@ -36,7 +36,7 @@
 }
 
 #app-content.loading {
-	background-image: url('%webroot%/core/img/loading.gif');
+	background-image: url('../img/loading.gif');
 	background-position: center;
 	background-repeat: no-repeat;
 }
@@ -50,11 +50,11 @@
 	-webkit-transition: height 0.5s;
 	-moz-transition: height 0.5s;
 	transition: height 0.5s;
-	background-image: url('%webroot%/core/img/loading.gif'), linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
-	background-image: url('%webroot%/core/img/loading.gif'), -o-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
-	background-image: url('%webroot%/core/img/loading.gif'), -moz-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
-	background-image: url('%webroot%/core/img/loading.gif'), -webkit-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
-	background-image: url('%webroot%/core/img/loading.gif'), -ms-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
+	background-image: url('../img/loading.gif'), linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
+	background-image: url('../img/loading.gif'), -o-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
+	background-image: url('../img/loading.gif'), -moz-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
+	background-image: url('../img/loading.gif'), -webkit-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
+	background-image: url('../img/loading.gif'), -ms-linear-gradient(top, rgb(235,235,235) 0%, rgb(248,248,248) 100%);
 	background-position: center 45px, center;
 	background-repeat: no-repeat;
 	background-size: 18px, 100%;
@@ -132,11 +132,11 @@
 		}
 
 		.feed_item .star {
-			background-image: url('%appswebroot%/news/img/inactive_star.svg');
+			background-image: url('../img/inactive_star.svg');
 		}
 
 		.feed_item .external {
-			background-image: url('%webroot%/core/img/places/link.svg');
+			background-image: url('../img/link.svg');
 			opacity: 0.4;
 		}
 
@@ -146,7 +146,7 @@
 
 		.feed_item .star.important,
 		.feed_item .star:hover {
-			background-image: url('%appswebroot%/news/img/active_star.svg');
+			background-image: url('../img/active_star.svg');
 		}
 		.feed_item .star.important:hover {
 			opacity:1;
@@ -447,7 +447,7 @@
 		}
 
 		.feed_item li.share_link {
-			background-image: url('%webroot%/core/img/actions/share.svg');
+			background-image: url('../img/share.svg');
 			background-repeat: no-repeat;
 			background-position: right center;
 			padding-right: 20px;
diff --git a/css/settings.css b/css/settings.css
index abf3b3ab8..74ada7c62 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -48,15 +48,15 @@
 }
 
 .upload-icon {
-	background-image: url('%webroot%/core/img/actions/upload.svg');
+	background-image: url('../img/upload.svg');
 }
 
 .download-icon {
-	background-image: url('%appswebroot%/news/img/download.svg');
+	background-image: url('../img/download.svg');
 }
 
 #app-settings .importing {
-	background-image: url('%webroot%/core/img/loading.gif'); 
+	background-image: url('../img/loading.gif'); 
 	background-repeat: no-repeat;
 	background-position: 5px center;
 	background-size: 16px;