diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java index 11848ef46a2e8e691da0cc86781e87390fca3eab..0a4035f78b2ead5004ab605405f9ad2d7e1b9c38 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java @@ -77,7 +77,7 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener { long now = _context.clock().now(); return (_lastUpdated > 0 ? "News last updated " + DataHelper.formatDuration(now - _lastUpdated) + " ago" : "") + - (_lastFetch > _lastUpdated ? ", last checked " + DataHelper.formatDuration(now - _lastFetch) + " ago" : ""); + (_lastFetch > _lastUpdated ? "; last checked " + DataHelper.formatDuration(now - _lastFetch) + " ago." : ""); } public void run() { diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 391506a7b925a268aa87553699bdf7b12388ddb3..3252275988295f1d0cb136e60473414f34cb1c69 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -495,7 +495,7 @@ hr { } div.joblog { - margin-top: -10px; + margin: 10px 0; line-height: 130% !important; } @@ -530,7 +530,7 @@ div.joblog p { } div.joblog h3 { - margin: -5px 0 5px 0; + margin: 5px 0 5px 0; } div.joblog hr { diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index d5e461913e9f3df1fe9271834858d8f90a1f999c..ddcb3f143f60174458effce196df8764f85062fc 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -269,16 +269,17 @@ div.main textarea { div.news { margin: 15px 15px 15px 220px; - padding: 5px 30px 15px 30px; + padding: 5px 30px 10px 30px; border: 1px solid #99f; background: #004; 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; + color: #aaf; border-radius: 4px; -moz-border-radius: 4px; -khtml-border-radius: 4px; - text-align: justify; + font-size: 7.5pt; + text-align: right; -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; @@ -305,8 +306,14 @@ div.news h4 { div.news p { margin-top: -5px; + font-size: 8.5pt; + color: #eef; } +div.news hr { + margin: -2px 0 5px 0; +} + div.confignav { padding: 15px 10px !important; margin: 15px 0; @@ -690,6 +697,11 @@ hr { margin: 10px 0; } +hr:last-child { + margin-top: 20px; +} + + sidebarlogo { text-align: center; } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 8aa072fcf9438648320c85ef3852d1e13da4f6b8..b74a3a021a67537a1c5a88fd8f2ae075a48f864b 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;