diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 32359341c..2cf77e84b 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -241,6 +241,14 @@ div.routersummary { line-height: 125%; } +div.routersummary img[src$="i2plogo.png"] { + margin-top: 3px; + margin-left: 0; + width: 173px; + height: auto; + filter: drop-shadow(0 0 1px #ccc); +} + .routersummary a { padding: 2px; } @@ -359,10 +367,27 @@ div.routersummary td { border: 0 !important; } +#sb_general, #sb_shortgeneral, #sb_bandwidth, #sb_peers, #sb_tunnels, #sb_queue { + margin-bottom: -4px !important; +} + +#sb_general td:first-child::after, #sb_shortgeneral td:first-child::after, #sb_bandwidth td:first-child::after, +#sb_peers td:first-child::after, #sb_tunnels td:first-child::after, #sb_queue td:first-child::after { + content: ""; + display: inline-block; + min-height: 14px; +} + +/* #sb_peers td, #sb_tunnels td, #sb_queue td, #sb_bandwidth td, #sb_general td, #sb_shortgeneral td { padding-top: 1px; padding-bottom: 1px; } +*/ + +#sb_peers td:first-child, #sb_tunnels td:first-child, #sb_queue td:first-child, #sb_bandwidth td:first-child, #sb_general td:first-child, #sb_shortgeneral td:first-child { + white-space: nowrap; +} #sb_bandwidth td:nth-child(2) { white-space: nowrap; @@ -446,7 +471,7 @@ div.newsheadings ul { } #sb_localtunnels td:first-child { - width: 16px !important; + width: 12px !important; padding-right: 0; text-align: left; } @@ -1051,13 +1076,6 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re border: 1px solid #89f; } -.routersummary .download { - background: url(/themes/console/images/buttons/download.png) 3px center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%); - background-size: 16px 16px, 100% 100% !important; - padding: 5px 3px 5px 21px !important; -/* margin-top: -4px;*/ -} - /* Show text on context specific buttons (eg deferred shutdown) */ .routersummary .reload[value="restartImmediate"], .routersummary .stop[value="shutdownImmediate"], .routersummary .reload[value="Reseed"] { @@ -1091,10 +1109,17 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re background: url(/themes/console/images/buttons/download.png) center left 4px no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%) !important; } +.routersummary .download { + background: url(/themes/console/images/buttons/download.png) 4px center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%); + background-size: 14px 14px, 100% 100% !important; + padding: 5px 3px 5px 18px !important; +/* margin-top: -4px;*/ +} + .routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active { background: url(/themes/console/images/buttons/download.png) 4px center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%); - background-size: 16px 16px, 100% 100% !important; - padding: 5px 3px 5px 21px !important; + background-size: 14px 14px, 100% 100% !important; + padding: 5px 3px 5px 18px !important; } /* @@ -1405,7 +1430,7 @@ table.configtable, table#permabanned, table#loggingoptions, table#configstats, u border-bottom: 1px solid #89f; } -table#joinfamily { +table#joinfamily, #exportfamily{ margin-top: 15px !important; } @@ -1414,6 +1439,23 @@ table#newfamily { margin-top: 4px; } +#exportfamily tr:nth-child(2) td:first-child { + background: #fff url(/themes/console/images/info/export_key.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + +#leavefamily { + margin-top: 19px; + margin-bottom: 7px; +} + +#leavefamily tr:last-child td:first-child { + background: #fff url(/themes/console/images/info/leave_family.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + table#peerdefs td:first-child { text-align: right; width: 50px; @@ -1569,6 +1611,10 @@ ul#banlist { font-size: 8pt; } +ul#banlist + h3.tabletitle { + margin-top: 9px !important; +} + #banlist li { list-style: none !important; border-bottom: 1px dotted #89f; @@ -1590,6 +1636,72 @@ ul#banlist { margin-top: 0; } +/* /configpeers banlist */ + +#bannedips { + margin-bottom: 4px; +} + +#bannedips table { + margin-bottom: -1px !important; +} + +#bannedips td { + vertical-align: top; + padding: 0; + width: 50%; +} + +#bannedips table tr { + border-top: 1px solid #ddf; +} + +#bannedips table td { + text-align: center; + padding: 4px 2px; +} + +#bannedips table tr:last-child { + border-bottom: 1px solid #89f; +} + +#permabanned, #banneduntilrestart { + margin: -1px 0 !important; + border: none; +} + +#permabanned td:first-child { + border-left: 1px solid #89f; + text-align: right; + padding-right: 10px; + width: 49%; +} + +#permabanned td:nth-child(2) { + width: 2%; +} + +#permabanned td:last-child { + text-align: left; + padding-left: 10px; + width: 49%; +} + +#banneduntilrestart td { + border-right: 1px solid #89f; + text-align: center !important; +} + +#ipv4, #ipv6, #permabanned tr:nth-child(2) { + background: url(images/tinytitle.png) center center repeat-x; + background: linear-gradient(to bottom, #fff 0%, #fff 50%, #eff2ff 50%, #eff2ff 100%); + border-top: 1px solid #89f !important; + border-bottom: 1px solid #89f !important; +} + +/* end /configpeer banlist */ + + .widescroll { overflow: auto; } @@ -1741,7 +1853,9 @@ div.configure h2:first-child { padding: 2px; } -#sidebarconf tr, .homelinkedit tr, #clientconfig tr, #webappconfig tr, #permabanned tr, #configstats tr, #tunnelconfig tr, #profiles tr, #floodfills tr, #netdboverview tr, .netdbentry tr, #leasesetdebug tr, #leasesetsummary tr, .leaseset tr, .sybil_routerinfo tr, #enviro tr, #schedjobs tr, #jobstats tr, #eventlog tr, .tunneldisplay tr, #udpconnections tr, #ntcpconnections tr { +#sidebarconf tr, .homelinkedit tr, #clientconfig tr, #webappconfig tr, #configstats tr, #tunnelconfig tr, #profiles tr, +#floodfills tr, #netdboverview tr, .netdbentry tr, #leasesetdebug tr, #leasesetsummary tr, .leaseset tr, +.sybil_routerinfo tr, #enviro tr, #schedjobs tr, #jobstats tr, #eventlog tr, .tunneldisplay tr, #udpconnections tr, #ntcpconnections tr { border-top: 1px inset #fff; border-bottom: 1px inset #fff; } @@ -2062,6 +2176,7 @@ th { text-align: center; border-bottom: 1px solid #89f; border-top: 1px solid #89f; + font-size: 9pt; } th.th_title { @@ -2589,7 +2704,7 @@ table#oldhome { .homelinkedit th:first-child, #sidebarconf th:first-child { background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eff2ff 50%, #eff2ff 100%); - font-size: 0; + font-size: 0 !important; } .homelinkedit th:last-child, .homelinkedit th:nth-child(3) { @@ -3153,10 +3268,6 @@ div.themechoice { margin-bottom: 31px !important; } -.themechoice .optbox:hover + img { -/* box-shadow: 0 0 1px 1px #33f;*/ -} - .themechoice .optbox:hover + img ~ div.themelabel { color: #f60; font-weight: bold; @@ -4363,12 +4474,11 @@ p#enablefullstats, p#gatherstats { @media screen and (min-width: 1500px) { body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li, .themelabel, .ui_lang, .applabel a, .statusnotes, #peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn, button, input, select, textarea, code, tt, pre, -.netdbentry th, .configtable th, ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover, div.messages { +.netdbentry th, .configtable th, ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover, div.messages, th { font-size: 10pt !important; } -.routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, -div.news { +.routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, div.news, #banlist li { font-size: 9pt !important; } @@ -4380,11 +4490,11 @@ div.news { width: 225px !important; } -.routersummary div[style="height: 36px;"] { -} - -.routersummary img[src$="i2plogo.png"] { - transform: scale(1.1); +div.routersummary img[src$="i2plogo.png"] { + margin-left: -2px; + transform: none; + width: 210px; + margin-top: -1px; } .routersummary table[id^="sb_"] { @@ -4477,3 +4587,7 @@ div.joblog h3 { font-size: 10.5pt !important; } } + +/* end responsive layout */ + + diff --git a/installer/resources/themes/console/classic/console_big.css b/installer/resources/themes/console/classic/console_big.css index f1af8d59b..cde134f69 100644 --- a/installer/resources/themes/console/classic/console_big.css +++ b/installer/resources/themes/console/classic/console_big.css @@ -30,8 +30,8 @@ div.routersummary h4, .routersummary h4 a { letter-spacing: 0; } -div.routersummary table { - font-size: 12pt; +div.routersummary td { + font-size: 11pt; } div.routersummary { @@ -42,25 +42,31 @@ div.routersummary table { width: 219px !important; } -.routersummary #bandwidth td:first-child { +#sb_bandwidth td:first-child { width: 20px !important; white-space: nowrap; } -.routersummary #bandwidth td:last-child { +#sb_bandwidth td:last-child { width: 80% !important; } +#sb_bandwidth td:last-child, #sb_peers td:last-child, #sb_queue td:last-child, #sb_tunnels td:last-child, #sb_general td:last-child, #sb_shortgeneral td:last-child { + font-size: 10pt !important; +} + div.routersummary table a:link, div.routersummary table a:visited { font-size: 12pt; font-weight: normal; text-shadow: none; } +/* .routersummary a img:first-child { transform: scale(1.2); -webkit-transform: scale(1.2); } +*/ div.tunnels a { font-size: 12pt !important; @@ -141,6 +147,12 @@ table code { font-weight: normal; } +.applabel a { + padding: 0 2px 6px !important; +} + + + .themelabel, .ui_lang { font-size: 12pt !important; font-weight: normal !important; @@ -156,4 +168,16 @@ div.themechoice, div.langselect { .tab2::before, .tab2::after { font-size: 16pt; +} + +@media screen and (min-width: 1500px) { +body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li, .themelabel, .ui_lang, .applabel a, .statusnotes, +#peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn, button, input, select, textarea, code, tt, pre, +.netdbentry th, .configtable th, ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover, div.messages, th { + font-size: 12pt !important; +} + +.routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, div.news, #banlist li { + font-size: 11pt !important; +} } \ No newline at end of file diff --git a/installer/resources/themes/console/classic/i2ptunnel.css b/installer/resources/themes/console/classic/i2ptunnel.css index fccfd49c5..7f5520280 100644 --- a/installer/resources/themes/console/classic/i2ptunnel.css +++ b/installer/resources/themes/console/classic/i2ptunnel.css @@ -527,7 +527,7 @@ input { } #localDestination, .authentication { - height: 30px !important; + height: 32px !important; } #leasesetKey { @@ -643,12 +643,12 @@ input.tunnelName, input.tunnelDescription, #userAgents { } .username { - background: url(/themes/console/images/buttons/user.png) 3px center no-repeat; + background: #fff url(/themes/console/images/buttons/user.png) 3px center no-repeat; padding-left: 22px; } .password { - background: url(/themes/console/images/buttons/password.png) 3px center no-repeat; + background: #fff url(/themes/console/images/buttons/password.png) 3px center no-repeat; padding-left: 22px; } @@ -847,4 +847,8 @@ th { h2, h3 { font-size: 12pt; } + +#localDestination, .authentication { + height: 34px !important; +} } \ No newline at end of file diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index a8d296cc7..f7c99cb99 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -184,51 +184,6 @@ div.warning { } */ -/* responsive proxy errors */ - -@media screen and (max-width: 800px) { -.warning { - margin-left: 20px !important; - background: url(images/camotile2.png) !important; - padding-left: 25px !important; -} - -.logo { - display: none; -} -} - -@media screen and (min-height: 700px) { -.proxyfooter { - position: absolute; - bottom: 0; - right: 0; - padding: 0 20px 0 0; - text-align: right; - background: #030; - width: 100%; - opacity: 0.7; - border-top: 1px solid #000; -} - -.proxyfooter p { - text-align: right; - line-height: 130% !important; - margin: 5px 0; -} - -.warning { - margin-bottom: 30px; -} -} - -@media screen and (max-height: 700px) { -.proxyfooter { - display: none; -} -} -/* end proxy errors */ - div.routersummaryouter { float: left; width: 200px; @@ -259,6 +214,10 @@ div.routersummary { div.routersummary img[src$="i2plogo.png"] { opacity: 0.9; transition: ease filter 0.3s 0s, ease opacity 0.3s 0s; + margin-top: 1px; + margin-left: -1px; + width: 176px; + height: auto; } div.routersummary img[src$="i2plogo.png"]:hover { @@ -287,7 +246,6 @@ div.routersummary hr { background: #494; height: 1px; margin: 9px -10px 7px -10px; - } div.routersummary h3 { @@ -350,15 +308,27 @@ div.routersummary table { background-color: transparent !important; } +#sb_general, #sb_shortgeneral, #sb_bandwidth, #sb_peers, #sb_tunnels, #sb_queue { + margin-bottom: -4px !important; +} + +#sb_general td:first-child::after, #sb_shortgeneral td:first-child::after, #sb_bandwidth td:first-child::after, +#sb_peers td:first-child::after, #sb_tunnels td:first-child::after, #sb_queue td:first-child::after { + content: ""; + display: inline-block; + min-height: 14px; +} + +/* #sb_peers td, #sb_tunnels td, #sb_queue td, #sb_bandwidth td, #sb_general td, #sb_shortgeneral td { padding-top: 1px; padding-bottom: 1px; } +*/ #sb_localtunnels { margin: -4px -7px -7px -8px !important; - /*width: 191px !important;*/ - text-transform: capitalize; +/* text-transform: capitalize;*/ } #sb_localtunnels td:first-child { @@ -380,6 +350,10 @@ div.routersummary table { line-height: 120%; } +#sb_internals td, #sb_services td, #sb_advanced td { /* color ellipsis */ + color: #595 !important; +} + #sb_internals a, #sb_services a, #sb_advanced a { padding: 1px 2px; } @@ -630,14 +604,18 @@ div.sorry { width: auto; border: 1px solid #494; border-radius: 0 0 2px 2px; - background: #000 url(images/scarface.jpg) right bottom no-repeat; -/* background: linear-gradient(45deg, rgba(0,0,0,0.5), rgba(0,34,0,0.3)), url(images/camotile2.png); - background-size: 3px 3px, 175px 175px;*/ + background: #000 url("images/camotile2.png") !important; min-width: 620px; box-shadow: 0 1px 5px #000; font-size: 9pt; } +.main, .routersummary { + background: #000 url("images/camotile2.png") !important; + background: linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0.45)), url("images/camotile2.png") #000 !important; + box-shadow: inset 0 0 0 1px #000, 0 1px 5px #000; +} + .main#dns { padding: 0 0 3px; min-width: 650px !important; @@ -698,11 +676,18 @@ div.news { border: 1px solid #494; background: #000; background: #000 url(images/news.png) no-repeat scroll bottom right; - color: #7b7; + background: linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0.5)), url("images/news.png") no-repeat scroll right bottom, url("images/camotile2.png") #000 !important; + background-blend-mode: lighten; + color: #ee9; font-size: 8pt; text-align: right; box-shadow: 0 1px 5px #000; - min-width: 580px; + min-width: 610px !important; +} + +/* MS Edge 14+ fix (no support for blend-mode) */ +_:-ms-lang(x), div.news { + background: #000 url(images/news.png) no-repeat scroll bottom right; } div.news li { @@ -997,6 +982,7 @@ h3#graphdisplay a { #graphs td.infohelp { border: 1px solid #131; border-right: none; + border-left: none; background-size: 20px 20px !important; padding: 5px 5px 5px 40px !important; background-color: #000800 !important; @@ -1267,7 +1253,7 @@ h2 a:hover { h3, h3.welcome { border: 1px solid #494; border-left: 5px solid #494; - padding: 5px 10px 6px; + padding: 6px 10px 5px; margin: 12px 0 10px 0; border-radius: 0 2px 2px 0; background: #000 url(images/header.png) center center ; @@ -1293,6 +1279,13 @@ h2, h3, h4 { box-shadow: inset 0 0 0 1px #000; } +h1, h4.app, h4.app2 { + background: linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%), url("images/camotile2.png") #000 !important; + background-blend-mode: exclusion; + box-shadow: inset 0 0 0 1px #000; + text-shadow: 0 1px 1px #000; +} + button::-moz-focus-inner, input::-moz-focus-inner { outline: none; border: none; @@ -1331,7 +1324,7 @@ button:active { box-shadow: inset 0 0 0 1px #000; } -button.reload, button.stop { +.routersummary button.reload, .routersummary button.stop { min-width: 86px; text-transform: capitalize; } @@ -1344,11 +1337,11 @@ button.reload, button.stop { .langbox { - margin: 3px 4px 2px 5px; + margin: 4px 4px 2px 5px; padding: 0; - color: #EE9; + color: #ee9; font-size: 7pt; - width: 350px; + width: 400px; text-align: right; float: right; vertical-align: middle; @@ -1356,12 +1349,19 @@ button.reload, button.stop { .langbox img { opacity: 0.5; - padding: 1px 2px !important; - transition: all 0.3s ease 0s; + padding: 0 !important; + margin: 0 1px -2px !important; + transition: ease opacity 0.3s 0s; + border: 1px solid #000; } .langbox img:hover { opacity: 1; + transform: scale(1.1); +} + +.langbox img:active { + transform: scale(1); } img[src*="bound"], img[src*="bound"]:hover { @@ -1524,8 +1524,7 @@ select { text-overflow: ellipsis; } -select option { /* dropdown menu reverts to normal font-weight */ - font-weight: normal; +select option { font-size: 9.5pt !important; box-shadow: inset 0 0 20px 20px #000; color: #fff !important; @@ -1627,7 +1626,7 @@ input[type="submit"], input[type="reset"], select, button { /* webkit/blink fix } input[type="submit"], input[type="reset"], button { - padding: 5px 4px; + padding: 5px 8px !important; } .statusnotes { @@ -1850,11 +1849,6 @@ h3.stats { border: 1px solid #494; border-radius: 0; } -/* -div.main li:last-child { - padding-bottom: 15px; -} -*/ div.joblog li { word-wrap: break-word !important; @@ -1933,15 +1927,6 @@ ul.statlist li li:last-child::before { color: #994 } -/* -.statlist a[href*="graph"]::before { - content: "\1F4CA\00A0"; - font-size: 11pt; - line-height: 140%; - font-weight: normal; -} -*/ - .main#stats form { border: 1px solid #494; padding: 10px; @@ -2137,6 +2122,10 @@ a[name="chelp"]:hover, a[name="help"]:hover, a[name="chelp"]:active, a[name="hel text-shadow: none; } +#oldhome td.optionsave { + background: none; +} + #oldhome input[type="checkbox"] { vertical-align: sub; min-width: 16px; @@ -2588,10 +2577,26 @@ table#configclient { /* configfamily */ -table#newfamily { +table#newfamily, #leavefamily { margin-bottom: 10px !important; } +#exportfamily tr:nth-child(2) td:first-child { + background: #000 url(/themes/console/images/info/export_key.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + +#leavefamily { + margin-top: 14px !important; +} + +#leavefamily tr:last-child td:first-child { + background: #000 url(/themes/console/images/info/leave_family.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + /* configreseed */ table#reseedconfig input[type="text"], table#reseedconfig input[type="password"] { @@ -2961,9 +2966,10 @@ table#sidebarconf { } #sidebarconf button { - margin: 2px; - padding: 1px; + margin: 5px 3px !important; + padding: 5px 4px !important; min-width: 0; + display: inline-block !important; } #sidebarconf button img { @@ -2976,7 +2982,7 @@ table#sidebarconf { } #sidebarconf th:nth-child(2) { - text-align: left; + text-align: left; } #sidebarconf td:first-child { @@ -2984,12 +2990,13 @@ table#sidebarconf { } #sidebarconf td:nth-child(2) { - font-weight: bold; + font-weight: bold; } #sidebarconf td:nth-child(3), #sidebarconf td:nth-child(4) { - width: 70px; - padding: 0; + width: 75px; + padding: 0; + white-space: nowrap; } #sidebarconf td:nth-child(3) { @@ -3231,11 +3238,12 @@ div#changelog pre { p#fullhistory { text-align: right; - margin-top: -20px; + margin-top: -11px; border: 1px solid #494; border-top: none; - padding: 10px 10px 5px 10px; + padding: 6px 10px; background: #000; + border-top: 1px solid #494; } ul#upnphelp li:last-child, #legal ul li:last-child { @@ -3756,6 +3764,67 @@ ul#banlist + hr { margin-top: -8px; } +/* /configpeers banlist */ + +#bannedips { + margin-bottom: 10px; +} + +#bannedips table { + margin-bottom: -1px !important; +} + +#bannedips td { + vertical-align: top; + padding: 0; + width: 50%; +} + +#bannedips table td { + text-align: center; + padding: 4px 2px; +} + +#bannedips table tr:last-child { + border-bottom: 1px solid #494; +} + +#permabanned, #banneduntilrestart { + margin-top: -1px !important; + border: none; +} + +#permabanned td:first-child { + border-left: 1px solid #494; + text-align: right; + padding-right: 10px; + width: 49%; +} + +#permabanned td:nth-child(2) { + width: 2%; +} + +#permabanned td:last-child { + text-align: left; + padding-left: 10px; + width: 49%; +} + +#banneduntilrestart td { + border-right: 1px solid #494; + text-align: center !important; +} + +#ipv4, #ipv6, #permabanned tr:nth-child(2) { + background: #000 url(images/header.png) center center repeat-x; + background-image: linear-gradient(to bottom, #001000 0%, #001900 50%, #000 51%, #000 100%) !important; + border-top: 1px solid #494; + border-bottom: 1px solid #494; +} + +/* end /configpeers banlist */ + div.footnote { text-align: right; color: #494; @@ -5114,7 +5183,7 @@ ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover font-size: 10pt !important; } -.main button, .main input, select, textarea { +.main button, .main input, select, textarea, div.news { font-size: 9pt !important; } @@ -5189,12 +5258,91 @@ div.joblog h3 { margin-top: -15px !important; } -button.reload, button.stop { +.routersummary button.reload, .routersummary button.stop { min-width: 101px; } .subheading b { font-size: 10.5pt !important; } + +p#fullhistory { + text-align: right; + margin-top: -14px; } +div.routersummary img[src$="i2plogo.png"] { + margin-left: -5px; + transform: none; + width: 210px; + margin-top: -3px; +} + +#banlist + h3.tabletitle { + margin-bottom: -2px !important; +} + +table#permabanned { + margin-top: -3px; +} +} + +/* responsive proxy errors */ + +@media screen and (max-width: 800px) { +.warning { + margin-left: 20px !important; + margin-top: 130px !important; + background: url(images/camotile2.png) !important; + padding: 5px 15px 15px !important; +} + +.logo { + position: absolute; + top: 20px; + width: calc(100% - 62px) !important; + z-index: 999; + min-width: 330px; +} + +.logo a { + width: auto !important; + padding: 2px 5px !important; +} +.logo a img { + padding: 0 !important; + margin-top: -2px; + margin-bottom: -4px; +} +} + +@media screen and (min-height: 700px) { +.proxyfooter { + position: absolute; + bottom: 0; + right: 0; + padding: 0 20px 0 0; + text-align: right; + background: #030; + width: 100%; + opacity: 0.7; + border-top: 1px solid #000; +} + +.proxyfooter p { + text-align: right; + line-height: 130% !important; + margin: 5px 0; +} + +.warning { + margin-bottom: 30px; +} +} + +@media screen and (max-height: 700px) { +.proxyfooter { + display: none; +} +} +/* end proxy errors */ diff --git a/installer/resources/themes/console/images/info/export_key.png b/installer/resources/themes/console/images/info/export_key.png new file mode 100644 index 000000000..800ecaf19 Binary files /dev/null and b/installer/resources/themes/console/images/info/export_key.png differ diff --git a/installer/resources/themes/console/images/info/leave_family.png b/installer/resources/themes/console/images/info/leave_family.png new file mode 100644 index 000000000..fc79590fa Binary files /dev/null and b/installer/resources/themes/console/images/info/leave_family.png differ diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 689af5a71..281e5f881 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -121,21 +121,33 @@ div.routersummary { text-align: center; } +@media screen and (-webkit-min-device-pixel-ratio:0) { +.routersummary div[style="height: 36px;"] { + height: 34px !important; +} +} + div.routersummary img[src$="i2plogo.png"] { opacity: 0.9; - transition: all 0.3s ease 0s; - margin-left: -2px; + transition: ease filter 0.3s 0s, ease opacity 0.3s 0s; + margin-top: 0; + margin-left: 0 !important; + width: 179px; + height: auto; + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); } div.routersummary img[src$="i2plogo.png"]:hover { opacity: 1; - transition: all 0.3s ease 0s; + transition: ease filter 0.3s 0s, ease opacity 0.3s 0s; filter: drop-shadow(0 0 1px #f60); -webkit-filter: drop-shadow(0 0 1px #f60); } -.routersummary a[href="/"] img { - margin-right: -1px; +div.routersummary a:active img[src$="i2plogo.png"] { + filter: drop-shadow(0 0 2px #f30); + -webkit-filter: drop-shadow(0 0 2px #f30); } .routersummary a[href="/"], .routersummary a[href="/console"] { @@ -156,6 +168,9 @@ div.routersummary img[src$="i2plogo.png"]:hover { display: inline-block; vertical-align: middle; margin: -3px 0; + background: url(/themes/console/images/buttons/download.png) 6px center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%); + background-size: 14px 14px, 100% 100% !important; + padding: 5px 3px 5px 21px !important; } div.routersummary input[type=text] { @@ -275,13 +290,17 @@ div.routersummary table { #sb_localtunnels td:first-child { text-align: left !important; width: 16px; - padding: 2px; + padding: 1px 2px; +} + +#sb_localtunnels td:first-child img { + margin: 0 0 2px !important; } #sb_localtunnels td:last-child { text-align: right !important; width: 16px; - padding-right: 0; + padding: 2px 0 2px 2px; } #sb_internals a, #sb_advanced a { @@ -294,6 +313,18 @@ div.routersummary table { padding-bottom: 1px; } +#sb_bandwidth td { + line-height: 120%; +} + +#sb_bandwidth tr:last-child td { + padding-top: 2px; +} + +#sb_peers td:first-child, #sb_tunnels td:first-child, #sb_queue td:first-child, #sb_bandwidth td:first-child, #sb_general td:first-child, #sb_shortgeneral td:first-child { + text-transform: capitalize; +} + .sb_notice { background: #eef; border: 1px solid #89f; @@ -314,13 +345,6 @@ div.routersummary tr { border: 0 !important; } -/* -div.routersummary td:first-child { - max-width: 90px; - overflow: hidden; -} -*/ - div.routersummary a:hover { color: #f60; } @@ -435,14 +459,19 @@ div.warning { color: #333; border-radius: 2px; text-align: justify; - background-image:url(/themes/console/images/itoopie_sm.png); - background-position:10px center; - background-repeat:no-repeat; + background-image: url(/themes/console/images/itoopie_sm.png); + background-position: 10px center; + background-repeat: no-repeat; box-shadow: inset 0 0 1px 0 #d00; word-wrap: break-word; min-width: 400px; } +.warning:not(old) { + background: url("/themes/console/images/itoopie_sm.png") no-repeat scroll 10px center, linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff; + background-size: 54px auto, 100% 100%, 50px 50px; +} + .warning h3 { text-align: left; } @@ -460,13 +489,30 @@ div.warning { @media screen and (max-width: 800px) { .warning { - margin-left: 20px !important; + margin-top: 115px !important; + margin: 115px 5px 0 0 !important; background: #fff !important; + background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff !important; + background-size: 100% 100%, 50px 50px !important; padding-left: 25px !important; } +.warning h3 { + font-size: 10pt !important; +} + .logo { - display: none; + position: absolute; + top: 0; + width: calc(100% - 40px) !important; + min-width: 430px; + margin: 10px 0 0 !important; +} + +.logo a:link:not(img) { + display: inline-block; + width: auto; + margin: 0 5px; } } @@ -591,7 +637,8 @@ div.main li:first-child { } .main#debug table { - filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); } .main#debug h2 + table { margin-top: -16px; @@ -622,7 +669,7 @@ div.main textarea { } td.tabletextarea { - padding: 0; + padding: 0 !important; background: #fff; } @@ -763,9 +810,19 @@ div.newscontent h6 { padding: 0 10px; } +div.main, .routersummary, .logo { + background: #fff url(images/noise.png) 0 0 / 50px 50px !important; + background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.5)) 0 0 / 100% 100%, #fff url("images/noise.png") 0 0 / 50px 50px !important; +} + +#news { + background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, url(images/noise.png) #fff !important; + background-size: 100% 100%, 140px auto, 50px 50px !important; +} + .confignav { - padding: 8px 10px 0 !important; - margin: 4px -14px 12px !important; + padding: 10px 10px 0 !important; + margin: 2px -14px 12px !important; font-size: 9pt !important; line-height: 160% !important; opacity: 1; @@ -773,7 +830,8 @@ div.newscontent h6 { vertical-align: middle; text-align: center; border-bottom: 1px solid #447; - box-shadow: 0 1px 1px #bbf; + box-shadow: 0 1px 1px #bbf; + background: #fff; } .tab, .tab2 { @@ -830,7 +888,6 @@ div.newscontent h6 { color: #fff !important; border-top-width: 1px; margin-top: -5px; -/* transition: ease border 0.3s 0s;*/ } .tab:first-child { @@ -861,8 +918,8 @@ div.newscontent h6 { text-align: center; font-weight: bold; border-radius: 2px 2px 0 0; - filter: drop-shadow(0 0 1px #999); - -webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); } div.configure { @@ -965,16 +1022,21 @@ table#wrapperlogs, table#routerlogs { margin-bottom: 10px; } +table#wrapperlogs { + margin-bottom: 5px; +} + #routerlogs ul { word-wrap: break-word; } #wrapperlogs pre { margin: 0; + padding: 3px 0 0 5px; white-space: pre-wrap !important; word-wrap: break-word !important; - width: 100%; - height: 600px; + width: calc(100% - 5px); + max-height: 600px; overflow: auto; } @@ -1030,9 +1092,9 @@ p#enablefullstats { #sidebarconf button { margin: 2px 0 2px 3px !important; - padding: 2px 1px; + padding: 2px; min-width: 0; - background-size: 12px 12px; + background-size: 100% 100% !important; } #sidebarconf select { @@ -1289,6 +1351,10 @@ td.optionsave { border-top: 1px solid #7778bf !important; } +.configtable td { + padding: 5px; +} + .configtable tr:last-child td { border-top: 1px solid #7778bf !important; } @@ -1348,6 +1414,10 @@ table[id$="logs"] ul li:last-child { margin-bottom: 10px !important; } +#wrapperlogs tr:last-child td { + padding: 0; +} + /* end logs */ table hr { @@ -1421,33 +1491,6 @@ td { /* begin home page */ -/* -#appsummary { - clear: none; - float: none; - left: 10px; - margin: 0; - position: absolute; - top: 10px; -} - -#homemain { - left: 217px; - margin: 0 10px 10px 0; - position: absolute; - top: 10px; -} - -#homenews { - margin: 0 10px 5px 0; -} - -h2.app { - border-radius: 2px; - margin: 1px 10px 15px 0 !important; -} -*/ - .home { margin-bottom: 0; } @@ -1467,8 +1510,8 @@ h4.app, h4.app2 { width: calc(100% - 44px); border-radius: 2px; color: #31334f; - filter: drop-shadow(0 0 1px #999); - -webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); } h4.app { @@ -1498,16 +1541,14 @@ div.app { background: #eef; background: linear-gradient(to bottom, #fff, #eef); box-shadow: inset 0 0 0 1px #fff, inset 0 0 5px 2px #eef; - filter: drop-shadow(0 0 1px #999); - -webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); } div.app:hover { border: 1px solid #f60; background: #fff; box-shadow: none; -/* filter: none; - -webkit-filter: none;*/ } div.app:hover a:link, div.app:hover a:visited { @@ -1556,14 +1597,18 @@ table.search { border-collapse: separate; border-spacing: 0; border-radius: 0 0 2px 2px; - border: 1px solid #447; + border: 1px solid #7778bf; background: none; padding: 8px; width: 70%; margin-left:auto; margin-right:auto; margin-top: -19px; - box-shadow: 0 1px 1px 1px rgba(187, 187, 255, 0.6); + box-shadow: 0 1px 1px 1px rgba(187, 187, 187, 0.3) +} + +.search tr { + background: none !important; } table.search td { @@ -1580,6 +1625,7 @@ table.search td:first-child { table.search td:nth-child(2) { text-align: center !important; padding-right: 0; + padding-left: 6px; width: 60px; } @@ -1606,8 +1652,8 @@ img.app, img.app2p { max-width: 32px; padding: 6px; padding: 10px 60px; - filter: drop-shadow(0 0 1px #999); - webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + webkit-filter: drop-shadow(0 0 1px #bbb); opacity: 0.9; } @@ -1637,6 +1683,7 @@ div.applabel { margin: 0; padding: 4px 6px; border-top: 1px solid #7778bf; + box-shadow: inset 0 0 0 1px #fff; text-align: center; width: 146px; overflow: hidden; @@ -1794,20 +1841,28 @@ p.infohelp, p#sybilinfo, p#debugmode, p#upnpstatus, p#pluginconfigtext, p#gather line-height: 130%; } -p#upnpstatus, p#keyringhelp, .widescroll + p.infohelp, #profiles ul#banlist, #config_reseed .confignav + p.infohelp, p#sybilinfo, p#debugmode { +p#upnpstatus, p#keyringhelp, .widescroll + p.infohelp, #profiles ul#banlist, #config_reseed .confignav + p.infohelp, p#sybilinfo, p#debugmode, #config_family .infohelp { border-radius: 2px; - filter: drop-shadow(0 0 1px #999); - -webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); } .infohelp + hr { display: none; } +table#bugreports { + border-collapse: separate; + border-radius: 2px; + filter: drop-shadow(0px 0 1px #bbb); +} + table#bugreports td.infohelp { - background: #fff url(/themes/console/images/info/bugreport.png) no-repeat 12px center; - padding: 15px 15px 15px 50px; + background: #fff url(/themes/console/images/info/bugreport.png) no-repeat left center; + padding: 10px 15px 10px 40px; background-size: 28px 28px; + border: none !important; + text-align: justify; } p#debugmode { @@ -1847,12 +1902,33 @@ p.infowarn { background-size: 28px 28px; } +#joinfamily tr:nth-child(2) td { + background: #fff; + padding: 10px 15px; +} + #newfamily tr:last-child td:first-child { background: #fff url(/themes/console/images/info/label.png) 12px center no-repeat; padding: 15px 15px 15px 50px; background-size: 28px 28px; } +#exportfamily tr:nth-child(2) td:first-child { + background: #fff url(/themes/console/images/info/export_key.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + +#leavefamily { + margin: 14px 0 10px; +} + +#leavefamily tr:last-child td:first-child { + background: #fff url(/themes/console/images/info/leave_family.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + #oldhome td:first-child { background: #fff url(/themes/console/images/info/home.png) 12px center no-repeat; padding: 15px 15px 15px 50px; @@ -1933,6 +2009,10 @@ h3#restartrouter + p.infohelp, #config_family .infohelp.needrestart { background-size: 28px 28px; } +h3#shutdownrouter, h3#systray { + margin-bottom: -15px; +} + h3#systray + p.infohelp { background: #fff url(/themes/console/images/info/systray.png) 12px center no-repeat; padding: 15px 15px 15px 50px; @@ -2016,6 +2096,8 @@ h1 { box-shadow: inset 0 0 0 1px #bbf; white-space: normal; background: #fff; + background: linear-gradient(to bottom, rgba(255,255,255,0.8) 50%, rgba(255,255,255,0.7) 50%), url(images/noise.png) #fff !important; + background-size: 100% 100%, 50px 50px !important; border: 1px solid #447; border-radius: 2px; min-width: 526px; @@ -2051,8 +2133,8 @@ h2 { border-radius: 2px; margin: 15px 0 15px 0 !important; box-shadow: inset 0 0 0 1px #fff; - filter: drop-shadow(0 0 1px #999); - -webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); word-wrap: break-word; opacity: 1; text-transform: uppercase !important; @@ -2060,7 +2142,8 @@ h2 { .welcome h2 { /* fixes occluded langbox rendering bug */ filter: none; - box-shadow: inset 0 0 0 1px #fff, 0 0 1px #999; + box-shadow: inset 0 0 0 1px #fff, 0 0 1px #bbb; + white-space: nowrap; } h2 a, h3 a { @@ -2084,7 +2167,7 @@ h2 img { h3 { border: 1px solid #7789bf; border-left: 5px solid #7789bf; - padding: 5px 5px 5px 7px; + padding: 6px 5px 5px 7px; margin: 12px 0 15px 0; border-radius: 0 2px 2px 0; background: url(images/header.png) center center repeat-x !important; @@ -2095,8 +2178,8 @@ h3 { word-spacing: 0.1em; color: #31334f; box-shadow: inset 0 0 0 1px #fff; - filter: drop-shadow(0 0 1px #999); - -webkit-filter: drop-shadow(0 0 1px #999); + filter: drop-shadow(0 0 1px #bbb); + -webkit-filter: drop-shadow(0 0 1px #bbb); opacity: 1; } @@ -2118,6 +2201,87 @@ h3#bannedpeers { margin-bottom: -1px; } +/* /configpeers */ + +#banlist li { + min-height: 34px; +} + +#bannedips { + margin-bottom: 10px; +} + +#bannedips td { + vertical-align: top; + padding: 0; + width: 50%; +} + +#permabanned tr:nth-child(2) td, #ipv4 td, #ipv6 td { + border-bottom: 1px solid #7778bf; + background: #fff !important; + background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) #fff !important; +} + +#ipv6 td { + border-top: 1px solid #7778bf; +} + +#bannedips table { + border: none; + border-bottom: 1px solid #7778bf; + margin: -1px 0 !important; +} + +#bannedips table th { + text-align: center; +} + +#bannedips table td { + text-align: center; + padding: 4px 2px; +} + +#banneduntilrestart, #permabanned { + width: 100%; +} + +#permabanned td:first-child { + border-left: 1px solid #7778bf; + text-align: right; + padding-right: 10px; + width: 49%; +} + +#permabanned td:nth-child(2) { + width: 2%; +} + +#permabanned td:last-child { + text-align: left; + padding-left: 10px; + width: 49%; +} + +#banneduntilrestart td { + border-right: 1px solid #7778bf; + text-align: right !important; +} + +#banneduntilrestart td:last-child { + text-align: center !important; +} + +#bannedips tr:nth-child(even) { + background: #eef; +} + +#bannedips tr:nth-child(odd) { + background: #f7f8ff; +} + +/* end /configpeers */ + h4 { border: 1px solid #7778bf; padding: 4px 6px; @@ -2178,6 +2342,12 @@ h4 { width: 100%; } +#certs h4 + textarea { + margin: -11px 0 5px !important; + border: 1px solid #7778bf; + box-shadow: none; +} + .underline { border-bottom: 1px solid #000022; padding: 5px 0 5px 0; @@ -2185,7 +2355,7 @@ h4 { } .langbox { - margin: 3px 0 4px 5px; + margin:3px 1px 0 5px; padding: 2px 3px; color: #001; font-size: 7pt; @@ -2197,10 +2367,13 @@ h4 { } .langbox img { - filter: drop-shadow(0 0 1px #777); - -webkit-filter: drop-shadow(0 0 1px #777); + padding: 0 !important; opacity: 0.9; - margin-bottom: 1px; + margin: -1px 0 0; + border: 1px solid #99f; + filter: none; + -webkit-filter: none; + border-radius: 1px; } .langbox img:hover { @@ -2210,6 +2383,10 @@ h4 { transform: scale(1.2); } +.langbox img:active { + transform: scale(1.0); +} + input[type="submit"], input[type="reset"], button, .optbox, select { cursor: pointer; } @@ -2259,7 +2436,7 @@ button:hover, input[type="submit"]:hover, input[type="reset"]:hover, button:focu } button:active, input[type="submit"]:active, input[type="reset"]:active { - box-shadow: inset 2px 2px 2px #555; + box-shadow: inset 0 0 0 1px #fff, inset 2px 2px 2px #555; background-blend-mode: luminosity; } @@ -2619,7 +2796,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re } .routersummary .reload:active, .routersummary .stop:active, .routersummary .download:active { - box-shadow: inset 2px 2px 2px #555; + box-shadow: inset 0 0 0 1px #fff, inset 2px 2px 2px #555; } .routersummary .reload[value="Reseed"] { @@ -2644,7 +2821,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re .routersummary .download { background: url(/themes/console/images/buttons/download.png) 3px center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%); - background-size: 16px 16px, 100% 100% !important; + background-size: 14px 14px, 100% 100% !important; padding: 5px 3px 5px 17px !important; } @@ -2686,8 +2863,8 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re } .routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active { - background: url(/themes/console/images/buttons/download.png) 4px center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%); - background-size: 16px 16px, 100% 100% !important; + background: url(/themes/console/images/buttons/download.png) 6px center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%); + background-size: 14px 14px, 100% 100% !important; padding: 5px 3px 5px 21px !important; } @@ -2754,7 +2931,6 @@ select, input[type="text"] { min-width: 120px; } -@-moz-document url-prefix() { /* target firefox and derivatives only */ select { -moz-appearance: none; background: url(images/dropdown.png) right center no-repeat, linear-gradient(to bottom, #fff 0%, #ddd 100%); @@ -2769,7 +2945,6 @@ select:focus { background: url(images/dropdown_hover.png) right center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%) !important; box-shadow: 0 0 0 1px #89f; } -} input[readonly], input[disabled], input[readonly]:focus, input[disabled]:focus { background: #ddd; @@ -2801,14 +2976,13 @@ textarea:focus { .statusnotes { font-style: normal; font-size: 9pt; - color: #225 !important; text-align: center; border: 1px solid #7778bf !important; border-top: 0 !important; margin: -5px 0 5px 0; padding: 7px; background: #eef; - background: linear-gradient(to bottom, #efefff, #eef); + background: linear-gradient(to right, #efefff, #fff, #efefff) #fff; letter-spacing: 0em !important; box-shadow: inset 0 0 0 1px #fff; } @@ -2989,6 +3163,7 @@ div.footnote hr { margin: 20px 0 5px 0 !important; color: #447; background: #447; + background: linear-gradient(to right, #77a, #669, #77a); height: 1px; border: 0 solid #447; } @@ -3070,6 +3245,7 @@ body.iframed { #consolepass.formaction { margin-top: -6px; + margin-bottom: -3px; } #consolepass tr:first-child td { @@ -3097,8 +3273,8 @@ div.themechoice { background: linear-gradient(to bottom, #fff 0%, #ddf 100%); transition: filter ease 0.3s 0s; box-shadow: inset 0 0 0 1px #fff; - filter: drop-shadow(0px 0 1px #999); - -webkit-filter: drop-shadow(0px 0 1px #999); + filter: drop-shadow(0px 0 1px #bbb); + -webkit-filter: drop-shadow(0px 0 1px #bbb); } .themechoice:hover { @@ -3225,8 +3401,8 @@ div.langselect { /* containing box for lang selection */ background: linear-gradient(to bottom, #fff 0%, #ddf 100%); transition: transform 0.3s ease 0s; box-shadow: inset 0 0 0 1px #fff; - filter: drop-shadow(0px 0 1px #999); - -webkit-filter: drop-shadow(0px 0 1px #999); + filter: drop-shadow(0px 0 1px #bbb); + -webkit-filter: drop-shadow(0px 0 1px #bbb); } .langselect:hover { @@ -3487,7 +3663,7 @@ table#leasesetdebug th a:hover, table#leasesetsummary th a:hover { #netdboverview th, #netdblookup th { text-transform: uppercase; - font-size: 11pt; + font-size: 11pt !important; letter-spacing: 0.08em; word-spacing: 0.1em; background: url(/themes/console/images/info/globe.png) 8px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%) !important; @@ -3892,7 +4068,7 @@ ul#banlist { text-transform: capitalize; } -table#profiles tr:hover td, table#floodfills tr:hover td, #permabanned tr:hover td, +table#profiles tr:hover td, table#floodfills tr:hover td, #ntcpconnections tr:nth-last-child(n+2):hover td, #udpconnections tr:nth-last-child(n+2):hover td, #schedjobs tr:hover td, #jobstats tr:nth-last-child(n+2):hover td, #jardump tr:hover td, #sidebarconf tr:nth-last-child(n+2):hover td, @@ -4099,17 +4275,27 @@ table#floodfills th { background: #fff; } +#volunteer { + background: #fff url("/themes/snark/ubergine/images/hat.png") no-repeat right -3px bottom -3px / 140px auto; +} + #changelog { margin-bottom: 5px; + padding: 0 0 0 10px; } #changelog pre { - margin: 0; + margin: -10px 0 0; + padding-top: 8px; width: 100%; height: 600px; white-space: pre-wrap; } +#advancedsettings { + word-break: break-all; +} + .main#help h2 { margin: -1px -11px 10px !important; border-radius: 2px 2px 0 0; @@ -4118,9 +4304,16 @@ table#floodfills th { -webkit-filter: none; } +.main#help #changelog h2 { + margin-right: -1px !important; +} + #fullhistory { text-align: right; - margin-bottom: 0; + margin: 0 0 0 -10px; + padding: 5px 8px; + border-top: 1px solid #7778bf; + background: linear-gradient(to right, #efefff 65%, #fff) } .main#torrents { @@ -4136,7 +4329,7 @@ table#floodfills th { background: url(/themes/console/images/buttons/delete.png) center center no-repeat, url(images/header.png) center center repeat-x #eef; background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) #fff !important; text-align: left; - font-size: 0; + font-size: 0 !important; } .homelinkedit tr:last-child td:first-child { @@ -4215,10 +4408,6 @@ form[action="events"] { background-size: 28px 28px; } -#joinfamily { - margin-top: -14px; -} - #newfamily { margin-top: -6px; margin-bottom: 10px; @@ -4270,13 +4459,12 @@ img.app, img.app2p { } @media screen and (min-width: 1500px) { -body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li, .themelabel, .ui_lang, .applabel a, -#peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn, button, input, select, textarea, #configinfo th, tt, code { +body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li, .themelabel, .ui_lang, .applabel a, +#peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn, button, input, select, textarea, #configinfo th, tt, code, th, .statusnotes { font-size: 10pt !important; } -.routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, -div.news { +.routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, div.newss, pre, #jardump tt, #jardump td, div.news { font-size: 9pt !important; } @@ -4292,11 +4480,11 @@ div.news { height: 40px !important; margin-top: 4px; } - +/* .routersummary img[src$="i2plogo.png"] { transform: scale(1.1); } - +*/ .routersummary table[id^="sb_"] { width: 216px !important; } @@ -4325,10 +4513,6 @@ h3#pluginconfig, h3#webappconfig, h3#i2pclientconfig, h3#pluginmanage, p#clientc margin-bottom: -15px; } -#jardump tt, #jardump td { - font-size: 9pt !important; -} - .sorry { margin-left: 232px !important; } @@ -4345,10 +4529,48 @@ h3#pluginconfig, h3#webappconfig, h3#i2pclientconfig, h3#pluginmanage, p#clientc h3#restartrouter, p#tunnelconfig { margin-bottom: -15px !important; } + +h1 { + padding: 21px 15px 17px; + font-size: 19pt; +} + +div.routersummary img[src$="i2plogo.png"] { + margin-left: 0 !important; + transform: none !important; + width: 205px !important; + margin-top: -2px !important; +} + +#sb_internals a, #sb_advanced a { + max-width: none; + white-space: normal; + overflow: auto; +} + +#banlist li { + font-size: 10pt; + min-height: 38px !important; +} + +.confignav { + padding-top: 12px !important; +} + +.langbox img { + margin: -1px 0 1px 1px; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { +.routersummary div[style="height: 36px;"] { + height: 38px !important; +} +} } /* MS Edge 14+ fix */ _:-ms-lang(x), *, *:hover { filter: none !important; -webkit-filter: none !important; -} \ No newline at end of file +} + diff --git a/installer/resources/themes/console/light/console_big.css b/installer/resources/themes/console/light/console_big.css index 4250bc5d8..b7d192706 100644 --- a/installer/resources/themes/console/light/console_big.css +++ b/installer/resources/themes/console/light/console_big.css @@ -28,6 +28,10 @@ button, input[type="submit"], input[type="reset"] { padding: 5px 5px 5px 20px !important; } +button.control { + padding: 12px 11px !important; +} + input.cancel { padding: 5px 5px 6px 20px !important; } diff --git a/installer/resources/themes/console/light/images/noise.png b/installer/resources/themes/console/light/images/noise.png new file mode 100644 index 000000000..3f9e5c0b2 Binary files /dev/null and b/installer/resources/themes/console/light/images/noise.png differ diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index ad279a706..63f3558ee 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -850,12 +850,6 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re background-blend-mode: normal; } -.routersummary .download { - background: url(/themes/console/images/buttons/download.png) 3px center no-repeat; - background-size: 16px 16px, 100% 100% !important; - padding: 5px 3px 5px 17px !important; -} - .routersummary .reload, .routersummary .stop { text-indent: -99999px; background-size: 16px 16px, 100% 100% !important; @@ -930,23 +924,21 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re background: #652787 url(/themes/console/images/buttons/download.png) center left 4px no-repeat !important; } -@media screen and (-webkit-min-device-pixel-ratio:0) { +.routersummary .download, .routersummary .download:hover, .routersummary .download:focus { + background: url(/themes/console/images/buttons/download.png) 3px center no-repeat; + background-size: 14px 14px, 100% 100%; + min-width: 0 !important; +} + .routersummary .download, .routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active { - padding-left: 19px !important; -} + background-size: 14x 14px !important; + padding: 5px 3px 5px 22px !important; } -.routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active { - background: #000 url(/themes/console/images/buttons/download.png) 3px center no-repeat; - background-size: 16px 16px !important; - padding: 5px 3px 5px 17px !important; -} - -.routersummary .download:focus { +.routersummary .download:active { background: #652787 url(/themes/console/images/buttons/download.png) 3px center no-repeat; - background-size: 16px 16px !important; - padding: 5px 3px 5px 17px !important; } + /* end sidebar buttons */ /* end buttons & inputs */ @@ -1085,27 +1077,31 @@ div.logo hr { .routersummary img[src*="i2plogo"] { opacity: 0.7; - transition: all 0.3s ease 0s; + transition: ease-out opacity 0.3s 0s, ease filter 0.3s 0s; + margin-top: 1px; margin-left: -3px; - filter: sepia(100%) hue-rotate(180deg); - -webkit-filter: sepia(100%) hue-rotate(180deg); + width: 176px; + height: auto; + filter: sepia(100%) hue-rotate(180deg) drop-shadow(0 0 1px #652787); + -webkit-filter: sepia(100%) hue-rotate(180deg) drop-shadow(0 0 1px #652787); } .routersummary img[src*="i2plogo"]:hover { opacity: 1; - transition: all 0.3s ease 0s; - filter: drop-shadow(0 0 3px #652787) saturate(200%); - -webkit-filter: drop-shadow(0 0 3px #652787) saturate(200%); + transition: ease-in opacity 0.3s 0s, ease filter 0.3s 0s; + filter: drop-shadow(0 0 2px #652787) saturate(100%); + -webkit-filter: drop-shadow(0 0 2px #652787) saturate(100%); } .routersummary img[src*="i2plogo"]:active { - filter: drop-shadow(0 0 5px #450519) saturate(200%) !important; - -webkit-filter: drop-shadow(0 0 5px #450519) saturate(200%) !important; + filter: drop-shadow(0 0 5px #450519) saturate(140%) !important; + -webkit-filter: drop-shadow(0 0 5px #450519) saturate(140%) !important; + transition: ease-out opacity 0s 0s, ease filter 0s 0s; } .routersummary a[href="/"]:focus img, .routersummary a[href="/console"]:focus img { opacity: 1; - transition: all 0.3s ease 0s; + transition: ease-in opacity 0.5s 0s, ease filter 0.5s 0s; filter: drop-shadow(0 0 3px #652787) saturate(200%); -webkit-filter: drop-shadow(0 0 3px #652787) saturate(200%); } @@ -1186,10 +1182,23 @@ div.logo hr { background-color: transparent !important; } +#sb_general, #sb_shortgeneral, #sb_bandwidth, #sb_peers, #sb_tunnels, #sb_queue { + margin-bottom: -4px !important; +} + +#sb_general td:first-child::after, #sb_shortgeneral td:first-child::after, #sb_bandwidth td:first-child::after, +#sb_peers td:first-child::after, #sb_tunnels td:first-child::after, #sb_queue td:first-child::after { + content: ""; + display: inline-block; + min-height: 14px; +} + +/* #sb_peers td, #sb_tunnels td, #sb_queue td, #sb_bandwidth td, #sb_general td, #sb_shortgeneral td { padding-top: 1px; padding-bottom: 1px; } +*/ #sb_localtunnels { width: 189px !important; @@ -2923,10 +2932,26 @@ table#configclient { /* configfamily */ -table#newfamily, table#leavefamily { +#newfamily, #exportfamily { + margin-bottom: 14px !important; +} + +#exportfamily tr:nth-child(2) td:first-child { + background: #000 url(/themes/console/images/info/export_key.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + +#leavefamily { margin-bottom: 10px !important; } +#leavefamily tr:last-child td:first-child { + background: #000 url(/themes/console/images/info/leave_family.png) 12px center no-repeat; + padding: 15px 15px 15px 50px; + background-size: 28px 28px; +} + /* configreseed */ table#reseedconfig input[type="text"], table#reseedconfig input[type="password"] { @@ -2966,6 +2991,40 @@ ul#banlist tt { color: #c11f5d; } +ul#banlist { + border: 1px solid #443da0; + background: #000; + padding: 10px 10px 10px 0; + margin: -1px 0 13px; + -moz-column-count: auto; + -moz-column-width: 300px; + -moz-column-gap: 10px; + -moz-column-rule: 1px dotted #443da0; + -webkit-column-count: auto; + -webkit-column-width: 300px; + -webkit-column-gap: 10px; + -webkit-column-rule: 1px dotted #443da0; + column-count: auto; + column-width: 300px; + column-gap: 10px; + column-rule: 1px dotted #443da0; +} + +#banlist li { + list-style: none !important; + border-bottom: 1px dotted #443da0; + margin: 0 10px 3px; + padding-top: 3px; + min-width: 250px; + min-height: 46px; + width: 88%; + padding-bottom: 5px; + break-inside: avoid; + page-break-inside: avoid; + -webkit-break-inside: avoid; + display: inline-block; +} + /* /confignet */ h3#iptransport { @@ -4020,7 +4079,7 @@ table#viewprofile td { ul#banlist { border: 1px solid #443da0; background: #000; - padding: 10px 10px 0 0; + padding: 10px 10px 10px 0; margin-bottom: 10px; } @@ -4875,7 +4934,8 @@ td.optionsave { margin-bottom: 0; } -h3.h3table, h3.tabletitle, h3#i2pclientconfig, h3#advancedclientconfig, h3#webappconfig, h3#pluginconfig, h3#pluginfromurl, h3#pluginfromfile, h3#updateplugins, h3#pluginmanage, h3#bannedpeers, h3.ptitle, h3#transports, h3#upnpstatus, h3.sybils { +h3.h3table, h3.tabletitle, h3#i2pclientconfig, h3#advancedclientconfig, h3#webappconfig, h3#pluginconfig, h3#pluginfromurl, +h3#pluginfromfile, h3#updateplugins, h3#pluginmanage, h3#bannedpeers, h3.ptitle, h3#transports, h3#upnpstatus, h3.sybils { margin-bottom: 0 !important; border-radius: 0; border: 1px solid #443da0; @@ -5019,19 +5079,83 @@ h4.embeddedtitle#updateplugins { width: calc(100% - 300px); } -table#permabanned, table#loggingoptions, table#addkeyring { +table#loggingoptions, table#addkeyring { margin-bottom: -3px !important; margin-top: -1px; } -table#permabanned { - margin-bottom: 9px !important; +/* /configpeers banlist */ + + + +#bannedips { + margin-bottom: 8px; + margin-top: -1px; +} + +#bannedips table { + margin-bottom: -1px !important; +} + +#bannedips td { + vertical-align: top; + padding: 0; + width: 50%; +} + +#bannedips table tr { + border-top: 1px solid #000; +} + +#bannedips table td { + text-align: center; + padding: 4px 2px; +} + +#bannedips table tr:last-child { + border-bottom: 1px solid #443da0; } #permabanned th, #banneduntilrestart th { padding: 5px 10px !important; } +#permabanned, #banneduntilrestart { + margin: -1px 0 !important; + border: none; +} + +#permabanned td:first-child { + border-left: 1px solid #443da0; + text-align: right; + padding-right: 10px; + width: 49%; +} + +#permabanned td:nth-child(2) { + width: 2%; +} + +#permabanned td:last-child { + text-align: left; + padding-left: 10px; + width: 49%; +} + +#banneduntilrestart td { + border-right: 1px solid #443da0; + text-align: center !important; +} + +#ipv4, #ipv6, #permabanned tr:nth-child(2) { + background: #000 url(images/titles.png) center center repeat-x; + background: linear-gradient(to bottom, #121225 0%, #121225 50%, #000011 50%, #00000d 50%, #00000d 100%); + border-top: 1px solid #443da0 !important; + border-bottom: 1px solid #443da0 !important; +} + +/* end /configpeer banlist */ + table#configstats { margin-bottom: -2px; } @@ -5252,7 +5376,7 @@ form[action="events"] { /* responsive layout */ @media screen and (min-width: 1500px) { -body, .main, .main td, .news p, #news p, .statusnotes, textarea, pre, tt, code { +body, .main, .main td, .news p, #news p, .statusnotes, textarea, pre, tt, code, th { font-size: 10pt !important; } @@ -5273,15 +5397,18 @@ h1 { width: 200px !important; } -.routersummary img[src$="i2plogo.png"] { - transform: scale(1.1); -} - .routersummary div[style="height: 36px;"] { height: 40px !important; margin-top: 3px; } +div.routersummary img[src$="i2plogo.png"] { + margin-left: -5px; + transform: none; + width: 207px; + margin-top: -3px; +} + .routersummary table[id^="sb_"], #sb_localtunnels { width: 216px !important; } @@ -5330,3 +5457,4 @@ h4#updateplugins { font-size: 10.5pt !important; } } +