From bff3f0436c59875bfb41fdae11d308f4309d10ad Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 10 Feb 2017 16:39:56 +0000
Subject: [PATCH] Router console theme tweaks

---
 apps/routerconsole/jsp/configfamily.jsp       |   2 +-
 .../themes/console/classic/console.css        |  22 +++-
 .../resources/themes/console/dark/console.css |  16 ++-
 .../themes/console/light/console.css          | 102 +++++++++++++-----
 .../themes/console/light/console_big.css      |   2 +-
 .../themes/console/midnight/console.css       |   9 +-
 6 files changed, 113 insertions(+), 40 deletions(-)

diff --git a/apps/routerconsole/jsp/configfamily.jsp b/apps/routerconsole/jsp/configfamily.jsp
index 501c0d076..16eecfbf9 100644
--- a/apps/routerconsole/jsp/configfamily.jsp
+++ b/apps/routerconsole/jsp/configfamily.jsp
@@ -80,7 +80,7 @@
        } else {
            // family is not active
 %>
-<p class="infohelp"><b><%=intl._t("Restart required to activate family {0}.", '"' + family + '"')%>
+<p class="infohelp needrestart"><b><%=intl._t("Restart required to activate family {0}.", '"' + family + '"')%>
 <%=intl._t("After restarting, you may export the family key.")%></b></p>
 <%
        }
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 6e3905fdb..32359341c 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -141,6 +141,7 @@ div.warning h3:first-child {
      width: 100%;
      resize: none;
      white-space: pre-wrap;
+     word-break: break-all;
      height: 100% !important;
      font-size: 8pt;
      border: none;
@@ -611,6 +612,10 @@ input[name="refreshInterval"] {
 
 /* accessibility tweak - colors rather than focus rings where possible */
 
+input[type="submit"], input[type="reset"], button, .optbox {
+     cursor: pointer;
+}
+
 .optbox:hover, .optbox:focus, input[type="checkbox"]:hover, input[type="checkbox"]:focus {
 /*	  -ms-filter: "progid:DXImageTransform.Microsoft.Dropshadow(OffX=0, OffY=0, Color='#89f')";*/     
      -webkit-filter: drop-shadow(0 0 2px #89f);
@@ -1083,7 +1088,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 }
 
 .routersummary .reload[value="Reseed"]:hover, .routersummary .reload[value="Reseed"]:focus, .routersummary .reload[value="Reseed"]:active {
-     background: url(/themes/console/images/buttons/download.png) center left 4px no-repeat !important, linear-gradient(to bottom, #ddd 0%, #fff 100%);
+     background: url(/themes/console/images/buttons/download.png) center left 4px no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%) !important;
 }
 
 .routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active {
@@ -1103,8 +1108,6 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 /* end sidebar buttons */
 /* end buttons & inputs */
 
-
-
 div.main {
      margin: 0 1px 0 200px;
      padding: 15px 15px 10px 15px;
@@ -1235,7 +1238,7 @@ div.wideload p  {
 div.news {
      margin: -1px 1px 0 200px;
      background: #f9f9ea url(images/bg1.png);
-     background: linear-gradient(to bottom, rgba(255,255,255,0.6), rgba(255,255,255,0.5)), url(images/bg1.png);
+     background: linear-gradient(to bottom, rgba(255,255,255,0.6), rgba(255,255,255,0.5)), url(images/bg1.png) #efefe0;
      border: 1px solid #89f;
      border-bottom: 1px solid #89f;
      border-right: 1px solid #89f;
@@ -2264,6 +2267,10 @@ div.app:hover .applabel {
      box-shadow: none;
 }
 
+.appimg {
+     min-height: 42px;
+}
+
 div.appgroup {
      margin: 0;
      padding: 0 8px;
@@ -4145,6 +4152,11 @@ p#fullhistory {
      margin-bottom: 10px;
 }
 
+#certs textarea {
+     margin: -1px 0 10px 0;
+     width: 100%;
+}
+
 #advancedsettings h2 {
      margin: 10px 0 0 !important;
 }
@@ -4288,7 +4300,7 @@ h3#shutdownrouter + p.infohelp {
      background-size: 28px 28px;
 }
 
-h3#restartrouter + p.infohelp {
+h3#restartrouter + p.infohelp, #config_family .infohelp.needrestart {
      background: #fff url(/themes/console/images/info/reboot.png) 12px center no-repeat;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px;
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 76e99607e..a8d296cc7 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -4250,6 +4250,11 @@ div.debugcontainer {
      margin-top: -13px !important;
 }
 
+.main#certs textarea {
+     margin: -1px 0 11px 0;
+     width: 100%;
+}
+
 .main#jardump {
      overflow: auto !important;
      padding: 0;
@@ -4288,6 +4293,10 @@ div.debugcontainer {
      color: #eea;
 }
 
+.main#jardump th:nth-child(4), .main#jardump th:nth-child(5) {
+     white-space: nowrap !important;
+}
+
 .main#jardump tt {
      letter-spacing: -0.03em;
 }
@@ -4298,8 +4307,9 @@ div.debugcontainer {
 
 @media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes column wrapping on webkit */
 .main#jardump td {
-     word-wrap: break-word !important;
-     max-width: 220px;
+     word-break: break-word !important;
+     word-break: break-all !important;
+     max-width: 230px;
 }
 }
 
