From 0eb02d89658a2f6667ebc008dfed829a924cf01d Mon Sep 17 00:00:00 2001
From: Marin Treselj <marin.treselj@forlagshuset.no>
Date: Tue, 28 Nov 2017 10:46:35 +0100
Subject: [PATCH] Update templates with new .icon-white and .icon-shadow
 classes; move toggle.svg to core, remove deprecated icons

Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
---
 css/slideshow.css          | 11 +----------
 img/folder.svg             |  4 ----
 img/share-white.svg        |  1 -
 img/toggle.svg             | 10 ----------
 img/view-delete.svg        |  1 -
 templates/part.content.php |  2 +-
 templates/slideshow.php    | 24 +++++++++++-------------
 7 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 img/folder.svg
 delete mode 100644 img/share-white.svg
 delete mode 100644 img/toggle.svg
 delete mode 100644 img/view-delete.svg

diff --git a/css/slideshow.css b/css/slideshow.css
index dda5d0ec1..25123ff6e 100644
--- a/css/slideshow.css
+++ b/css/slideshow.css
@@ -56,15 +56,6 @@
 	transition: opacity 3s;
 }
 
-#slideshow input.icon-view-toggle-background {
-	background-image: url("../img/toggle.svg");
-}
-
-#slideshow input.icon-view-delete {
-	background-image: url("../img/view-delete.svg");
-	background-size: 28px 28px;
-}
-
 #slideshow > * {
 	-webkit-transition: opacity 300ms;
 	-moz-transition: opacity 300ms;
@@ -76,7 +67,7 @@
 #slideshow > .slideshow-menu input:hover,
 #slideshow #slideshow-shared-button:hover,
 #slideshow.inactive > .name:hover {
-	opacity: .75;
+	opacity: 1;
 }
 
 #slideshow > .next, #slideshow > .previous {
diff --git a/img/folder.svg b/img/folder.svg
deleted file mode 100644
index cb22594e2..000000000
--- a/img/folder.svg
+++ /dev/null
@@ -1,4 +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:dc="http://purl.org/dc/elements/1.1/">
- <path fill-rule="evenodd" fill="#55739a" d="m1.457 1.998c-0.2505 0-0.46091 0.2085-0.46091 0.459v11.08c0 0.259 0.20211 0.461 0.46091 0.461h13.08c0.259 0 0.459-0.202 0.459-0.461v-9.078c0-0.2504-0.208-0.461-0.459-0.461h-6.5409l-2-2h-4.5391zm3.7149 4.002h6.5701c0.126-0.001 0.258 0.1364 0.258 0.3047v5.4763c0 0.115-0.106 0.219-0.219 0.219h-6.5622c-0.1128 0-0.2188-0.104-0.2188-0.219v-5.5622c-0.0018-0.1021 0.0731-0.1997 0.1719-0.2188zm0.3281 0.5v4.5h0.5l2-2 1.5 1.5 1.5-2 0.5 0.5v-2.5h-6zm1.25 0.5c0.4142 0 0.75 0.3358 0.75 0.75s-0.3358 0.75-0.75 0.75-0.75-0.3358-0.75-0.75 0.3358-0.75 0.75-0.75z"/>
-</svg>
diff --git a/img/share-white.svg b/img/share-white.svg
deleted file mode 100644
index 034fa1eab..000000000
--- a/img/share-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 .075.01.15.016.224L5.05 6.092a2.445 2.445 0 0 0-1.596-.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-.477l4.865 2.474c-.005.044-.01.09-.01.134a2.457 2.457 0 1 0 .803-1.818l-4.696-2.4c.02-.123.035-.25.035-.378 0-.072-.01-.144-.015-.214l4.74-2.414A2.457 2.457 0 1 0 12.227.99z" fill="#fff" stroke="#000" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/img/toggle.svg b/img/toggle.svg
deleted file mode 100644
index c9f31b960..000000000
--- a/img/toggle.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" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.6" width="1.6" y="-.3" x="-.3">
-   <feGaussianBlur stdDeviation="2.5"/>
-  </filter>
- </defs>
- <path stroke-linejoin="round" d="m16 6c-5.523 0-10 4.477-10 10s4.477 10 10 10 10-4.477 10-10-4.477-10-10-10zm0 2v16c-4.418 0-8-3.582-8-8s3.582-8 8-8z" filter="url(#a)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
- <path d="m16 6c-5.523 0-10 4.477-10 10s4.477 10 10 10 10-4.477 10-10-4.477-10-10-10zm0 2v16c-4.418 0-8-3.582-8-8s3.582-8 8-8z" fill="#fff"/>
-</svg>
diff --git a/img/view-delete.svg b/img/view-delete.svg
deleted file mode 100644
index 44f07c331..000000000
--- a/img/view-delete.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns:rdf="http://www.w6org/3998/4/44-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/2/" height="64" width="64" version="2"><defs><filter id="a" height="3" width="3" y="-.59968" x="-.60032" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="6"/></filter></defs><path filter="url(#a)" stroke="#0" stroke-width="4" d="m28,12l-2,3l-9,0c-2,0 -3,1 -3,3l0,3l36,0l0,-3c0,-2 -1,-3 -3,-3l-9,0l-2,-3l-9,0zm-11,12l3,27c0,2 2,3 3,3l18,0c2,0 3,-1 3,-3l3,-27l-30,0z"/><path d="m28,12l-2,3l-9,0c-2,0 -3,1 -3,3l0,3l36,0l0,-3c0,-2 -1,-3 -3,-3l-9,0l-2,-3l-9,0zm-11,12l3,27c0,2 2,3 3,3l18,0c2,0 3,-1 3,-3l3,-27l-30,0z" fill="#fff"/></svg>
diff --git a/templates/part.content.php b/templates/part.content.php
index 82105ef77..e4c70c341 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -76,7 +76,7 @@
 		<!-- sharing button -->
 		<div id="shared-button" class="button">
 			<img class="svg" src="<?php print_unescaped(
