diff --git a/LICENSE.txt b/LICENSE.txt
index 50665b09774d2c71d6965abf8eaea8bd97858e1b..2d7410c2bc0d85e2d697a58bec598a1fb8d421a7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -267,8 +267,7 @@ Applications:
Fugue Icons: See licenses/LICENSE-FugueIcons.txt
Router Console and I2PSnark themes:
- "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
- Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
+ Some images licensed under a Creative Commons 2.0 license.
Silk icons: See licenses/LICENSE-SilkIcons.txt
I2PSnark light theme:
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 3a840c29934792f9c3339dd902c6e2a878c6e149..e9fb5b8a251c6737de8a01e900b75b4b0efdd738 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -2058,9 +2058,8 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
color: #2c354f;
min-width: 540px;
background: #eef;
- background: #eef url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom !important;
- background: url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom, url(images/bg0.png) repeat scroll top left !important;
- background: url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right -3px bottom -5px, linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) top -1px center, url(images/bg0.png) top -3px center !important;
+ background: url(images/bg0.png) repeat scroll top left !important;
+ background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.1)) top -1px center, url(images/bg0.png) top -3px center !important;
background-size: auto 180px, 100% 100%, 120px 120px !important;
box-shadow: inset 0 0 0 1px #e8e8f5;
}
@@ -5654,7 +5653,7 @@ h3.stats {
#volunteer {
margin-top: 20px !important;
padding-bottom: 0 !important;
- background: linear-gradient(to bottom, rgba(230,230,255,0.5), rgba(230,230,255,0.5)), url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom !important;
+ background: linear-gradient(to bottom, rgba(230,230,255,0.5), rgba(230,230,255,0.5)) !important;
background-size: 100% 100%, auto 75% !important;
}
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 2bc8b192a6aa1584e89ba56705e9c874a06233a8..726bd92d79e3d5bf87a423d347eb55e54c672525 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -1,6 +1,5 @@
/* I2P Theme: Camo aka Dark */
/* Description: Military Grade. */
-/* Comment: Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
/* Author: dr|z3d */
body {
diff --git a/installer/resources/themes/console/dark/console_ar.css b/installer/resources/themes/console/dark/console_ar.css
index af28108819c21df1a71331632bf7e998beb992e3..f9a9a1d0cb4dd542e30a05ebbd787764d862dd75 100644
--- a/installer/resources/themes/console/dark/console_ar.css
+++ b/installer/resources/themes/console/dark/console_ar.css
@@ -1,6 +1,5 @@
/* I2P Theme: Camo aka Dark - Arabic override */
/* Description: Military Grade. */
-/* Comment: Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
/* Author: dr|z3d */
body {
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 3e62cee8f19ea0d3b4676ba69cccefcc9832f20d..62192a0a37eea9d49963284302cf176bff80061e 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -1349,8 +1349,8 @@ p:empty + .sb_notice {
}
.news, .main#news, .main#proof, .main#oldconsole, #warning2 {
- background: #f8f8ff url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom;
- background: linear-gradient(to bottom, rgba(248,248,255,0.5), rgba(240,240,255,0.5)), url(/themes/snark/ubergine/images/hat.png) no-repeat right bottom, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #f8f8ff !important;
+ background: #f8f8ff;
+ background: linear-gradient(to bottom, rgba(248,248,255,0.5), rgba(240,240,255,0.5)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #f8f8ff !important;
background-size: 100% 100%, auto 160px, 100% 100% !important;
}
@@ -2180,7 +2180,7 @@ h3#graphdisplay {
border-radius: 2px;
border: 1px solid #7778bf;
background: #eef;
- background: url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, linear-gradient(to right, #fafaff, #eef);
+ background: linear-gradient(to right, #fafaff, #eef);
background-size: auto 100%, 100% 100%;
font-weight: bold;
box-shadow: inset 0 0 0 1px #fff;
@@ -2189,7 +2189,7 @@ h3#graphdisplay {
}
.main#config_update .messages {
- background: url(/themes/console/images/info/newspaper.png) 12px center no-repeat, url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
+ background: url(/themes/console/images/info/newspaper.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
padding: 15px 15px 15px 50px;
background-size: 28px 28px, auto 100%, 100% 100% !important;
}
@@ -6227,7 +6227,7 @@ h3#ntcpcon, h3#udpcon {
}
#help #volunteer, #wrapperlogs pre {
- background: linear-gradient(to bottom, #fafaff, rgba(248,248,255,0.3)), url(/themes/snark/ubergine/images/hat.png) no-repeat right -3px bottom -3px / auto 80%, repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px) #fafaff !important;
+ background: linear-gradient(to bottom, #fafaff, rgba(248,248,255,0.3)), repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px) #fafaff !important;
box-shadow: inset 0 0 0 1px #fff;
}
@@ -8111,7 +8111,7 @@ to {
}
#help #volunteer {
- background: #f3f3ff url(/themes/snark/ubergine/images/hat.png) no-repeat right -3px bottom -3px !important;
+ background: #f3f3ff !important;
background-size: auto 80%;
}
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index e280c85076ac763c6b9ffe0a314fd721855c80f9..c7397e7565bfccd5de372874d127f9bef9f995a9 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -1,6 +1,5 @@
/* I2P Theme: Midnight */
/* Description: Dark blue with chrome highlights */
-/* Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
/* Additional thanks to NASA for the planet earth image */
/* Author: dr|z3d */
diff --git a/installer/resources/themes/snark/classic/images/hat.png b/installer/resources/themes/snark/classic/images/hat.png
deleted file mode 100644
index e0ebd52bde38319e4832c3d370b20121ff55a769..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/snark/classic/images/hat.png and /dev/null differ
diff --git a/installer/resources/themes/snark/classic/snark.css b/installer/resources/themes/snark/classic/snark.css
index fce395e2f28e247bf611b366b135911dfa7b0017..8475ea875fa0436470e956988bf7e5a154f554fd 100644
--- a/installer/resources/themes/snark/classic/snark.css
+++ b/installer/resources/themes/snark/classic/snark.css
@@ -198,15 +198,15 @@ body.iframed {
padding: 3px 5px;
text-align: left;
border-bottom: 1px solid #89f;
- background: url(images/hat.png) bottom right no-repeat #ddf;
- background: url(images/hat.png) bottom right no-repeat, linear-gradient(to bottom, #eff3ff, #e9efff);
- background: url(images/hat.png) bottom right no-repeat, linear-gradient(to bottom, rgba(239, 243, 255, 0.7), rgba(233, 239, 255, 0.7));
+ background: #ddf;
+ background: linear-gradient(to bottom, #eff3ff, #e9efff);
+ background: linear-gradient(to bottom, rgba(239, 243, 255, 0.7), rgba(233, 239, 255, 0.7));
box-shadow: inset 0 0 0 1px #f2f2ff;
}
.iframed .snarkMessages {
- background: url(images/hat.png) bottom right no-repeat, linear-gradient(to bottom, #e3e3ff, #ddf);
- background: url(images/hat.png) bottom right no-repeat, linear-gradient(to bottom, rgba(227, 227, 255, 0.7), rgba(221, 221, 255, 0.7));
+ background: linear-gradient(to bottom, #e3e3ff, #ddf);
+ background: linear-gradient(to bottom, rgba(227, 227, 255, 0.7), rgba(221, 221, 255, 0.7));
}
.snarkMessages:hover, .snarkMessages:focus {
diff --git a/installer/resources/themes/snark/dark/images/hat.png b/installer/resources/themes/snark/dark/images/hat.png
deleted file mode 100644
index 6de3d97b7f593bca6d1b4a0b0e8812e0cf79eb53..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/snark/dark/images/hat.png and /dev/null differ
diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css
index ac89962c95b8241d89e21cf9be9d69e776d3aec3..cdbec9132fbf7613da288d63c2dc6c2a77cf12fa 100644
--- a/installer/resources/themes/snark/dark/snark.css
+++ b/installer/resources/themes/snark/dark/snark.css
@@ -254,8 +254,8 @@ _:-ms-lang(x), .snarknavbar {
color: #69f;
box-shadow: inset 0 0 0 1px #000;
border-bottom: 1px solid #494;
- background: #000 url(images/hat.png) no-repeat scroll right bottom;
- background: url(images/hat.png) no-repeat scroll right bottom, linear-gradient(to bottom, #010, #000);
+ background: #000;
+ background: linear-gradient(to bottom, #010, #000);
background-size: auto 95%, 100% 100%;
background-blend-mode: screen;
}
@@ -270,7 +270,7 @@ _:-ms-lang(x), .snarknavbar {
/* MS Edge fix */
_:-ms-lang(x), .snarkMessages {
- background: url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom, linear-gradient(to bottom, #010, #000);
+ background: linear-gradient(to bottom, #010, #000);
background-size: auto 95%;
}
diff --git a/installer/resources/themes/snark/light/images/kitty.png b/installer/resources/themes/snark/light/images/kitty.png
deleted file mode 100644
index 33e33473b749996be6e91710074dbc1be1450704..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/snark/light/images/kitty.png and /dev/null differ
diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css
index adf76d2afa1576dcc3942119722e7600aac8a89f..4b1f24eb392095bf18a1b51147c11ccc1e4143dc 100644
--- a/installer/resources/themes/snark/light/snark.css
+++ b/installer/resources/themes/snark/light/snark.css
@@ -1,7 +1,6 @@
/* I2PSnark theme "Light" aka Corporat */
/* Cat That Got The Cream Edition */
/* Author: dr|z3d */
-/* Thanks to http://www.luxphile.com/2011/01/creative-commons-cat.html for the kitty image */
body {
color: #31334f;
@@ -264,8 +263,8 @@ button::-moz-focus-inner, input::-moz-focus-inner {
height: 57px;
width: auto;
min-width: 810px;
- background: #eef url(images/kitty.png) no-repeat scroll right bottom;
- background: url(images/kitty.png) no-repeat right center, linear-gradient(to bottom, #fff, #eef);
+ background: #eef;
+ background: linear-gradient(to bottom, #fff, #eef);
border-top: 1px solid #7778bf;
border-bottom: 1px solid #7778bf;
box-shadow: inset 0 0 1px #fff;
diff --git a/installer/resources/themes/snark/midnight/images/hat.png b/installer/resources/themes/snark/midnight/images/hat.png
deleted file mode 100644
index a68bbb756ca1a5d8e4ededc7ceea95ca730a870c..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/snark/midnight/images/hat.png and /dev/null differ
diff --git a/installer/resources/themes/snark/midnight/snark.css b/installer/resources/themes/snark/midnight/snark.css
index e907ad56897cf17aae682df1240a191d80bcb68f..b3d256abdff34ee0f27b9d20357deefb4e6facd4 100644
--- a/installer/resources/themes/snark/midnight/snark.css
+++ b/installer/resources/themes/snark/midnight/snark.css
@@ -226,8 +226,8 @@ body.iframed {
text-align: left;
color: #778;
border-bottom: 1px solid #443da0;
- background: #000 url(images/hat.png) no-repeat scroll right top;
- background: url(images/hat.png) no-repeat scroll right top, linear-gradient(to bottom, #002, #001);
+ background: #000;
+ background: linear-gradient(to bottom, #002, #001);
background-size: auto 110%;
background-blend-mode: luminosity;
}
diff --git a/installer/resources/themes/snark/ubergine/images/hat.png b/installer/resources/themes/snark/ubergine/images/hat.png
deleted file mode 100644
index a68bbb756ca1a5d8e4ededc7ceea95ca730a870c..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/snark/ubergine/images/hat.png and /dev/null differ
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index 312b9c86e925d7bbd3ccca548f98ed3d7dbf4012..22d4fbcb46bf920a84e7cb691eb0aa64192f4dab 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -255,8 +255,8 @@ _:-ms-lang(x), .snarkNav:last-child[href="/i2psnark/"] {
height: 49px;
width: auto;
width: calc(100% - 12px);
- background: #2a192a url(images/hat.png) no-repeat scroll right center;
- background: url(images/hat.png) no-repeat scroll right center, linear-gradient(to bottom, #2a192a 0%, #202 100%);
+ background: #2a192a;
+ background: linear-gradient(to bottom, #2a192a 0%, #202 100%);
background-size: 80px auto, 100% 100%;
box-shadow: inset 0 0 3px 1px rgba(16, 0, 16, 0.6), 0 0 1px 1px rgba(16, 8, 16, 0.3);
outline: none;
diff --git a/installer/resources/themes/snark/vanilla/images/hat.png b/installer/resources/themes/snark/vanilla/images/hat.png
deleted file mode 100644
index a68bbb756ca1a5d8e4ededc7ceea95ca730a870c..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/snark/vanilla/images/hat.png and /dev/null differ
diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css
index b871e00454fa8f3cee38171f5fac52ae4fc23795..a353de7ea9a09a36f9aee57ca36df6cc56576e19 100644
--- a/installer/resources/themes/snark/vanilla/snark.css
+++ b/installer/resources/themes/snark/vanilla/snark.css
@@ -290,7 +290,7 @@ _:-ms-lang(x), .snarkNav:link, .snarkNav:visited {
overflow: hidden;
height: 56px;
width: auto;
- background: #3f3833 url(images/hat.png) no-repeat scroll right center;
+ background: #3f3833;
background: url(images/whippy.png) no-repeat scroll right 5px bottom -7px, linear-gradient(to bottom, #5f554d, #3f3833);
background-size: auto 105%, 100% 100%;
}
diff --git a/installer/resources/themes/susimail/dark/images/hatter_med.png b/installer/resources/themes/susimail/dark/images/hatter_med.png
deleted file mode 100644
index 18d27ed19ad6bd18d5e6c071b9678bcb73fd3b69..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/susimail/dark/images/hatter_med.png and /dev/null differ
diff --git a/installer/resources/themes/susimail/dark/susimail.css b/installer/resources/themes/susimail/dark/susimail.css
index 7d5893643b3cb1e391cfd20789768de9139e1080..ecd1f29f52d20e3dda11e4353b868ccadae3b454 100644
--- a/installer/resources/themes/susimail/dark/susimail.css
+++ b/installer/resources/themes/susimail/dark/susimail.css
@@ -1,6 +1,5 @@
/* Susimail "Camo" theme (aka "dark") */
/* Author: dr|z3d */
-/* Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
/* Droid Sans font family and css3 compliant browser recommended for optimal results */
html {
@@ -151,9 +150,9 @@ div.topbuttons {
margin: -1px -1px -4px -1px;
border-bottom: 1px solid #494;
box-shadow: inset 0 0 0 1px #000;
- background: #000 url(images/hatter_med.png) left bottom no-repeat;
- background: url(images/hatter_med.png) left bottom no-repeat, linear-gradient(to bottom, #002000 0%, #000 100%);
- background: url(images/hatter_med.png) left bottom no-repeat, linear-gradient(to bottom, rgba(0,0,0,0) 50%, #000 50%), repeating-linear-gradient(to right, rgba(0,0,0,0.5) 1px, rgba(0,0,0,0.5) 2px, rgba(0,16,0,0.5) 2px, rgba(0,16,0,0.5) 4px), linear-gradient(to bottom, #002000, #000 75%) !important;
+ background: #000;
+ background: linear-gradient(to bottom, #002000 0%, #000 100%);
+ background: linear-gradient(to bottom, rgba(0,0,0,0) 50%, #000 50%), repeating-linear-gradient(to right, rgba(0,0,0,0.5) 1px, rgba(0,0,0,0.5) 2px, rgba(0,16,0,0.5) 2px, rgba(0,16,0,0.5) 4px), linear-gradient(to bottom, #002000, #000 75%) !important;
background: repeating-linear-gradient(to right, rgba(0,0,0,0.5) 1px, rgba(0,0,0,0.5) 2px, rgba(0,32,0,0.5) 2px, rgba(0,64,0,0.5) 4px), linear-gradient(to bottom, rgba(0,32,0,0.5), rgba(0,0,0,0.8)), url(/themes/console/dark/images/camotile2.png) top left !important;
box-shadow: inset 0 0 0 2px #000;
}
@@ -746,8 +745,8 @@ input[type="submit"], input[type="reset"], select, button { /* webkit/blink fix
box-shadow: inset 0 0 0 1px #000, inset 0 0 2px 1px #020;
background: #001000;
background: linear-gradient(to bottom, #000 0%, #010 50%);
- background: url(images/hatter_med.png) right bottom no-repeat, repeating-linear-gradient(135deg, #000 1px, #000 2px, rgba(0,32,0,0.5) 2px, rgba(0,32,0,0.5) 4px), repeating-linear-gradient(45deg, #000 1px, #000 2px, rgba(0,32,0,0.5) 2px, rgba(0,32,0,0.5) 4px), linear-gradient(to bottom, #030 0%, #020);
- background: url(images/hatter_med.png) right bottom no-repeat, linear-gradient(to bottom, #000 0%, #001000 90%);
+ background: repeating-linear-gradient(135deg, #000 1px, #000 2px, rgba(0,32,0,0.5) 2px, rgba(0,32,0,0.5) 4px), repeating-linear-gradient(45deg, #000 1px, #000 2px, rgba(0,32,0,0.5) 2px, rgba(0,32,0,0.5) 4px), linear-gradient(to bottom, #030 0%, #020);
+ background: linear-gradient(to bottom, #000 0%, #001000 90%);
background-blend-mode: normal, darken, darken, normal;
background-blend-mode: difference, normal;
diff --git a/installer/resources/themes/susimail/midnight/images/hatter_med.png b/installer/resources/themes/susimail/midnight/images/hatter_med.png
deleted file mode 100644
index 2f3b0698a93726da742064f93e82a11176e783fd..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/susimail/midnight/images/hatter_med.png and /dev/null differ
diff --git a/installer/resources/themes/susimail/midnight/susimail.css b/installer/resources/themes/susimail/midnight/susimail.css
index c93927e7f4203c97b175bd7919fe5ca2ac367730..5b714e1b10ecb90f1553c3c580a24273d8c23fa0 100644
--- a/installer/resources/themes/susimail/midnight/susimail.css
+++ b/installer/resources/themes/susimail/midnight/susimail.css
@@ -1,5 +1,4 @@
/* Susimail "Midnight" by dr|z3d */
-/* Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
/* Droid Sans font family and css3 compliant browser recommended for optimal results */
html {
@@ -153,8 +152,8 @@ div.topbuttons {
margin-top: -1px;
margin: -1px -1px -4px -1px;
border-bottom: 1px solid #443da0;
- background: #000 url(images/hatter_med.png) left bottom no-repeat;
- background: url(images/hatter_med.png) left bottom no-repeat, linear-gradient(to bottom, #020020 0%, #0100100%);
+ background: #000;
+ background: linear-gradient(to bottom, #020020 0%, #0100100%);
background-size: 144px 100px, 100% 100% !important;
}
@@ -693,7 +692,7 @@ div#dologin {
background: #010010;
border-radius: 2px;
background: linear-gradient(to bottom, #000000, #060050%, #0100100%);
- background: url(images/hatter_med.png) right bottom no-repeat, linear-gradient(to bottom, #000000, #000600 50%, #000010 100%);
+ background: linear-gradient(to bottom, #000000, #000600 50%, #000010 100%);
}
#dologin h1 {