@@ -5030,7 +5040,7 @@ h3#shutdownrouter + p.infohelp {
      background-size: 28px 28px !important;
 }
 
-h3#restartrouter + p.infohelp {
+h3#restartrouter + p.infohelp, #config_family .infohelp.needrestart {
      background: #000 url(/themes/console/images/info/reboot.png) 12px center no-repeat !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px !important;
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 5568ad0ea..689af5a71 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -82,7 +82,7 @@ pre {
      width: 98%;
      overflow: auto;
      text-align: left;
-     font: 8pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      color: #333;
      margin: 10px;
 }
@@ -234,7 +234,7 @@ div.routersummary h4 {
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) {
-.routersummary h4 {     
+.routersummary h4 {
      margin-bottom: -8px !important;
 }
 }
@@ -417,8 +417,14 @@ div.logo {
 }
 
 .logo hr {
-     margin: 8px -11px;
-     background: #447;
+     margin: 8px -10px;
+     background: #7789bf;
+     height: 1px
+}
+
+.logo a {
+     display: inline-block !important;
+     width: 100%;
 }
 
 div.warning {
@@ -490,7 +496,7 @@ div.warning {
 
 @media screen and (max-height: 700px) {
 .proxyfooter {
-     display: none;     
+     display: none;
 }
 }
 
@@ -591,6 +597,10 @@ div.main li:first-child {
      margin-top: -16px;
 }
 
+.main#debug hr {
+     display: none;
+}
+
 div.main hr, hr {
      color: #113;
      background: #113;
@@ -606,7 +616,7 @@ hr:last-child {
 div.main textarea {
      background: #fff;
      color: #001;
-     font: 9pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      margin: 5px 0;
      resize: none;
 }
@@ -766,7 +776,7 @@ div.newscontent h6 {
      box-shadow: 0 1px 1px #bbf; 
 }
 
-.tab, tab2 {
+.tab, .tab2 {
      min-width: 40px;
 }
 
@@ -964,7 +974,8 @@ table#wrapperlogs, table#routerlogs {
      white-space: pre-wrap !important;
      word-wrap: break-word !important;
      width: 100%;
-     overflow: auto; 
+     height: 600px;
+     overflow: auto;
 }
 
 .main#tunnels h3 a[href^="/configtunnels#"]:hover, #criticallogs + h3.tabletitle a:hover {
@@ -1353,7 +1364,7 @@ th {
      padding: 6px 5px;
      color: #31334f;
      background: #eef url(images/header.png) center center repeat-x;
-     background: linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%) !important;
+     background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) !important;
      text-align: left;
      font-size: 9pt;
      line-height: 110%;
@@ -1377,6 +1388,11 @@ tr:nth-child(odd) {
      background: #f7f8ff;
 }
 
+tr th {
+     background: #eef url(images/header.png) center center repeat-x;
+     background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) #fff !important;
+}
+
 td {
      padding: 3px 5px;
      color: #333;
@@ -1394,7 +1410,7 @@ td {
 }
 
 #bandwidthconfig td:first-child {
-     width: 100px;
+     width: 200px;
      white-space: nowrap;
      padding-right: 10px;
 }
@@ -1520,6 +1536,10 @@ div.app:active .applabel, div.app:active .applabel a  {
      color: #fff !important;
 }
 
+.appimg {
+     min-height: 52px;
+}
+
 div.appgroup {
      margin: 5px 0;
      padding: 0;
@@ -1560,6 +1580,7 @@ table.search td:first-child {
 table.search td:nth-child(2) {
      text-align: center !important;
      padding-right: 0;
+     width: 60px;
 }
 
 table.search td:nth-child(3) {
@@ -1634,7 +1655,7 @@ div.applabel {
 /* end home page */
 
 tt {
-     font: bold 9pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: bold 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      color: #050;
 }
 
@@ -1673,7 +1694,7 @@ div.main li b {
 
 .tidylist code {
      text-align: left;
-     font: 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      color: #910;
      font-weight: bold;
 }
@@ -1692,7 +1713,7 @@ ul {
 
 code {
      text-align: left;
-     font: 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      color: #030;
 }
 
@@ -1906,7 +1927,7 @@ h3#shutdownrouter + p.infohelp {
      background-size: 28px 28px;
 }
 
-h3#restartrouter + p.infohelp {
+h3#restartrouter + p.infohelp, #config_family .infohelp.needrestart {
      background: #fff url(/themes/console/images/info/reboot.png) 12px center no-repeat;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px;
@@ -2152,6 +2173,11 @@ h4 {
      box-shadow: inset 0 0 0 1px #fff;
 }
 
+#certs textarea {
+     margin: -1px 0 10px 0;
+     width: 100%;
+}
+
 .underline {
      border-bottom: 1px solid #000022;
      padding: 5px 0 5px 0;
@@ -2184,6 +2210,10 @@ h4 {
      transform: scale(1.2);
 }
 
+input[type="submit"], input[type="reset"], button, .optbox, select {
+     cursor: pointer;
+}
+
 button.search {
      background: url(/themes/console/images/buttons/search.png) no-repeat 6px center, linear-gradient(to bottom, #fff 0%, #ddd 100%);
      padding: 5px 5px 5px 21px;
@@ -2652,7 +2682,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 }
 
 .routersummary .reload[value="Reseed"]:hover, .routersummary .reload[value="Reseed"]:focus, .routersummary .reload[value="Reseed"]:active {
-     background: url(/themes/console/images/buttons/download.png) center left 4px no-repeat !important, linear-gradient(to bottom, #ddd 0%, #fff 100%);
+     background: url(/themes/console/images/buttons/download.png) center left 4px no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
 .routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active {
@@ -2755,7 +2785,7 @@ textarea {
      background: #ffe;
      color: #333 !important;
      border-radius: 2px;
-     font: 8pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      min-height: 100px;
      min-width: 97%;
      border: 1px solid #999;
@@ -2985,7 +3015,7 @@ iframe.iframed {
 
 .main#dns {
      padding: 0 8px;
-     min-width: 534px;
+     min-width: 540px;
 }
 
 #susidnsframe {
@@ -3974,6 +4004,10 @@ table#floodfills th {
      text-align: left;
 }
 
+#loggingoptions p {
+     text-align: left;
+}
+
 .main#proof textarea, .main#proof textarea:focus {
      background: none;
      border: none;
@@ -4069,6 +4103,13 @@ table#floodfills th {
      margin-bottom: 5px;
 }
 
+#changelog pre {
+     margin: 0;
+     width: 100%;
+     height: 600px;
+     white-space: pre-wrap;
+}
+
 .main#help h2 {
      margin: -1px -11px 10px !important;
      border-radius: 2px 2px 0 0;
@@ -4092,7 +4133,8 @@ table#floodfills th {
 
 .homelinkedit th:first-child, #sidebarconf th:first-child {
      text-align: center;
-     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%) !important;
+     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;
 }
@@ -4123,12 +4165,6 @@ table#floodfills th {
      text-align: center;
 }
 
-/*
-#pluginconfig button {
-     min-width: 60px;
-}
-*/
-
 #pluginconfig table {
      margin: 5px 5px 5px 0 !important;
      width: calc(100% - 5px);
@@ -4174,7 +4210,7 @@ h3#displayevents {
 form[action="events"] {
      border: 1px solid #7778bf;
      padding: 10px 10px 10px 50px;
-     margin: -16px 0 -2px 0 ;
+     margin: -16px 0 -2px 0;
      background: url(/themes/console/images/info/logs.png) 12px center no-repeat;
      background-size: 28px 28px;
 }
@@ -4234,13 +4270,13 @@ 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 {
+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 {
      font-size: 10pt !important;
 }
 
 .routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a,
-code, tt, div.news {
+div.news {
      font-size: 9pt !important;
 }
 
@@ -4305,4 +4341,14 @@ h3#pluginconfig, h3#webappconfig, h3#i2pclientconfig, h3#pluginmanage, p#clientc
 .subheading b {
      font-size: 10.5pt !important;
 }
+
+h3#restartrouter, p#tunnelconfig {
+     margin-bottom: -15px !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 1fcd4adff..4250bc5d8 100644
--- a/installer/resources/themes/console/light/console_big.css
+++ b/installer/resources/themes/console/light/console_big.css
@@ -41,7 +41,7 @@ div.routersummary table {
 }
 
 div.routersummary a {
-    font-size: 10pt;
+    font-size: 10pt !important;
 }
 
 div.routersummary h3, div.routersummary h4, div.routersummary p, div.routersummary h3 a, div.routersummary a {
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index d8553ff4e..ad279a706 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -2923,7 +2923,7 @@ table#configclient {
 
 /* configfamily */
 
-table#newfamily {
+table#newfamily, table#leavefamily {
      margin-bottom: 10px !important;
 }
 
@@ -4098,6 +4098,11 @@ table#jardump { /* /jars */
      margin-top: -13px !important;
 }
 
+.main#certs textarea {
+     margin: -1px 0 11px 0;
+     width: 100%;
+}
+
 .main#tunnels th {
      padding: 5px 2px;
 }
@@ -5178,7 +5183,7 @@ h3#shutdownrouter + p.infohelp {
      background-size: 28px 28px !important;
 }
 
-h3#restartrouter + p.infohelp {
+h3#restartrouter + p.infohelp, #config_family .infohelp.needrestart {
      background: #000 url(/themes/console/images/info/reboot.png) 12px center no-repeat !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px !important;