tools: fix a couple of HTML/CSS validation errors in the status page
Also update reset.css and text.css from the Unsemantic project
https://github.com/nathansmith/unsemantic/tree/master/assets/stylesheets
Change-Id: I8f6292461f13902d39b511399515b3efdf50c8c5
diff --git a/tools/nfd-status-http-server-files/nfd-status.xsl b/tools/nfd-status-http-server-files/nfd-status.xsl
index 419e46c..ada37d0 100644
--- a/tools/nfd-status-http-server-files/nfd-status.xsl
+++ b/tools/nfd-status-http-server-files/nfd-status.xsl
@@ -1,7 +1,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:nfd="ndn:/localhost/nfd/status/1">
-<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat"/>
+<xsl:output method="html" encoding="UTF-8" doctype-system="about:legacy-compat"/>
<xsl:template match="/">
<html>
@@ -93,7 +93,7 @@
</xsl:template>
<xsl:template match="nfd:generalStatus">
- <h2>General NFD status</h2>
+ <h2>General Status</h2>
<table class="item-list">
<thead>
<tr>
@@ -220,7 +220,7 @@
<table class="item-list alt-row-colors">
<thead>
<tr>
- <th width="20%">Prefix</th>
+ <th class="name-prefix">Prefix</th>
<th>NextHops</th>
</tr>
</thead>
@@ -255,7 +255,7 @@
<table class="item-list alt-row-colors">
<thead>
<tr>
- <th width="20%">Prefix</th>
+ <th class="name-prefix">Prefix</th>
<th>Routes</th>
</tr>
</thead>
@@ -332,7 +332,7 @@
</tr>
</thead>
<tbody>
- <tr class="center">
+ <tr>
<td><xsl:value-of select="nfd:nHits"/></td>
<td><xsl:value-of select="nfd:nMisses"/></td>
</tr>
@@ -345,7 +345,7 @@
<table class="item-list alt-row-colors">
<thead>
<tr>
- <th width="20%">Namespace</th>
+ <th class="name-prefix">Namespace</th>
<th>Strategy Name</th>
</tr>
</thead>
diff --git a/tools/nfd-status-http-server-files/reset.css b/tools/nfd-status-http-server-files/reset.css
index 0af7c26..529c591 100644
--- a/tools/nfd-status-http-server-files/reset.css
+++ b/tools/nfd-status-http-server-files/reset.css
@@ -1,6 +1,3 @@
-/* `XHTML, HTML4, HTML5 Reset
-----------------------------------------------------------------------------------------------------*/
-
a,
abbr,
acronym,
@@ -52,6 +49,7 @@
label,
legend,
li,
+main,
mark,
menu,
meter,
@@ -109,26 +107,15 @@
footer,
header,
hgroup,
+main,
menu,
nav,
section {
-/*
- Override the default (display: inline) for
- browsers that do not recognize HTML5 tags.
-
- IE8 (and lower) requires a shiv:
- http://ejohn.org/blog/html5-shiv
-*/
display: block;
}
b,
strong {
-/*
- Makes browsers agree.
- IE + Opera = font-weight: bold.
- Gecko + WebKit = font-weight: bolder.
-*/
font-weight: bold;
}
@@ -136,24 +123,18 @@
color: transparent;
font-size: 0;
vertical-align: middle;
-/*
- For IE.
- http://css-tricks.com/ie-fix-bicubic-scaling-for-images
-*/
-ms-interpolation-mode: bicubic;
}
-li {
-/*
- For IE6 + IE7:
-
- "display: list-item" keeps bullets from
- disappearing if hasLayout is triggered.
-*/
- display: list-item;
+ul,
+ol {
list-style: none;
}
+li {
+ display: list-item;
+}
+
table {
border-collapse: collapse;
border-spacing: 0;
@@ -173,7 +154,7 @@
q:before,
q:after {
- content: '';
+ content: "";
content: none;
}
@@ -199,9 +180,5 @@
}
svg {
-/*
- For IE9. Without, occasionally draws shapes
- outside the boundaries of <svg> rectangle.
-*/
overflow: hidden;
-}
\ No newline at end of file
+}
diff --git a/tools/nfd-status-http-server-files/style.css b/tools/nfd-status-http-server-files/style.css
index 5d4b828..f01f1a7 100644
--- a/tools/nfd-status-http-server-files/style.css
+++ b/tools/nfd-status-http-server-files/style.css
@@ -1,7 +1,6 @@
-@import 'reset.css';
-@import 'text.css';
-
@charset "utf-8";
+@import "reset.css";
+@import "text.css";
body {
background-color: #ffffff;
@@ -42,21 +41,11 @@
text-align: right;
position: fixed;
- font-height: 10px;
bottom: 0;
left: 5%;
}
-h1 {
- font-family: sans-serif;
-}
-
-h3 {
- font-family: sans-serif;
-}
-
h5 {
- font-family: sans-serif;
color: #727272;
}
@@ -82,21 +71,18 @@
}
/* */
-.item-list
-{
+.item-list {
border-radius: 6px;
margin-top: 10px;
margin-bottom: 10px;
- font-family: sans-serif;
width: 100%;
text-align: left;
}
-.item-list th
-{
+.item-list th {
font-weight: normal;
- padding: 8px;
+ padding: 6px;
background: #EAF4EF;
border-top: 1px solid #99CCB2;
color: #727272;
@@ -106,43 +92,39 @@
.item-list th.border-left {
}
-.item-list td
-{
+.item-list th.name-prefix {
+ width: 20%;
+}
+
+.item-list td {
padding: 2px;
border-bottom: 1px solid #fff;
color: #000;
border-top: 1px solid transparent;
}
-.item-sublist
-{
- border-collapse:collapse;
- border:1px solid gray;
+.item-sublist {
+ border-collapse: collapse;
+ border: 1px solid gray;
padding: 4px;
- font-family: sans-serif;
text-align: center;
margin-bottom: 0;
}
-.item-sublist th
-{
+.item-sublist th {
background-color: transparent;
font-weight: bold;
padding: 4px;
text-align: center;
- border-collapse:collapse;
- border:1px solid gray;
+ border-collapse: collapse;
+ border: 1px solid gray;
}
-.item-sublist th.border-left {
-}
-
-.item-sublist td
-{
- border-collapse:collapse;
- border:1px solid gray;
+.item-sublist td {
+ border-collapse: collapse;
+ border: 1px solid gray;
padding: 2px;
color: #000;
@@ -150,8 +132,7 @@
min-width: 20px;
}
-tr.center td
-{
+tr.center td {
text-align: center;
}
@@ -175,8 +156,3 @@
table.alt-row-colors > tbody > tr:nth-of-type(even) {
background-color: #eeeeee;
}
-
-.highlighted {
- background-color: #cccccc;
- cursor: pointer;
-}
diff --git a/tools/nfd-status-http-server-files/text.css b/tools/nfd-status-http-server-files/text.css
index b115a70..3a7e062 100644
--- a/tools/nfd-status-http-server-files/text.css
+++ b/tools/nfd-status-http-server-files/text.css
@@ -1,15 +1,10 @@
-/*
- 960 Grid System ~ Text CSS.
- Learn more ~ http://960.gs/
-
- Licensed under GPL and MIT.
-*/
-
-/* `Basic HTML
-----------------------------------------------------------------------------------------------------*/
-
body {
- font: 13px Arial, Helvetica, sans-serif;
+ font: 13px / 1.5 "Helvetica Neue", Arial, "Liberation Sans", FreeSans, sans-serif;
+}
+
+pre,
+code {
+ font-family: "DejaVu Sans Mono", Monaco, Consolas, monospace;
}
hr {
@@ -19,33 +14,18 @@
height: 0;
}
-/* `Headings
-----------------------------------------------------------------------------------------------------*/
-
h1 {
- font-size: 2.4em;
+ font-size: 25px;
}
h2 {
- font-size: 1.8em;
+ font-size: 23px;
}
h3 {
- font-size: 1.4em;
+ font-size: 21px;
}
-/* h1 { */
-/* font-size: 25px; */
-/* } */
-
-/* h2 { */
-/* font-size: 23px; */
-/* } */
-
-/* h3 { */
-/* font-size: 21px; */
-/* } */
-
h4 {
font-size: 19px;
}
@@ -58,20 +38,17 @@
font-size: 15px;
}
-/* `Spacing
-----------------------------------------------------------------------------------------------------*/
+ol {
+ list-style: decimal;
+}
-/* ol { */
-/* list-style: decimal; */
-/* } */
+ul {
+ list-style: disc;
+}
-/* ul { */
-/* list-style: disc; */
-/* } */
-
-/* li { */
-/* margin-left: 30px; */
-/* } */
+li {
+ margin-left: 30px;
+}
p,
dl,
@@ -89,18 +66,5 @@
address,
fieldset,
figure {
- margin-bottom: 10px;
+ margin-bottom: 20px;
}
-
-pre {
- /* padding: 0px 24px; */
- white-space: pre-wrap;
- background-color: #F9F9F9;
- border: 1px dashed #2F6FAB;
- color: black;
- padding: 1em;
- font-size: 13px;
-}
-code {
- font-family: Consolas, Monaco, Andale Mono, monospace;
-}
\ No newline at end of file