diff --git a/LICENSE.txt b/LICENSE.txt index 50665b097..2d7410c2b 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 3a840c299..e9fb5b8a2 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 2bc8b192a..726bd92d7 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 af2810881..f9a9a1d0c 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 3e62cee8f..62192a0a3 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 e280c8507..c7397e756 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 e0ebd52bd..000000000 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 fce395e2f..8475ea875 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 6de3d97b7..000000000 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 ac89962c9..cdbec9132 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 33e33473b..000000000 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 adf76d2af..4b1f24eb3 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 a68bbb756..000000000 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 e907ad568..b3d256abd 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 a68bbb756..000000000 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 312b9c86e..22d4fbcb4 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 a68bbb756..000000000 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 b871e0045..a353de7ea 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 18d27ed19..000000000 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 7d5893643..ecd1f29f5 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 2f3b0698a..000000000 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 c93927e7f..5b714e1b1 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 {