Browse Source

moved images to img folder

El RIDO 2 years ago
parent
commit
7f4ed739de

+ 2 - 1
CHANGELOG.md

@@ -2,7 +2,8 @@
 
   * **next (not yet released)**
     * ADDED: Translations for Spanish and Occitan
-    * ADDED: Option in configuration to change the default "PrivateBin" title on the site.
+    * ADDED: Option in configuration to change the default "PrivateBin" title of the site
+    * CHANGED: Cleanup of bootstrap template variants and moved icons to `img` directory
   * **1.1 (2016-12-26)**
     * ADDED: Translations for Italian and Russian
     * ADDED: Loading message displayed until decryption succeeded for slower (in terms of CPU or network) systems

+ 3 - 3
browserconfig.xml

@@ -2,9 +2,9 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square150x150logo src="mstile-150x150.png"/>
-      <square310x310logo src="mstile-310x310.png"/>
-      <wide310x150logo src="mstile-310x150.png"/>
+      <square150x150logo src="img/mstile-150x150.png"/>
+      <square310x310logo src="img/mstile-310x310.png"/>
+      <wide310x150logo src="img/mstile-310x150.png"/>
       <TileColor>#ffc40d</TileColor>
     </tile>
   </msapplication>

android-chrome-192x192.png → img/android-chrome-192x192.png


android-chrome-512x512.png → img/android-chrome-512x512.png


apple-touch-icon.png → img/apple-touch-icon.png


favicon-16x16.png → img/favicon-16x16.png


favicon-32x32.png → img/favicon-32x32.png


favicon.ico → img/favicon.ico


mstile-144x144.png → img/mstile-144x144.png


mstile-150x150.png → img/mstile-150x150.png


mstile-310x150.png → img/mstile-310x150.png


mstile-310x310.png → img/mstile-310x310.png


mstile-70x70.png → img/mstile-70x70.png


safari-pinned-tab.svg → img/safari-pinned-tab.svg


+ 2 - 2
manifest.json

@@ -2,12 +2,12 @@
 	"name": "PrivateBin",
 	"icons": [
 		{
-			"src": "android-chrome-192x192.png",
+			"src": "img/android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png"
 		},
 		{
-			"src": "android-chrome-512x512.png",
+			"src": "img/android-chrome-512x512.png",
 			"sizes": "512x512",
 			"type": "image\/png"
 		}

+ 5 - 5
tpl/bootstrap.php

@@ -73,12 +73,12 @@ endif;
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
-		<link rel="apple-touch-icon" href="apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
-		<link rel="icon" type="image/png" href="favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />
-		<link rel="icon" type="image/png" href="favicon-16x16.png?<?php echo rawurlencode($VERSION); ?>" sizes="16x16" />
+		<link rel="apple-touch-icon" href="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
+		<link rel="icon" type="image/png" href="img/favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />
+		<link rel="icon" type="image/png" href="img/favicon-16x16.png?<?php echo rawurlencode($VERSION); ?>" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?<?php echo rawurlencode($VERSION); ?>" />
-		<link rel="mask-icon" href="safari-pinned-tab.svg?<?php echo rawurlencode($VERSION); ?>" color="#ffcc00" />
-		<link rel="shortcut icon" href="favicon.ico">
+		<link rel="mask-icon" href="img/safari-pinned-tab.svg?<?php echo rawurlencode($VERSION); ?>" color="#ffcc00" />
+		<link rel="shortcut icon" href="img/favicon.ico">
 		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>

+ 5 - 5
tpl/page.php

@@ -51,12 +51,12 @@ endif;
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
-		<link rel="apple-touch-icon" href="apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
-		<link rel="icon" type="image/png" href="favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />
-		<link rel="icon" type="image/png" href="favicon-16x16.png?<?php echo rawurlencode($VERSION); ?>" sizes="16x16" />
+		<link rel="apple-touch-icon" href="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
+		<link rel="icon" type="image/png" href="img/favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />
+		<link rel="icon" type="image/png" href="img/favicon-16x16.png?<?php echo rawurlencode($VERSION); ?>" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?<?php echo rawurlencode($VERSION); ?>" />
-		<link rel="mask-icon" href="safari-pinned-tab.svg?<?php echo rawurlencode($VERSION); ?>" color="#ffcc00" />
-		<link rel="shortcut icon" href="favicon.ico">
+		<link rel="mask-icon" href="img/safari-pinned-tab.svg?<?php echo rawurlencode($VERSION); ?>" color="#ffcc00" />
+		<link rel="shortcut icon" href="img/favicon.ico">
 		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>