-				image_path('core', 'actions/shared.svg')
+				image_path('core', 'actions/share.svg')
 			); ?>" alt="<?php p($l->t("Share")); ?>"/>
 		</div>
 		<a class="share" data-item-type="folder" data-item=""
diff --git a/templates/slideshow.php b/templates/slideshow.php
index 90a38892e..7feeb3d4e 100644
--- a/templates/slideshow.php
+++ b/templates/slideshow.php
@@ -1,29 +1,27 @@
 <div id="slideshow">
 	<div class="icon-loading-dark"></div>
-	<input type="button" class="svg next icon-view-next"/>
-	<input type="button" class="svg play icon-view-play"/>
-	<input type="button" class="svg pause icon-view-pause hidden"/>
-	<input type="button" class="svg previous icon-view-previous"/>
-	<input type="button" class="svg exit icon-view-close"/>
+	<input type="button" class="svg next icon-view-next icon-shadow icon-white icon-32"/>
+	<input type="button" class="svg play icon-play icon-shadow icon-white icon-32"/>
+	<input type="button" class="svg pause icon-pause icon-shadow icon-white icon-32 hidden"/>
+	<input type="button" class="svg previous icon-view-previous icon-shadow icon-white icon-32"/>
+	<input type="button" class="menuItem svg exit icon-close icon-shadow icon-white icon-32"/>
 	<div class="notification"></div>
 	<div class="slideshow-menu">
 		<input type="button"
-			   class="menuItem svg downloadImage icon-view-download hidden"/>
+			   class="menuItem svg downloadImage icon-download icon-shadow icon-white icon-32 hidden"/>
 		<input type="button"
-			   class="menuItem svg changeBackground icon-view-toggle-background hidden"/>
+			   class="menuItem svg changeBackground icon-toggle-background icon-32 icon-shadow icon-white hidden"/>
 		<input type="button"
-			   class="menuItem svg deleteImage icon-view-delete hidden">
-		<div id="slideshow-shared-button" class="menuItem button">
-			<img class="svg" src="<?php print_unescaped(
-				image_path('gallery', 'share-white.svg')
-			); ?>" alt="<?php p($l->t("Share")); ?>"/>
+			   class="menuItem svg deleteImage icon-delete icon-shadow icon-white icon-32 hidden">
+		<div id="slideshow-shared-button"
+			 class="menuItem svg button icon-share icon-shadow icon-white icon-32">
 		</div>
 		<a class="share" data-item-type="folder" data-item=""
 		   title="<?php p($l->t("Share")); ?>"
 		   data-possible-permissions="31">
 		</a>
 	</div>
-	<div class="progress icon-view-pause"/>
+	<div class="progress icon-pause icon-shadow icon-white icon-32"/>
 	<div class="name">
 		<div class="title"></div>
 	</div>