From c14760c2941278bc69733acb7e9801e8fa3f139e Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 22 Oct 2010 08:14:51 +0000 Subject: [PATCH 1/2] I2PSnark: Unbutcher tags; relocate our snark theme to /themes/snark; more css updates. --- .../org/klomp/snark/web/I2PSnarkServlet.java | 109 +++++++++++++----- .../themes/console/snark/images/hat.png | Bin 5802 -> 0 bytes .../snark/images/snarknav_lowlight.png | Bin 958 -> 659 bytes .../themes/{console => }/snark/favicon.ico | Bin .../themes/{console => }/snark/images/add.png | Bin .../snark/images/arrow_refresh.png | Bin .../{console => }/snark/images/config.png | Bin .../snark/images/configuration.png | Bin .../{console => }/snark/images/create.png | Bin .../{console => }/snark/images/delete.png | Bin .../{console => }/snark/images/details.png | Bin .../themes/{console => }/snark/images/eta.png | Bin .../{console => }/snark/images/file.png | Bin .../{console => }/snark/images/graytile.png | Bin .../resources/themes/snark/images/hat.png | Bin 0 -> 15546 bytes .../{console => }/snark/images/hidepeers.png | Bin .../{console => }/snark/images/remove.png | Bin .../{console => }/snark/images/showpeers.png | Bin .../{console => }/snark/images/size.png | Bin .../{console => }/snark/images/snark_add.png | Bin .../snark/images/snark_create.png | Bin .../snark/images/snark_thead.png | Bin .../{console => }/snark/images/snarknav.png | Bin .../themes/snark/images/snarknav_lowlight.png | Bin 0 -> 659 bytes .../snark/images/snarknav_on.png | Bin .../{console => }/snark/images/start.png | Bin .../{console => }/snark/images/start_all.png | Bin .../{console => }/snark/images/status.png | Bin .../{console => }/snark/images/stop.png | Bin .../{console => }/snark/images/stop_all.png | Bin .../{console => }/snark/images/tile2.png | Bin .../{console => }/snark/images/torrent.png | Bin .../themes/{console => }/snark/images/up.png | Bin .../themes/{console => }/snark/snark.css | 0 34 files changed, 80 insertions(+), 29 deletions(-) delete mode 100644 installer/resources/themes/console/snark/images/hat.png rename installer/resources/themes/{console => }/snark/favicon.ico (100%) rename installer/resources/themes/{console => }/snark/images/add.png (100%) rename installer/resources/themes/{console => }/snark/images/arrow_refresh.png (100%) rename installer/resources/themes/{console => }/snark/images/config.png (100%) rename installer/resources/themes/{console => }/snark/images/configuration.png (100%) rename installer/resources/themes/{console => }/snark/images/create.png (100%) rename installer/resources/themes/{console => }/snark/images/delete.png (100%) rename installer/resources/themes/{console => }/snark/images/details.png (100%) rename installer/resources/themes/{console => }/snark/images/eta.png (100%) rename installer/resources/themes/{console => }/snark/images/file.png (100%) rename installer/resources/themes/{console => }/snark/images/graytile.png (100%) create mode 100644 installer/resources/themes/snark/images/hat.png rename installer/resources/themes/{console => }/snark/images/hidepeers.png (100%) rename installer/resources/themes/{console => }/snark/images/remove.png (100%) rename installer/resources/themes/{console => }/snark/images/showpeers.png (100%) rename installer/resources/themes/{console => }/snark/images/size.png (100%) rename installer/resources/themes/{console => }/snark/images/snark_add.png (100%) rename installer/resources/themes/{console => }/snark/images/snark_create.png (100%) rename installer/resources/themes/{console => }/snark/images/snark_thead.png (100%) rename installer/resources/themes/{console => }/snark/images/snarknav.png (100%) create mode 100644 installer/resources/themes/snark/images/snarknav_lowlight.png rename installer/resources/themes/{console => }/snark/images/snarknav_on.png (100%) rename installer/resources/themes/{console => }/snark/images/start.png (100%) rename installer/resources/themes/{console => }/snark/images/start_all.png (100%) rename installer/resources/themes/{console => }/snark/images/status.png (100%) rename installer/resources/themes/{console => }/snark/images/stop.png (100%) rename installer/resources/themes/{console => }/snark/images/stop_all.png (100%) rename installer/resources/themes/{console => }/snark/images/tile2.png (100%) rename installer/resources/themes/{console => }/snark/images/torrent.png (100%) rename installer/resources/themes/{console => }/snark/images/up.png (100%) rename installer/resources/themes/{console => }/snark/snark.css (100%) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 36266de1b..88f2dd5e8 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -170,7 +170,7 @@ public class I2PSnarkServlet extends Default { PrintWriter out = resp.getWriter(); out.write("\n" + - "\n" + + "\n" + ""); out.write(_("I2PSnark - Anonymous BitTorrent Client")); out.write("\n"); @@ -191,7 +191,8 @@ public class I2PSnarkServlet extends Default { out.write("
"); - out.write(_(" I2PSnark")); + out.write(" "); + out.write(_("I2PSnark")); out.write(" "); out.write(_("Forum")); out.write("\n"); @@ -238,47 +239,78 @@ public class I2PSnarkServlet extends Default { List snarks = getSortedSnarks(req); String uri = req.getRequestURI(); out.write(TABLE_HEADER); - out.write(_("Status")); + out.write(""); + out.write("title=\""); + out.write(_("Torrent Status")); + out.write("\">"); if (_manager.util().connected() && !snarks.isEmpty()) { out.write(" » "); - out.write(_("\"Hide")); + out.write("\"Hide"); + out.write(_("Hide Peers")); + out.write("\">"); } else { out.write("?p=1\">"); - out.write(_("\"Show")); + out.write("\"Show"); } out.write("
\n"); } out.write("\n"); - out.write(_("Torrent")); + out.write(""); + out.write(_("Torrent")); out.write("\n"); - out.write(_("ETA")); + out.write(""); + out.write(_("ETA")); out.write("\n"); - out.write(_("RX")); + out.write(""); + out.write(_("RX")); out.write("\n"); - out.write(_("TX")); + out.write(""); + out.write(_("TX")); out.write("\n"); - out.write(_("Rate")); + out.write("Rate"); out.write("\n"); - out.write(_("Rate")); + out.write(""); + out.write(_("Rate")); out.write("\n"); - out.write(""); if (_manager.util().connected()) { out.write(""); - out.write(_("\"Stop")); + out.write("\"");"); out.write(""); } else if (!snarks.isEmpty()) { out.write(""); - out.write(_("\"Start")); + out.write("\"Start"); out.write(""); } else { out.write(" "); @@ -749,7 +781,7 @@ public class I2PSnarkServlet extends Default { out.write(" "); - out.write(_("")); + out.write(""); out.write(""); break; } @@ -785,7 +817,11 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Stop the torrent")); out.write("\">"); - out.write(_("\"Stop\"")); + out.write("\"");"); out.write(""); } else { if (isValid) { @@ -793,7 +829,11 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Start the torrent")); out.write("\">"); - out.write(_("\"Start\"")); + out.write("\"");"); out.write(""); } out.write(""); - out.write(_("\"Remove\"")); + out.write("\"");"); out.write(""); out.write(""); - out.write(_("\"Delete\"")); + out.write("\"");"); out.write(""); } out.write("\n\n"); @@ -938,7 +986,8 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write("
"); - out.write(_("Add Torrent")); + out.write(""); + out.write(_("Add Torrent")); out.write("
\n
"); out.write(_("From URL")); out.write(": \n"); @@ -969,7 +1018,8 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); - out.write(_("Create Torrent")); + out.write(""); + out.write(_("Create Torrent")); out.write("
\n
"); //out.write("From file:
\n"); out.write(_("Data to seed")); @@ -1017,7 +1067,8 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); - out.write(_("Configuration")); + out.write(""); + out.write(_("Configuration")); out.write("
\n"); out.write("
"); out.write(_("Data directory")); @@ -1144,7 +1195,7 @@ public class I2PSnarkServlet extends Default { private void writeConfigLink(PrintWriter out) throws IOException { out.write("
\n"); out.write(""); - out.write(_("Configuration")); + out.write(_("Configuration")); out.write("
\n"); } @@ -1217,7 +1268,7 @@ public class I2PSnarkServlet extends Default { return buf.toString(); } - private static final String HEADER = ""; + private static final String HEADER = ""; private static final String TABLE_HEADER = "\n" + @@ -1284,13 +1335,13 @@ public class I2PSnarkServlet extends Default { title = title.substring(0, title.length() - 1); title = _("Torrent") + ": " + title; buf.append(title); - buf.append("").append(HEADER).append("\n
").append(HEADER).append("\n
I2PSnark").append("
"); buf.append("
" + "
" + - ""); + ""); //DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM, // DateFormat.MEDIUM); for (int i=0 ; i< ls.length ; i++) @@ -1383,7 +1434,7 @@ public class I2PSnarkServlet extends Default { // corrupts utf-8 //buf.append(URI.encodePath(URI.addPaths(base,"../"))); buf.append(URI.addPaths(base,"../")); - buf.append("\"> ") + buf.append("\"> ") .append(_("Up to higher level directory")).append("\n"); } @@ -1392,7 +1443,7 @@ public class I2PSnarkServlet extends Default { buf.append("
").append(_("\"File\" ")).append(title).append("").append(_("\"FileSize\"Size")) - .append("").append(_("Status")).append("
").append("\"").append(_("File")).append("\" ").append(title).append("").append(_("\"").append(_("FileSize")).append("\"").append(_("Size")); + buf.append("").append("").append(_("Status")).append("
\n"); - buf.append("\n"); + buf.append("\n"); return buf.toString(); } diff --git a/installer/resources/themes/console/snark/images/hat.png b/installer/resources/themes/console/snark/images/hat.png deleted file mode 100644 index 4599824c490fa2c8d87dc30e524ad0890320d0da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5802 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 delta 949 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 IM6N<$f(FweEdT%j literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/snark/images/hidepeers.png b/installer/resources/themes/snark/images/hidepeers.png similarity index 100% rename from installer/resources/themes/console/snark/images/hidepeers.png rename to installer/resources/themes/snark/images/hidepeers.png diff --git a/installer/resources/themes/console/snark/images/remove.png b/installer/resources/themes/snark/images/remove.png similarity index 100% rename from installer/resources/themes/console/snark/images/remove.png rename to installer/resources/themes/snark/images/remove.png diff --git a/installer/resources/themes/console/snark/images/showpeers.png b/installer/resources/themes/snark/images/showpeers.png similarity index 100% rename from installer/resources/themes/console/snark/images/showpeers.png rename to installer/resources/themes/snark/images/showpeers.png diff --git a/installer/resources/themes/console/snark/images/size.png b/installer/resources/themes/snark/images/size.png similarity index 100% rename from installer/resources/themes/console/snark/images/size.png rename to installer/resources/themes/snark/images/size.png diff --git a/installer/resources/themes/console/snark/images/snark_add.png b/installer/resources/themes/snark/images/snark_add.png similarity index 100% rename from installer/resources/themes/console/snark/images/snark_add.png rename to installer/resources/themes/snark/images/snark_add.png diff --git a/installer/resources/themes/console/snark/images/snark_create.png b/installer/resources/themes/snark/images/snark_create.png similarity index 100% rename from installer/resources/themes/console/snark/images/snark_create.png rename to installer/resources/themes/snark/images/snark_create.png diff --git a/installer/resources/themes/console/snark/images/snark_thead.png b/installer/resources/themes/snark/images/snark_thead.png similarity index 100% rename from installer/resources/themes/console/snark/images/snark_thead.png rename to installer/resources/themes/snark/images/snark_thead.png diff --git a/installer/resources/themes/console/snark/images/snarknav.png b/installer/resources/themes/snark/images/snarknav.png similarity index 100% rename from installer/resources/themes/console/snark/images/snarknav.png rename to installer/resources/themes/snark/images/snarknav.png diff --git a/installer/resources/themes/snark/images/snarknav_lowlight.png b/installer/resources/themes/snark/images/snarknav_lowlight.png new file mode 100644 index 0000000000000000000000000000000000000000..ba9435c0cde059a4444c16f5c1901a78dd1006a5 GIT binary patch literal 659 zcmV;E0&M+>P)0ssI2RtrC$00009a7bBm0017s z0017s0dCNBJ^%m$MM*?KRCt`lmI-d-FbqZc3Epy!(G&Gt)3bh%%X*!OkZ2u{1;J6AVOJcs>=@f@pn zvA?gYJFNC~{CK)IujsQG2_t6T?KF!y!?X^vZp%iG_uQi|`soyWh=Dq;T-#e_==BdiVzrYTZ!u1TR z^7rd2-D`ddVK#LnH1F;Yi6q|5g~Z=7x};eC+bH))XKz*Wg4yV$Z5Y~MwG0> zVn%l)NJTU3U51!fdcATK4q7O1piQgwoLchGN;j-6^E-XckpMLSIcbY-QrP}7y>A@XV@ zk87rUq$CkG(!=%9uMAXH@ZfeftcY}nx%2`V3-Hbg<(fz&T~~e&G|e?J>=mD%C^~CJ zV7ywL)#8Nh_Ni8KE6kM|bIrVuHEBMwA(gJH0b)Urf(s`U!)aEyoE@Tj;BmAhbyX4c z6SW;K7YQLvf@3UJD}Z&ex)?P36R$JL$r{CTMH~GGErL7yZ&zO%znjogjEP#LB^X_Y zh@@I;|2YJQQ59l9S_SiRYMTo#Cu$f&DwR(Nc-;$BiN+xNox@=@1N%MCVa?_n#A>aV t+;EZQ)u%p#0X3CK82)KVR#>gq!apUk&?elTNvi+=002ovPDHLkV1jdJFP#7Y literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/snark/images/snarknav_on.png b/installer/resources/themes/snark/images/snarknav_on.png similarity index 100% rename from installer/resources/themes/console/snark/images/snarknav_on.png rename to installer/resources/themes/snark/images/snarknav_on.png diff --git a/installer/resources/themes/console/snark/images/start.png b/installer/resources/themes/snark/images/start.png similarity index 100% rename from installer/resources/themes/console/snark/images/start.png rename to installer/resources/themes/snark/images/start.png diff --git a/installer/resources/themes/console/snark/images/start_all.png b/installer/resources/themes/snark/images/start_all.png similarity index 100% rename from installer/resources/themes/console/snark/images/start_all.png rename to installer/resources/themes/snark/images/start_all.png diff --git a/installer/resources/themes/console/snark/images/status.png b/installer/resources/themes/snark/images/status.png similarity index 100% rename from installer/resources/themes/console/snark/images/status.png rename to installer/resources/themes/snark/images/status.png diff --git a/installer/resources/themes/console/snark/images/stop.png b/installer/resources/themes/snark/images/stop.png similarity index 100% rename from installer/resources/themes/console/snark/images/stop.png rename to installer/resources/themes/snark/images/stop.png diff --git a/installer/resources/themes/console/snark/images/stop_all.png b/installer/resources/themes/snark/images/stop_all.png similarity index 100% rename from installer/resources/themes/console/snark/images/stop_all.png rename to installer/resources/themes/snark/images/stop_all.png diff --git a/installer/resources/themes/console/snark/images/tile2.png b/installer/resources/themes/snark/images/tile2.png similarity index 100% rename from installer/resources/themes/console/snark/images/tile2.png rename to installer/resources/themes/snark/images/tile2.png diff --git a/installer/resources/themes/console/snark/images/torrent.png b/installer/resources/themes/snark/images/torrent.png similarity index 100% rename from installer/resources/themes/console/snark/images/torrent.png rename to installer/resources/themes/snark/images/torrent.png diff --git a/installer/resources/themes/console/snark/images/up.png b/installer/resources/themes/snark/images/up.png similarity index 100% rename from installer/resources/themes/console/snark/images/up.png rename to installer/resources/themes/snark/images/up.png diff --git a/installer/resources/themes/console/snark/snark.css b/installer/resources/themes/snark/snark.css similarity index 100% rename from installer/resources/themes/console/snark/snark.css rename to installer/resources/themes/snark/snark.css From a55a464694156234ece587f0479c504f54cd0ae2 Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 22 Oct 2010 08:17:49 +0000 Subject: [PATCH 2/2] I2Psnark: Ensure our css uses the new path to our theme resources. --- installer/resources/themes/snark/snark.css | 75 +++++++++++----------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/installer/resources/themes/snark/snark.css b/installer/resources/themes/snark/snark.css index 82d5eb2d0..93e1d22e2 100644 --- a/installer/resources/themes/snark/snark.css +++ b/installer/resources/themes/snark/snark.css @@ -2,7 +2,7 @@ /* Guantanamo Commemorative Edition. */ body { - background: #101 url('/themes/console/snark/images/graytile.png'); + background: #101 url('/themes/snark/ubergine/images/graytile.png'); color: #001; font: 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif; } @@ -23,8 +23,8 @@ body { font-size: 11pt; color: #f70; text-shadow: 1px 1px #420; - background: url('/themes/console/snark/images/snarknav_lowlight.png') no-repeat scroll center bottom; - background: #310 url('/themes/console/snark/images/snarknav_lowlight.png') repeat-x scroll center center; + background: url('/themes/snark/ubergine/images/snarknav_lowlight.png') no-repeat scroll center bottom; + background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center; -moz-border-radius: 0px; -khtml-border-radius: 3px; border-radius: 0px; @@ -42,8 +42,8 @@ body { font-weight: bold; font-size: 11pt; color: #f50; - background: #310 url('/themes/console/snark/images/snarknav_on.png') repeat-x scroll center center; - background: url('/themes/console/snark/images/snarknav_on.png') repeat-x scroll center center; + background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center; + background: url('/themes/snark/ubergine/images/snarknav_lowlight.png') repeat-x scroll center center; -moz-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; @@ -60,20 +60,11 @@ body { font-weight: bold; font-size: 11pt; color: #fb0; - background: #310 url('/themes/console/snark/images/snarknav_on.png') repeat-x scroll center center; -} - -.snarkRefresh:first-child { - -moz-border-radius: 0px 0 0 3px; - -khtml-border-radius: 3px; - border-radius: 0; - -moz-box-shadow: inset 0 0 1px 0 #f90; - -khtml-box-shadow: inset 0 0 1px 0 #f90; - box-shadow: 0 0 1px 0 #f90; + background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center; } .snarkRefresh:last-child { - -moz-border-radius: 0 3px 0px 0px; + -moz-border-radius: 0 3px 3px 0px; -khtml-border-radius: 0 3px 0 0; border-radius: 0; -moz-box-shadow: inset 0 0 1px 0 #f90; @@ -81,6 +72,15 @@ body { box-shadow: 0 0 1px 0 #f90; } +.snarkRefresh:first-child { + -moz-border-radius: 3px 0 0 3px; + -khtml-border-radius: 3px; + border-radius: 0; + -moz-box-shadow: inset 0 0 1px 0 #f90; + -khtml-box-shadow: inset 0 0 1px 0 #f90; + box-shadow: 0 0 1px 0 #f90; +} + .snarkMessages { font: bold 9pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important; text-align: left; @@ -95,7 +95,7 @@ body { color: #22f; height: 70px; width: auto; - background: #111 url('/themes/console/snark/images/hat.png') no-repeat scroll right center; + background: #101 url('/themes/snark/ubergine/images/hat.png') no-repeat scroll right center; } .logshim { @@ -108,7 +108,7 @@ pre { padding: 0; text-align: left !important; height: 8px; - color: #070; + color: #51a; font-weight: bold !important; } @@ -118,7 +118,7 @@ table { padding: 0px; border-spacing: 0px; border-collapse: collapse; - color: #323 url("/themes/console/snark/images/hat.png"); + color: #323 url("/themes/snark/ubergine/images/hat.png"); width: 100%; opacity: 1 !important; } @@ -128,7 +128,7 @@ tr { } thead, tfoot { - background: url("/themes/console/snark/images/snark_thead.png") repeat-x scroll 0 0 #101; + background: url("/themes/snark/ubergine/images/snark_thead.png") repeat-x scroll 0 0 #101; text-shadow:0 2px 5px #333333; } @@ -313,7 +313,7 @@ td:first-child { border-radius: 0 0 5px 5px; border-top: 0; text-shadow: 0px 3px 5px #323; - background: #101 url('/themes/console/snark/images/snarknav.png') repeat-x scroll center center !important; + background: #101 url('/themes/snark/ubergine/images/snarknav.png') repeat-x scroll center center !important; font-variant: small-caps !important; } @@ -323,7 +323,7 @@ td:first-child { } .page { - background: #323 url('/themes/console/snark/images/tile2.png'); + background: #323 url('/themes/snark/ubergine/images/tile2.png'); color: #310; min-width: 820px !important; margin: 5px 0 0 0; @@ -386,13 +386,13 @@ input { -khtml-border-radius: 4px; border-radius: 4px; border: 1px inset #000; - background: #212 url('/themes/console/snark/images/graytile.png'); + background: #212 url('/themes/snark/ubergine/images/graytile.png'); color: #f60; } input.r { text-align: right; - background: url('/themes/console/snark/images/graytile.png'); + background: url('/themes/snark/ubergine/images/graytile.png'); } input[type=submit] { @@ -423,7 +423,7 @@ input[type=text]:active, input[type=text]:hover, input.r:hover { select { background: #333; - background: url('/themes/console/snark/images/graytile.png') !important; + background: url('/themes/snark/ubergine/images/graytile.png') !important; color: #f60; font: 9pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif; font-weight: bold; @@ -440,7 +440,7 @@ select:hover, textarea:hover { } textarea { - background: #111 url('/themes/console/snark/images/graytile.png'); + background: #111 url('/themes/snark/ubergine/images/graytile.png'); color: #f60; font-weight: bold; padding: 1px 4px 0px; @@ -493,7 +493,7 @@ div.newtorrentsection { -khtml-box-shadow: inset 0px 0px 1px 0px #101; box-shadow: inset 0px 0px 1px 0px #101; word-wrap: break-word; - background: #545 url('/themes/console/snark/images/snark_create.png') no-repeat scroll right center; + background: #545 url('/themes/snark/ubergine/images/snark_create.png') no-repeat scroll right center; opacity: 1.0; } @@ -510,7 +510,7 @@ div.addtorrentsection { -khtml-box-shadow: inset 0px 0px 1px 0px #101; box-shadow: inset 0px 0px 1px 0px #101; word-wrap: break-word; - background: #545 url('/themes/console/snark/images/snark_add.png') no-repeat scroll right center; + background: #545 url('/themes/snark/ubergine/images/snark_add.png') no-repeat scroll right center; opacity: 1.0; } @@ -544,7 +544,7 @@ div.configsectionpanel { box-shadow: inset 0px 0px 1px 0px #101; word-wrap: break-word; text-align: center; - background: #545 url('/themes/console/snark/images/configuration.png') no-repeat scroll right center; + background: #545 url('/themes/snark/ubergine/images/configuration.png') no-repeat scroll right center; font-weight: bold; } @@ -575,22 +575,23 @@ code { font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono; } .snarknavbar { - margin: 0 0 10px 0 !important; - padding: 7px 10px; - border: 1px solid #001; - -moz-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; + margin: -10px 0 5px 0 !important; + padding: 9px 10px 10px; + border: 1px solid #101; + -moz-border-radius: 0 0 8px 8px; + -khtml-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; -moz-box-shadow: inset 0px 0px 1px 0px #002; -khtml-box-shadow: inset 0px 0px 1px 0px #002; box-shadow: inset 0px 0px 1px 0px #002; - background: #111 url('/themes/console/snark/images/snarknav.png') repeat-x scroll center center; + background: #111 url('/themes/snark/ubergine/images/snarktopnav.png') repeat-x scroll center center; text-transform: uppercase !important; letter-spacing: 0.065em !important; font-weight: bold; font-size: 11.5pt; color: #001; - min-width: 820px; + min-width: 700px; + width: 700px; text-align: center; }