diff options
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | css/addnew.css | 6 | ||||
-rw-r--r-- | css/feeds.css | 20 | ||||
-rw-r--r-- | css/items.css | 22 | ||||
-rw-r--r-- | css/settings.css | 6 | ||||
-rw-r--r-- | img/delete.svg | 6 | ||||
-rw-r--r-- | img/link.svg | 12 | ||||
-rw-r--r-- | img/loading.gif | bin | 0 -> 3208 bytes | |||
-rw-r--r-- | img/rename.svg | 6 | ||||
-rw-r--r-- | img/share.svg | 6 | ||||
-rw-r--r-- | img/upload.svg | 6 |
11 files changed, 64 insertions, 27 deletions
@@ -1,5 +1,6 @@ owncloud-news (1.805) * Hide editing tools in invalid feed dialog +* Use local copies of icons to reflect changes in oc 7 owncloud-news (1.804) * Make it possible to rename folders 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; diff --git a/img/delete.svg b/img/delete.svg new file mode 100644 index 000000000..ef564bfd4 --- /dev/null +++ b/img/delete.svg @@ -0,0 +1,6 @@ +<?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/link.svg b/img/link.svg new file mode 100644 index 000000000..8784ebc14 --- /dev/null +++ b/img/link.svg @@ -0,0 +1,12 @@ +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata> + <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/> + </cc:Work> + </rdf:RDF> + </metadata> + <path fill="#333" d="M16,4c-6.6274,0-12,5.3726-12,12,0,6.627,5.3726,12,12,12,6.627,0,12-5.373,12-12,0-6.6274-5.373-12-12-12zm1.375,1.5313c2.059,0.0457,3.879,1.2826,5.719,2.0938l2.9691,4.1093-0.46971,1.7657,0.90686,0.56246-0.01543,2.0937c-0.02074,0.59892,0.0086,1.1986-0.0156,1.7969-0.28517,1.1355-0.94394,2.1713-1.5,3.2031-0.37695,0.18585,0.03437-1.2317-0.20313-1.6719,0.05486-1.0173-0.80743-0.97029-1.3903-0.40526-0.72172,0.42068-2.3074,0.54754-2.3589-0.59383-0.40972-1.3716-0.06-2.833,0.49886-4.1093l-0.921-1.125,0.327-2.891-1.469-1.4839,0.345-1.6252-1.719-0.9687c-0.339-0.2661-0.984-0.3713-1.125-0.7344,0.13954-0.00789,0.28457-0.018686,0.42189-0.0156zm-4.2187,0.015634c0.0539,0.00789,0.11999,0.045309,0.21874,0.125,0.57943,0.31834-0.14143,0.67954-0.31251,1.0157-0.92537,0.62589,0.28457,1.1385,0.68743,1.6406,0.64577-0.18549,1.2917-1.1086,2.2344-0.828,1.2058-0.37629,1.0137,1.0099,1.7031,1.625,0.08948,0.28954,1.5086,1.2317,0.65623,0.92177-0.702-0.54411-1.4827-0.50314-1.9845,0.28131-1.355,0.735-0.552-1.4144-1.202-1.9373-0.982-1.0957-0.57,0.8186-0.687,1.3907-0.639-0.0139-1.831-0.4913-2.485,0.2816l0.64046,1.0467,0.76577-1.1719c0.186-0.42411,0.41949,0.32966,0.62486,0.46886,0.24531,0.47297,1.4109,1.2744,0.53126,1.5-1.3039,0.72326-2.3295,1.8202-3.4375,2.7969-0.37371,0.78857-1.1366,0.6984-1.6094,0.0468-1.1438-0.70372-1.0589,1.1256-0.99994,1.8125l1.0013-0.626v1.0312c-0.028286,0.19509-0.00411,0.39806-0.0156,0.59383-0.70063,0.732-1.4069-1.0277-2.0157-1.422l-0.0468-2.5781c0.022114-0.72429-0.1308-1.4659,0.0156-2.1718,1.3779-1.4789,2.7775-3.0107,3.5935-4.891h1.3437c0.93909,0.45497,0.40406-1.0082,0.7812-0.95314zm-1.984,13.406c0.16303-0.01739,0.34848,0.01984,0.54688,0.12501,1.265,0.18106,2.2109,1.0987,3.2187,1.7969,0.80352,0.79632,2.5419,0.54134,2.7345,1.8907-0.29248,1.4636-1.7323,2.2495-3,2.7657-0.31646,0.17657-0.65657,0.31714-1.0157,0.37543-1.1753,0.29314-1.6834-0.912-1.9219-1.8137-0.53212-1.1143-1.8621-1.9577-1.6718-3.3274,0.0312-0.68057,0.40286-1.7373,1.1093-1.8125z"/> +</svg> diff --git a/img/loading.gif b/img/loading.gif Binary files differnew file mode 100644 index 000000000..f8f3dff6f --- /dev/null +++ b/img/loading.gif diff --git a/img/rename.svg b/img/rename.svg new file mode 100644 index 000000000..d6779709d --- /dev/null +++ b/img/rename.svg @@ -0,0 +1,6 @@ +<?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 new file mode 100644 index 000000000..d67d35c6e --- /dev/null +++ b/img/share.svg @@ -0,0 +1,6 @@ +<?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 new file mode 100644 index 000000000..eae4515c7 --- /dev/null +++ b/img/upload.svg @@ -0,0 +1,6 @@ +<?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> |