From 09a2854b8b76da1a176e396a9ca8cef324d7f4a9 Mon Sep 17 00:00:00 2001 From: z3d Date: Sat, 3 Oct 2009 07:41:57 +0000 Subject: [PATCH 1/4] Theme stuff and lose excess. --- .../themes/console/classic/console.css | 2 +- .../resources/themes/console/dark/console.css | 17 ++++++++++------- .../themes/console/images/olivegreentile.png | Bin 1515 -> 0 bytes .../KademliaNetworkDatabaseFacade.java | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 installer/resources/themes/console/images/olivegreentile.png diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index b9bcaed8a..7354c17d4 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -416,7 +416,7 @@ table { border: 5px solid #bbf; margin: 5px 0px; cell-padding: 1px; - font-size: 7pt; + font-size: 7.5pt; background: #fff; width: 100%; } diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 4832e708f..c7f2f5c5d 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -205,7 +205,7 @@ div.routersummarytr:nth-child(odd) { div.warning { margin: 5px 20px 10px 240px; - padding: 0px 25px 20px 75px; + padding: 5px 25px 20px 75px; background: #005; border: 1px solid #99f; text-align: left; @@ -268,11 +268,12 @@ div.main textarea { } div.news { - margin: 0px 15px 20px 220px; + margin: 15px 15px 15px 220px; padding: 20px 30px 20px 30px; border: 1px solid #99f; background: #004; - background: url("images/darkbluetile.png"); + background-image: -moz-linear-gradient(top, bottom, from(#003), to(#005), color-stop(30%, #003), color-stop(100%, #001)); +/* background: #003 url("images/darkbluetile.png");*/ color: #eef; border-radius: 4px; -moz-border-radius: 4px; @@ -542,7 +543,8 @@ h1 { letter-spacing: 0.15em; text-shadow: 0px 0px 3px rgba(255, 255, 255, 0.8); white-space: normal; - background: #004 url('images/darkbluebg.png'); + background: #002 //url('images/darkbluebg.png'); + background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001)); -moz-box-shadow: inset 0px 0px 1px 0px #eef; -khtml-box-shadow: inset 0px 0px 1px 0px #eef; box-shadow: inset 0px 0px 1px 0px #eef; @@ -558,7 +560,8 @@ h2 { color: #fff; text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5); letter-spacing: 0.05em; - background: #003 url('images/titletile.png'); + background: #002; // url('images/darkbluebg.png'); + background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001)); padding: 5px 10px 8px 10px; wordwrap: none; border: 1px solid #99f; @@ -590,7 +593,7 @@ h3 { border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; -khtml-border-radius: 0 4px 4px 0; - background: #007; + background: #002; /* background: url(images/lightbluebg.png);*/ } @@ -795,7 +798,7 @@ form {} .joblog { margin: 15px 0 15px 0; - padding: 20px !important; + padding: 5px 20px 10px 20px !important; border: 1px solid #99f; background-color: #004; background: url("images/darkbluebg.png"); diff --git a/installer/resources/themes/console/images/olivegreentile.png b/installer/resources/themes/console/images/olivegreentile.png deleted file mode 100644 index e63010c9d6d355a991044d2fd0f659c229900843..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1515 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvEiGhJ})y~t$fE>;OkH}&M2EM}}%y>M1MG6B0 z>s(J4$B>FSZ*QN^3n`U2_R-R~)p5h+Rop&XbWeyXtP^!9Q`=<_*C75tw8C{=$LUU}tQg7v)OSu-t{7q^vL>25rBe)Er~FCTuHzFq%*jrtPBpTBf z-o^zAVj@SHnj!)OxVe%X9d$H1SXt>II7z>LpT+MFch9z3w|?Gzv;BSVoayG`dExWk zw%%TQvG{FKb>aIz+qRae+TYLDzb7@%dwbMs;d$oKtHZgUv%g&`9X$7XH2=D-=X>qL z*Z0JFAyLI1`v&L^; ze!iMGKl<)GZJ^p?4}Ul3%uDp2KVSRH=bJW%=h^L-|90-q-*aF7#;MOvzYu-tOL{jP;?s=l;u;`g1uZ`uOY+1tP9?cevpY~EbEzds(m>)gNX+`lXDqaXk7?@dqt z^v~qI{`B9sgTEVB)?2+$|9nsPyL;yU&3C3t-wnHGzWUeFp!__$+S;8LEo<`o-VCcdZ~4mluRH&Gmigb3fBW_6p7>jp zFHc^(xn;lEE$R8Se=;TKK2I=lNPnGi(Q+^UT;b3cHtSr{zcIYnQ_vG6^6b1&nHaG2X7F_Nb6Mw<&;$SofRa!E diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index f6a1a31ef..491b823a7 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -1065,7 +1065,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { if (countryList.size() > 0) { Collections.sort(countryList); buf.append("\n"); - buf.append("\n"); + buf.append("\n"); for (String country : countryList) { int num = countries.count(country); buf.append("
CountryCount
CountryCount
\"").append(country.toUpperCase()).append("\""); Date: Sat, 3 Oct 2009 14:24:28 +0000 Subject: [PATCH 2/4] Theme tweaks. --- apps/routerconsole/jsp/config.jsp | 2 +- installer/resources/themes/console/classic/console.css | 6 +++--- installer/resources/themes/console/light/console.css | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index c371624db..7cd937511 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -27,7 +27,7 @@

Bandwidth limiter

I2P will work best if you configure your rates to match the speed of your internet connection. -

+

" /> KBps In ()