diff --git a/apps/routerconsole/jsp/graph.jsp b/apps/routerconsole/jsp/graph.jsp index ec42f78d5..de9cf9f3a 100644 --- a/apps/routerconsole/jsp/graph.jsp +++ b/apps/routerconsole/jsp/graph.jsp @@ -28,8 +28,6 @@ } %>

<%=intl._t("I2P Performance Graphs")%>

-
-
-
+
-
+
diff --git a/history.txt b/history.txt index 8c8c843a0..fc661dfdd 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,13 @@ +2017-07-30 str4d + * Console + - light theme: + - Fix spacing issue with banned peers list + - Tweak font sizes for Arabic + - Shrink icons in sidepanel network status span + - Add single graph view buttons to classic theme + - Better separation of graphing controls in single graph view + - Enhance presentation of /oldconsole and /proof + 2017-07-28 str4d * Console: - Enhance presentation of show/hide news links on home page diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 04359ef7c..8a8ddb8aa 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -756,9 +756,9 @@ div.refresh { vertical-align: middle; border: 1px solid #88f; border-radius: 2px; - padding: 6px 3px; - width: calc(100% - 10px); - margin: -5px 0 -6px; + padding: 6px 5px; + width: calc(100% - 12px); + margin: -6px 0 -7px; box-shadow: inset 0 0 0 1px #fff, 0 0 1px rgba(96,96,96,0.5); text-shadow: 0 1px 1px #fff; } @@ -792,10 +792,11 @@ div.refresh { .routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before, .routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before { - padding-right: 2px; + padding-right: 1px; vertical-align: middle; display: inline-block; filter: drop-shadow(0 0 1px rgba(96,96,96,0.5)); + transform: scale(0.9); } .routersummary .error::before, .routersummary .clockskew::before { @@ -1038,7 +1039,7 @@ a:link { word-wrap: break-word; } -a:visited { +a:visited, #graphopts a, #graphopts a:visited { color: #448 !important; text-decoration: none; font-weight: bold; @@ -1835,11 +1836,6 @@ div.welcome { min-width: 570px; } -.main#proof { - padding: 0; - min-width: 570px; -} - .main#tunnelmgr { padding: 0 10px; min-width: 550px; @@ -3941,25 +3937,36 @@ p#enablefullstats { font-weight: bold; } +/* graphs */ + .graphspanel { - padding: 15px 5px 0; + padding: 15px 5px 1px; margin: -16px -16px -11px -16px; text-align: center !important; overflow: hidden; } +#graphs .graphspanel { + margin: -16px; +} + +h3#graphdisplay { + margin: 12px -16px 10px; +} + .graphspanel img { - margin: 5px; + margin: 5px 4px; padding: 1px; - background: #f6f6ff; - border: 1px solid #89f; - box-shadow: 0 0 1px #aaa; + background: #fff; + border: 1px solid #9af; + box-shadow: 0 0 1px 0 #abf; max-width: 95%; max-width: calc(100% - 50px); } .graphspanel a img { background: #fff; + border: 1px solid #89f; opacity: 0.9; vertical-align: top; } @@ -3972,6 +3979,10 @@ p#enablefullstats { cursor: url(/themes/console/images/cursor_zoom.png), pointer; } +.graphspanel a:active img { + border: 1px solid #f90; +} + .graphspanel hr { margin: 10px 0; } @@ -3993,6 +4004,10 @@ form[action="graphs"] { background: #eef; } +#graphs form[action="graphs"] { + margin: -11px -16px; +} + form[action="graphs"] hr { margin: 5px -11px 3px; height: 1px; @@ -4002,34 +4017,11 @@ form[action="graphs"] input[type="text"] { min-width: 80px !important; } -p#graphopts { - text-align: center; - border: 1px solid #89f; - background: rgba(255,255,255,0.8); - margin: 25px -5px 0; - padding: 10px; - text-transform: capitalize; -} - -h3#graphinfo { - margin: 5px 10px 15px; - text-transform: capitalize; -} - -p#graphopts + p { - text-align: right; - background: #fff; - margin: -1px -5px 0; - padding: 10px; - border: 1px solid #89f; - display: none; -} - .formaction#graphing { margin: -3px -10px -5px; } -/* new graphs optionbox */ +/* graphs optionbox */ #graphs form { padding: 0 !important; @@ -4057,9 +4049,10 @@ p#graphopts + p { #graphs td:first-child { text-align: right; - width: 85px; + min-width: 100px; white-space: nowrap; padding: 13px 3px 13px 5px; + font-weight: bold; } #graphs td:nth-child(2) { @@ -4085,7 +4078,78 @@ p#graphopts + p { min-width: 60px; } -/* end new graphs optionbox */ +/* end graphs optionbox */ + +/* single view */ + +#graph_single { + padding-left: 0; + padding-right: 0; +} + +#graph_single .graphspanel { + margin: 0 -1px -13px; + padding: 3px 0 0 !important; +} + +#graph_single .graphspanel img { + margin: 10px 0; +} + +#graphopts { + text-align: center; + border: 1px solid #89f; + background: rgba(255,255,255,0.8); + margin: 25px -1px -11px; + padding: 10px 10px 9px; + text-transform: capitalize; + color: transparent; +} + +h3#graphinfo { + margin: 0 15px 9px; + text-transform: capitalize; +} + +#graphopts + p { + text-align: right; + background: #fff; + margin: -1px -5px 0; + padding: 10px; + border: 1px solid #89f; + display: none; +} + +#graphopts a { + display: inline-block; + border: 1px solid #8b8edf; + padding: 1px 10px; + border-radius: 15px; + background: #f8f8ff; + background: rgba(248,248,255,0.3); + margin: 3px -2px; + box-shadow: 0 0 0 1px #ddf; + box-shadow: 0 0 0 1px rgba(220,220,255,0.6); +} + +#graphopts a:empty { + display: none; +} + +#graphopts a:hover, #graphopts a:focus { + border: 1px solid #7778bf; + background: #e2e2ff; + background: linear-gradient(to bottom, #fff 50%, #d8d4ff 50%); + box-shadow: 0 0 0 1px rgba(220,220,255,0.6), inset 0 0 0 1px #d8d4ff; +} + +#graphopts a:active { + box-shadow: inset 3px 3px 3px rgba(41,61,95,0.8); + color: #557 !important; +} + +/* end single view */ +/* end graphs */ .footnote { text-align: right; @@ -5347,19 +5411,51 @@ p#fullhistory { text-align: left; } +.main#proof { + padding: 10px; + min-width: 570px; +} + #proof p { margin: 0; - padding: 0; + padding: 20px 10px 10px; + border: 1px solid #89f; + box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc; + background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat #eeeffb; + background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat rgba(220,225,252,0.3); + background-blend-mode: luminosity; } #proof textarea, #proof textarea:focus { - border: none; + line-height: 180%; margin: 0; + border: none; padding: 15px 20px; width: 100%; box-shadow: none; color: #333; background: none; + height: 200px; + overflow: hidden; + white-space: pre-wrap; + word-break: break-all; +} + +#oldconsole p { + margin: 0 0 5px; + padding: 10px 20px; + line-height: 200%; + border: 1px solid #89f; + box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc; + background: #eeeffb; + background: rgba(220,225,252,0.3); +} + +#oldconsole b { + display: inline-block; + min-width: 120px; + margin-right: 8px; + text-align: right; } #certs p { diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 741e19312..eaed62430 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -1113,7 +1113,7 @@ div.widepanel h3 { .graphspanel a img { border: 1px solid #494; padding: 3px; - margin: 5px 3px; + margin: 6px 4px; text-align: center !important; opacity: 0.9; transition: ease all 0.3s; @@ -1165,14 +1165,22 @@ div.widepanel h3 { } #graphopts { - margin: 30px 0 5px !important; - line-height: 220%; + margin: 30px -15px -5px !important; + padding: 11px 10px 10px; + border-top: 1px solid #494; + text-align: center; + background: #010; + background: rgba(0,16,0,0.5); } #graphopts a { + display: inline-block; filter: none; border: 1px solid #030; - padding: 2px 10px; + padding: 1px 10px; + line-height: 130%; + margin: 3px -1px; + text-transform: capitalize; } #graphopts a:empty { @@ -1184,7 +1192,7 @@ div.widepanel h3 { } h3#graphinfo { - margin-top: 0; + margin-top: 15px; border-radius: 0 !important; } @@ -1192,14 +1200,6 @@ h3#graphinfo { display: none; } -form[action="graphs"] { - border: 1px solid #494; - padding: 10px 10px 0 !important; - background: #000; - margin-top: -11px; - margin-bottom: 10px; -} - .formaction#graphing { margin: -4px -5px 5px !important; border-left: none; @@ -1218,6 +1218,12 @@ h3#graphinfo { word-spacing: normal; } +/* new graphs optionbox */ + +h3#graphdisplay { + margin: 15px 10px 10px; +} + h3#graphdisplay a { text-transform: capitalize; letter-spacing: normal; @@ -1225,7 +1231,11 @@ h3#graphdisplay a { font-size: 9pt; } -/* new graphs optionbox */ +form[action="graphs"] { + border: 1px solid #494; + background: #000; + margin: -11px 10px 13px; +} #graphs form { padding: 0 !important; @@ -4604,15 +4614,48 @@ ul#banlist + hr { margin-right: 5px; } +#proof p { + margin: 15px; + padding: 30px 5px 0; + border: 1px solid #000; + border-radius: 2px; + box-shadow: inset 0 0 0 1px #020, 0 0 1px #000; + background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat #001900; + background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat rgba(0,32,0,0.4); + background-blend-mode: color-burn; +} + #proof textarea { line-height: 160%; font-size: 9pt; + overflow: hidden; + word-break: break-all; + white-space: pre-wrap; + height: 200px; } #proof textarea:focus { outline: none; } +#oldconsole p { + margin: 15px 0 10px; + padding: 10px 20px; + line-height: 200%; + border: 1px solid #000; + border-radius: 2px; + box-shadow: inset 0 0 0 1px #020, 0 0 1px #000; + background: #001900; + background: rgba(0,32,0,0.4); +} + +#oldconsole b { + display: inline-block; + min-width: 120px; + margin-right: 8px; + text-align: right; +} + /* begin home page */ #homepanel { diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 68895b433..e7cf163e0 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -56,7 +56,7 @@ div.clearer { } .routersummary img[src$="i2plogo.png"], .routersummary h3, .confignav, *::before, *::after, div.app, .themechoice, .langselect, .langbox, -.newsAuthor, #netdbcountrylist img, .viewfullentry, .sybil_routerinfo th img, .graphspanel, #themeoptions { +.newsAuthor, #netdbcountrylist img, .viewfullentry, .sybil_routerinfo th img, .graphspanel, #themeoptions, #graphopts, #newsDisplay { -moz-user-select: none; -webkit-user-select: none; user-select: none; @@ -150,6 +150,12 @@ pre { filter: drop-shadow(0 0 1px #ccf); } +@media screen and (-webkit-min-device-pixel-ratio: 0) { +.routersummary img[src$="i2plogo.png"] { + margin-top: -2px !important; +} +} + .routersummary img[src$="i2plogo.png"]:hover { opacity: 1; transition: ease filter 0.3s 0s, ease opacity 0.3s 0s; @@ -560,7 +566,7 @@ p:empty + .sb_notice { vertical-align: middle; border: 1px solid #88f; border-radius: 2px; - padding: 6px 3px; + padding: 5px 6px; width: calc(100% - 10px); width: 100%; margin: -4px -1px; @@ -602,13 +608,14 @@ p:empty + .sb_notice { .routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before, .routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before { - padding-right: 3px; + padding-right: 2px; vertical-align: middle; display: inline-block; filter: drop-shadow(0 0 1px rgba(96,96,96,0.5)); + transform: scale(0.9); } -.routersummary .error::before, .routersummary .clockskew::before { +.routersummary .error::before { content: url(/themes/console/images/info/network_status/network_error.png); } @@ -767,13 +774,13 @@ p:empty + .sb_notice { .logo hr { margin: 8px -10px; - background: #7789bf; + background: #7778bf; height: 1px } .warning hr { - background: #7789bf; - background: linear-gradient(to right, #7789bf, #c2c4ef); + background: #7778bf; + background: linear-gradient(to right, #7778bf, #c2c4ef); } .logo a { @@ -1265,8 +1272,8 @@ textarea[name="reseedURL"] { } .newscontent { - background-color: rgba(220,220,255,0.6); - background: linear-gradient(to bottom, #eef, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important; + background: #eef !important; + background: linear-gradient(to bottom, rgba(240,240,255,0.8), rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important; border: 1px solid #7778bf; border-radius: 0 0 2px 2px; margin: 0 0 14px; @@ -1318,21 +1325,29 @@ div.newscontent p { padding: 2px 10px; border-radius: 15px; background: #f8f8ff; - background: rgba(248,248,255,0.3); + background: rgba(248,248,255,0.5); margin-left: -3px; box-shadow: 0 0 0 1px #ddf; box-shadow: 0 0 0 1px rgba(220,220,255,0.6); } -.news #newsdisplay a:hover, .news #newsdisplay a:focus, #graphopts a:hover, #graphopts a:focus { +.news #newsdisplay a:hover, .news #newsdisplay a:focus, +#graphopts a:hover, #graphopts a:visited:hover, #graphopts a:focus, #graphopts a:visited:focus { + color: #4f8fff; border: 1px solid #7778bf; background: #e2e2ff; background: linear-gradient(to bottom, #f8f8ff 50%, #e2e2ff 50%); - box-shadow: 0 0 0 1px rgba(220,220,255,0.6), inset 0 0 0 1px #fff; + box-shadow: 0 0 0 1px rgba(220,220,255,0.6), inset 0 0 0 1px #efefff; } -.news #newsdisplay a:active, #graphopts a:active { - box-shadow: inset 2px 2px 3px #335; +.news #newsdisplay a:focus, #graphopts a:focus, #graphopts a:visited:focus { + border: 1px solid #f60; +} + +.news #newsdisplay a:active, #graphopts a:active, #graphopts a:visited:active { + box-shadow: inset 3px 3px 3px rgba(41,61,95,0.8); + color: #559 !important; + border: 1px solid #7778bf; } .newsentry + hr + #newsStatus, .newsentry + hr + #newsStatus + #newsDisplay { @@ -1376,7 +1391,7 @@ div.news h3, #news h3 { background: url(images/news.png) 8px center no-repeat #fcfcff !important; background: url(images/news.png) 8px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fafaff 5%, rgba(231, 231, 255, 0.8)) 15% !important; text-align: left; - padding: 5px 10px 5px 30px; + padding: 6px 10px 5px 30px; border: 1px solid #7778bf; border-radius: 2px 2px 0 0; font-size: 10pt !important; @@ -1387,6 +1402,12 @@ div.news h3, #news h3 { filter: none; } +@media screen and (-webkit-min-device-pixel-ratio: 0) { +div.news h3, #news h3 { + padding: 7px 10px 5px 30px; +} +} + div.newscontent h4 { border-bottom: 0; padding: 0; @@ -1508,7 +1529,6 @@ h1, .confignav { border-left: 5px solid #7778bf; margin: 15px 0 15px 0; border-radius: 0 2px 2px 0; - background: #ffe; text-align: left; } @@ -1559,12 +1579,12 @@ h3#iptransport a:hover, h3#advancedconfig a:hover { } h3#transports, h3#upnp { - border: 1px solid #7789bf; + border: 1px solid #7778bf; } pre#transports { display: inline-block; - border: 1px solid #7789bf; + border: 1px solid #7778bf; background: #fafaff; padding: 10px 0 0 10px; width: calc(100% - 12px); @@ -1572,7 +1592,7 @@ pre#transports { } #upnpscan { - border: 1px solid #7789bf; + border: 1px solid #7778bf; margin: -16px 0 5px; padding: 5px 10px; background: #fafaff; @@ -1611,18 +1631,22 @@ b.suboption { /* end confignet tidyup */ -.main#tunnels h3 a:not(old), #criticallogs + h3.tabletitle a:not(old) { +h3#exploratorytunnels { + margin-top: 15px; +} + +#tunnels h3 a:not(old), #criticallogs + h3.tabletitle a:not(old) { font-size: 0; } -.main#tunnels h3 a[href^="/configtunnels#"]::after, #criticallogs + h3.tabletitle a::after { +#tunnels h3 a[href^="/configtunnels#"]::after, #criticallogs + h3.tabletitle a::after { content: url(/themes/console/images/buttons/configure.png); float: right; padding: 0; filter: drop-shadow(0 0 1px #999daf); } -.main#tunnels h3 a[href^="/configtunnels#"]:hover, #criticallogs + h3.tabletitle a:hover { +#tunnels h3 a[href^="/configtunnels#"]:hover, #criticallogs + h3.tabletitle a:hover { filter: drop-shadow(0 0 1px #f60); } @@ -1741,29 +1765,39 @@ p#tunnelconfig { margin-bottom: -14px; } +/* graphs */ + .graphspanel { text-align: center !important; margin: 15px 0 -15px; } +#graph_single h3 { + margin: 15px 0 0 !important; +} + +#graph_single .graphspanel { + margin: 9px -9px -20px; +} + .graphspanel img { padding: 1px; margin: 6px 5px; text-align: center !important; vertical-align: top !important; background: #fff; - border: 1px solid #6b6c8f; - box-shadow: 0 0 0 1px #ccc; + border: 1px solid #7778bf; + box-shadow: 0 0 1px #ccc; max-width: 98%; } .graphspanel a img { box-shadow: 0 0 1px #ccf; + filter: none !important; } .graphspanel a img:hover { box-shadow: inset 0 0 1px 1px #f60; - filter: none !important; cursor: url(/themes/console/images/cursor_zoom.png), pointer; mix-blend-mode: multiply; } @@ -1783,15 +1817,21 @@ p#tunnelconfig { #graphopts { text-align: center; - margin-top: 20px; - margin-bottom: 15px; - padding: 3px 0 5px; text-transform: capitalize; - line-height: 220%; + padding: 10px 0 9px; + margin: 30px -14px -9px; + border-top: 1px solid #77789f; + box-shadow: inset 0 0 0 1px #fff; + background: #e8e8ff; + background: repeating-linear-gradient(135deg, rgba(248,248,255,0.6) 2px, rgba(220, 220, 255, 0.3) 3px, #f8f8ff 5px), #f8f8ff; + filter: drop-shadow(0 0 1px #ccc); } #graphopts a { - margin: 0 -2px !important; + margin: 3px -2px !important; + display: inline-block; + padding: 1px 10px !important; + line-height: 140%; } #graphopts a:empty { @@ -1876,6 +1916,7 @@ h3#graphdisplay { } /* end new graphs optionbox */ +/* end graphs */ .messages { padding: 15px; @@ -2387,6 +2428,8 @@ div.appgroup { width: auto; } +/* optional homepage search */ + div.search { margin: 10px 10px 0 0; padding: 8px 8px 0 8px; @@ -2401,12 +2444,12 @@ table.search { border-top: 1px solid #447; background: #fafaff !important; background: linear-gradient(to bottom, #fafaff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important; - padding: 8px; + padding: 4px 6px; width: 70%; - margin-left:auto; - margin-right:auto; + margin-left: auto; + margin-right: auto; margin-top: -19px; - box-shadow: 0 1px 1px 1px rgba(210, 210, 255, 0.3), inset 0 0 0 1px #bbf; + box-shadow: 0 1px 1px 1px rgba(210, 210, 255, 0.3), inset 0 0 1px 1px #bbf; } .search tr { @@ -2448,6 +2491,8 @@ table.search select { text-overflow: ellipsis; } +/* end optional homepage search */ + .app img { width: auto; height: 32px; @@ -2578,7 +2623,7 @@ button:hover, button:focus, button:active, select:hover, select:focus, select:ac text-shadow: none; } -a:link, #graphopts a:visited { +a:link, #graphopts a:visited, .news #newsdisplay a { color: #3b6bbf; text-decoration: none; font-weight: bold; @@ -3121,8 +3166,8 @@ h2 img { } h3 { - border: 1px solid #7789bf; - border-left: 5px solid #7789bf; + border: 1px solid #7778bf; + border-left: 5px solid #7778bf; padding: 7px 5px 6px 7px; margin: 12px 0 15px 0; border-radius: 0 2px 2px 0; @@ -3403,11 +3448,12 @@ input[type="submit"], input[type="reset"], button, .optbox, select { button.search { background: url(/themes/console/images/buttons/search.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #ddd); - padding: 5px 7px 5px 22px; + padding: 5px 7px 5px 24px; } -button.search:hover { - background: url(/themes/console/images/buttons/search_hover.png) no-repeat 6px center, linear-gradient(to bottom, #ddd, #fff); +button.search:hover, button.search:focus, button.search:active { + background: url(/themes/console/images/buttons/search_hover.png) no-repeat 6px center, linear-gradient(to bottom, #ddd, #fff) !important; + background-size: 14px 14px, 100% 100% !important; } input.search[type="text"] { @@ -5395,10 +5441,10 @@ ul#banlist { border: 1px solid #7778bf; border-radius: 2px; display: block; - padding: 5px 1px; - -moz-columns: 300px auto; - -webkit-columns: 300px auto; - columns: 300px auto; + padding: 2px 0; + -moz-columns: auto; + -webkit-columns: auto; + columns: auto; -moz-column-gap: 0; -webkit-column-gap: 0; column-gap: 0; @@ -5407,30 +5453,25 @@ ul#banlist { #profiles #banlist { border: none; background: none; - padding: 0; -} - -#config_peers #banlist { - padding-bottom: 0; } #banlist li { display: inline-block; + min-width: 300px; + line-height: 120%; + margin: 3px 0 3px 5px !important; + padding: 8px 10px 0 35px; list-style: none; - margin: 5px 3px 5px 0; border: 1px solid #7778bf; border-radius: 2px; - padding: 8px 10px 0 35px; - line-height: 120%; + box-shadow: inset 0 0 0 1px #fff; background: #eef url(/themes/console/images/buttons/ban.png) 10px center no-repeat; background: url(/themes/console/images/buttons/ban.png) 10px center no-repeat, repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px) #fafaff; + font-size: 9pt; + filter: drop-shadow(0 0 1px #f8f8ff); -webkit-break-inside: avoid; break-inside: avoid; page-break-inside: avoid; - font-size: 9pt; - box-shadow: inset 0 0 0 1px #fff; - filter: drop-shadow(0 0 1px #f8f8ff); - min-width: 300px; } #config_peers #banlist li { @@ -5445,10 +5486,6 @@ ul#banlist { vertical-align: top; } -#profiles #banlist li { - margin: 0; -} - #banlist tt { margin-left: 2px; } @@ -5963,7 +6000,7 @@ h3#ntcpcon, h3#udpcon { background: linear-gradient(135deg, #fafaff, rgba(240,240,255,0.5)); border: 1px solid #99b; border-radius: 2px; - box-shadow: inset 0 0 0 1px #fff, 0 0 1px #557; + box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccf; } #oldconsole b { @@ -6464,7 +6501,7 @@ b.netdb_transport { padding: 10px 15px; margin-top: -16px; background: linear-gradient(to bottom, #fafaff, rgba(250,250,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #efefff !important; - border: 1px solid #7789bf; + border: 1px solid #7778bf; box-shadow: inset 0 0 0 1px #fff; filter: drop-shadow(0px 0 1px #ccf); } diff --git a/installer/resources/themes/console/light/console_ar.css b/installer/resources/themes/console/light/console_ar.css index 60c8c4570..bb1d41331 100644 --- a/installer/resources/themes/console/light/console_ar.css +++ b/installer/resources/themes/console/light/console_ar.css @@ -52,7 +52,7 @@ h2, h3 { h1 { margin: 0 212px -15px 0; - padding: 20px 20px 20px 10px; + padding: 15px 20px 15px 10px; background: linear-gradient(to left, #fcfcff, rgba(252,252,255,0) 600px), linear-gradient(to bottom, #fcfcff 50%, rgba(248,248,255,0.6) 50%), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important; } @@ -95,6 +95,8 @@ input.search[type="text"], input.search[type="text"]:focus { button, input[type="submit"], input[type="reset"] { display: inline-block; line-height: 120%; + font-size: 10pt; + font-weight: bold; } #config_homepage.main input.delete { @@ -532,6 +534,7 @@ div.themechoice, div.langselect { #configstats td:nth-child(2) { padding-right: 10px; + direction: ltr; } #i2pupdates td:first-child, #reseedconfig td:first-child, #configstats tr:last-child td, textarea[name="levels"] { @@ -606,7 +609,7 @@ h3#advancedconfig a, h3#bwlimiter a, h3.tabletitle a, h3.ptitle a, th a.script, .tab, .tab2 { display: inline-block; - font-size: 12pt !important; + font-size: 11pt !important; margin-top: -5px; padding-top: 6px !important; padding-bottom: 6px !important; @@ -976,7 +979,7 @@ p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, # } .routersummary td:first-child, .routersummary td:nth-last-child(n+2), .routersummary td a { - font-size: 10.5pt !important; + font-size: 10pt !important; } .routersummary h4 span::before { diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index 3c09041a6..2e32d66cc 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -2119,8 +2119,12 @@ div.widepanel h3 { } #graphopts { - margin-top: 30px !important; - padding: 12px 0; + margin: 30px -10px 0 !important; + padding: 10px 0 8px; + text-align: center; + background: #001; + background: rgba(0,0,16,0.5); + border-top: 1px solid #443da0; } #graphopts a { @@ -2128,6 +2132,7 @@ div.widepanel h3 { background: #001; border-color: #003; padding: 0 10px !important; + text-transform: capitalize; } #graphopts a, #graphopts a:visited { @@ -2143,14 +2148,14 @@ div.widepanel h3 { } h3#graphinfo { - margin-top: 0; + margin-top: 10px; border-radius: 0 !important; text-transform: capitalize; letter-spacing: normal; word-spacing: normal; } -.graphspanel p:last-child { +#graphopts + p { display: none; } @@ -5273,6 +5278,49 @@ table#jardump { line-height: 180%; } +#proof p { + margin: 15px 5px; + padding: 30px 15px 0; + border: 1px solid #000; + border-radius: 2px; + box-shadow: inset 0 0 0 1px #225, 0 0 1px #000; + background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat #002; + background: url(/themes/console/images/info/rosette.png) right 8px top 8px no-repeat rgba(0,0,32,0.4); + background-blend-mode: color-burn; +} + +#proof textarea { + line-height: 160%; + font-size: 9pt; + overflow: hidden; + word-break: break-all; + white-space: pre-wrap; + height: 200px; +} + +#proof textarea:focus { + outline: none; +} + +#oldconsole p { + margin: 17px 6px 15px; + padding: 10px 20px; + line-height: 200%; + border: 1px solid #000; + border-radius: 2px; + box-shadow: inset 0 0 0 1px #225, 0 0 1px #000; + background: #002; + background: rgba(0,0,32,0.4); +} + +#oldconsole b { + display: inline-block; + min-width: 120px; + margin-right: 8px; + text-align: right; +} + + .main#webmail { padding: 0; background: #000 !important; @@ -6717,6 +6765,7 @@ form[action="events"] { vertical-align: middle; display: inline-block; filter: drop-shadow(0 0 1px rgba(220,220,220,0.7)); + transform: scale(0.9); } .routersummary .error::before, .routersummary .clockskew::before { diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a85b0c8aa..9535f12e9 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 = 22; + public final static long BUILD = 23; /** for example "-test" */ public final static String EXTRA = "-rc";