Skip to content

update W3C logo + review navigation #1936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/rules/headers/logo.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ export const { name } = self;
*/
export function check(sr, done) {
const logo = sr.jsDocument.querySelector(
"body div.head a[href] > img[src][height='48'][width='72'][alt='W3C']"
"body div.head a[href] > img[src][alt='W3C']"
);
if (
!logo ||
!/^(https:)?\/\/www\.w3\.org\/StyleSheets\/TR\/2021\/logos\/W3C?$/.test(
logo.getAttribute('src')
logo.src
) ||
!/^(https:)?\/\/www\.w3\.org\/?$/.test(
logo.parentElement.getAttribute('href')
)
!/^(https:)?\/\/www\.w3\.org\/?$/.test(logo.parentElement.href)
) {
sr.error(self, 'not-found');
}
Expand Down
18 changes: 0 additions & 18 deletions lib/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const BASE_URI = `${process.env.BASE_URI ? process.env.BASE_URI : ''}/`.replace(

const { version } = importJSON('../package.json', import.meta.url);
const nav = `<p class="pull-right">
<a href="${BASE_URI}about/">About</a> &middot;
<a href="${BASE_URI}sitemap/">Site map</a> &middot;
<a href="https://github.com/w3c/specberus">Github</a> &middot;
<a href="${BASE_URI}help/">Help</a>
Expand All @@ -34,20 +33,6 @@ const serveStraight = function (req, res) {
});
};

/**
* @TODO Document.
*/

const handleWIP = function (req, res) {
res.render('wip', {
DEBUG,
BASE_URI,
version,
nav,
title: 'coming soon',
});
};

/**
* @TODO Document.
*/
Expand Down Expand Up @@ -232,9 +217,6 @@ export const setUp = function (app) {
app.get('/sitemap', serveStraight);
app.get('/help', serveStraight);

// Pending sections:
app.get('/about', handleWIP);

// Catch-all:
app.get(/(.*)/, handleWrongPage);
};
28 changes: 19 additions & 9 deletions public/css/specberus.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
/* body {
padding-top: 70px;
}
} */

.container-fluid {
max-width: 1170px;
Expand All @@ -12,8 +12,12 @@ img.filler {
box-shadow: 0 2px 12px #404040;
}

.navbar {
min-height: 150px;
}

.navbar img {
height: 40px;
height: 120px;
}

.navbar .contribute a {
Expand All @@ -39,6 +43,11 @@ img.filler {
0 -2px 16px #ffffff;
}

.navbar-brand {
font-size: 1.5em;
font-weight: bold;
}

#infoLink {
display: none;
opacity: 1;
Expand All @@ -54,11 +63,11 @@ img.filler {
background-color: #ff8080;
}

.navbar-inverse .navbar-brand,
/* .navbar-inverse .navbar-brand,
.navbar-inverse .navbar-brand a,
.contribute {
color: #fff;
}
} */

.contribute {
padding: 25px 0 0 0;
Expand All @@ -68,13 +77,14 @@ img.filler {
padding-bottom: 30px;
}

header.navbar-inverse {
/* header.navbar-inverse {
background: linear-gradient(
to bottom,
rgb(7, 62, 128) 0px,
rgb(0, 45, 80) 100%
#FDFDFD 0px,
#EBEBEB 100%
);
}
border: 0;
} */

ul.error,
ul.warning,
Expand Down
Binary file removed public/img/favicon.ico
Binary file not shown.
25 changes: 0 additions & 25 deletions public/img/logo-w3c.svg

This file was deleted.

10 changes: 0 additions & 10 deletions public/img/logo.svg

This file was deleted.

2 changes: 1 addition & 1 deletion test/doc-views/layout/spec.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="{{header.headClassName}}">
{{#if header.logo.show}}
<a class="logo" href="{{header.logo.href}}">
<img alt="W3C" src="{{header.logo.src}}" width="72" height="48">
<img alt="W3C" src="{{header.logo.src}}">
</a>
{{/if}}
{{#if header.title.show}}
Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-cr.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C" width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">High Resolution Time</h1>

<p id='w3c-state'>
Expand Down
3 changes: 1 addition & 2 deletions test/docs/2021-crd.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"
width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">High Resolution Time</h1>

<p id='w3c-state'>
Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-cry.html
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-cryd.html
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
3 changes: 1 addition & 2 deletions test/docs/2021-disc.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"
width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">Foo Time</h1>

<p id='w3c-state'>
Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-dnote.html
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-dry.html
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
3 changes: 1 addition & 2 deletions test/docs/2021-fpwd.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"
width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">Foo Time</h1>

<p id='w3c-state'>
Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-note.html
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
3 changes: 1 addition & 2 deletions test/docs/2021-pr.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"
width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">High Resolution Time</h1>

<p id='w3c-state'>
Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-rec.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<body class="h-entry">
<div class=head> <!--begin-logo-->
<p><a href="https://www.w3.org/"><img height="48" width="72" alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"/></a>
<p><a href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"/></a>
<!--end-logo-->

<h1 class="p-name" id="title">CSS Color Module Level 3</h1>
Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-ry.html
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
2 changes: 1 addition & 1 deletion test/docs/2021-stmt.html
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
</head>
<body class="h-entry informative">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" width="72" height="48"
<a class="logo" href="https://www.w3.org/"><img alt="W3C"
src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title">Ready-made Counter Styles</h1>

Expand Down
3 changes: 1 addition & 2 deletions test/docs/2021-wd-shortname-change.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"
width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">Foo Time</h1>

<p id='w3c-state'>
Expand Down
3 changes: 1 addition & 2 deletions test/docs/2021-wd.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</head>
<body class="h-entry" data-cite="WebIDL html dom webidl ecma-262">
<div class="head">
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"
width="72" height="48"></a>
<a class="logo" href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"></a>
<h1 id="title" class="title p-name">Foo Time</h1>

<p id='w3c-state'>
Expand Down
2 changes: 1 addition & 1 deletion test/docs/metadata/ttml-imsc1.html
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@



<a href="https://www.w3.org/"><img height="48" width="72" alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"/></a>
<a href="https://www.w3.org/"><img alt="W3C" src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C"/></a>


</p>
Expand Down
9 changes: 0 additions & 9 deletions views/help.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@
<p><a href="{{BASE_URI}}">&uarr; up to Pubrules home</a></p>
<h2>Help</h2>

<h3 id="intro"><a href="#intro">Introduction to Pubrules</a></h3>
<p>[@TODO]</p>

<h3 id="tutorials"><a href="#tutorials">Tutorial &amp; <em>howto</em>'s</a></h3>
<p>[@TODO]</p>

<h3 id="faq"><a href="#faq"><abbr title="Frequently Asked Questions">FAQ</abbr></a></h3>
<p>[@TODO]</p>

<h3 id="reference"><a href="#reference">Reference (manual use and <abbr title="Application Programming Interface">API</abbr>)</a></h3>
<ul>
<li>See the <a href="https://github.com/w3c/specberus/blob/master/README.md">README</a></li>
Expand Down
8 changes: 3 additions & 5 deletions views/layouts/main.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,20 @@
<link rel="stylesheet" type="text/css" href="https://www.w3.org/scripts/bootstrap/3.3/css/bootstrap.min.css">
{{/if}}
<link rel="stylesheet" type="text/css" href="{{BASE_URI}}css/specberus.css">
<link rel="icon" type="image/x-icon" href="{{BASE_URI}}img/favicon.ico">
</head>

<body>

<header class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-light bg-light">
<div class="container-fluid">
<div class="row">
<div class="col-xs-12 navbar-brand">
<a href="https://www.w3.org/"><img class="logo" src="{{BASE_URI}}img/logo-w3c.svg" alt="W3C logo"></a>
<img src="{{BASE_URI}}img/logo.svg" alt="Logo for the Pubrules Checker">
<a href="https://www.w3.org/"><img class="logo" src="https://www.w3.org/assets/logos/w3c-2025/svg/w3c.svg" alt="W3C logo"></a>
<a href="{{BASE_URI}}"><abbr title="Technical Report Publication Policy">Pubrules</abbr></a> {{version}}{{#if title }} &mdash; {{title}}{{/if}}
</div>
</div>
</div>
</header>
</nav>

<div class="container-fluid">
{{{body}}}
Expand Down
10 changes: 0 additions & 10 deletions views/wip.handlebars

This file was deleted.