Skip to content

Commit 77bcfb2

Browse files
michaelrsweetmichaelrsweet
committed
Fix some web interface issues:
- Transition web interface/stylesheet to use "cups-header", "cups-body", and "cups-footer" classes. - Tweak background colors for documentation sidebar, block quotes, and code.
1 parent 818d014 commit 77bcfb2

25 files changed

Lines changed: 87 additions & 76 deletions

‎doc/cups.css‎

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Layout CSS */
2-
.header {
2+
.cups-header {
33
background: rgba(46,46,46,.9);
44
box-shadow: 0 2px 5px rgba(0,0,0,0.25);
55
color: white;
@@ -11,7 +11,7 @@
1111
top: 0;
1212
width: 100%;
1313
}
14-
.header ul {
14+
.cups-header ul {
1515
list-style: none;
1616
margin: 0;
1717
-webkit-margin-before: 0;
@@ -20,37 +20,37 @@
2020
-webkit-margin-end: 5px;
2121
-webkit-padding-start: 0;
2222
}
23-
.header ul li {
23+
.cups-header ul li {
2424
float: left;
2525
}
26-
.header a {
26+
.cups-header a {
2727
display: block;
2828
padding: 5px 10px !important;
2929
}
30-
.header a:link, .header a:visited {
30+
.cups-header a:link, .cups-header a:visited {
3131
color: white !important;
3232
text-decoration: none !important;
3333
}
34-
.header a:hover {
34+
.cups-header a:hover {
3535
background: #cccccc !important;
3636
color: #333333 !important;
3737
text-decoration: none !important;
3838
}
39-
.header a.active {
39+
.cups-header a.active {
4040
background: white !important;
4141
box-shadow: rgba(0,0,0,0.1) 0 0 10px 0 inset;
4242
color: black !important;
4343
text-decoration: none !important;
4444
}
4545

46-
.body {
46+
.cups-body {
4747
padding: 40px 20px;
4848
}
49-
.row .body {
49+
.row .cups-body {
5050
padding: 0;
5151
}
5252

53-
.footer {
53+
.cups-footer {
5454
background: rgba(46,46,46,.9);
5555
bottom: 0;
5656
box-shadow: 0 -2px 5px rgba(0,0,0,0.25);
@@ -62,7 +62,7 @@
6262
position: fixed;
6363
width: 100%;
6464
}
65-
.footer a:link, footer a:hover, .footer a:visited {
65+
.cups-footer a:link, footer a:hover, .cups-footer a:visited {
6666
color: white !important;
6767
text-decoration: none !important;
6868
}
@@ -131,6 +131,7 @@ pre {
131131
}
132132

133133
blockquote {
134+
background: rgba(191,191,191,0.1);
134135
border-left: solid 2px #777;
135136
margin: 1em 0;
136137
padding: 10px;
@@ -207,7 +208,7 @@ table.page {
207208
width: 100%;
208209
}
209210

210-
td.body {
211+
td.cups-body {
211212
height: 100%;
212213
vertical-align: top;
213214
}
@@ -365,7 +366,7 @@ h1.title {
365366
display: none;
366367
}
367368

368-
h2.title, h3.title, .row .body h2, .row .body h3 {
369+
h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
369370
border-bottom: solid 2pt black;
370371
}
371372

@@ -451,8 +452,8 @@ div.sidebar p.l2 {
451452
}
452453

453454
table.inset {
454-
background: rgba(191,191,191,0.15);
455-
border: thin solid rgba(191,191,191,0.3);
455+
background: #f4f4f4;
456+
border: thin solid rgba(191,191,191,0.5);
456457
margin-top: 1em;
457458
padding: 0;
458459
width: 100%;
@@ -471,7 +472,7 @@ table.inset caption {
471472
}
472473

473474
table.inset td {
474-
padding: 2px;
475+
padding: 2px 5px;
475476
}
476477

477478
dt {
@@ -525,15 +526,15 @@ div.tab {
525526
}
526527

527528
/* API documentation styles... */
528-
div.body h1 {
529+
div.cups-body h1 {
529530
}
530-
div.body h2 {
531+
div.cups-body h2 {
531532
}
532-
div.body h3 {
533+
div.cups-body h3 {
533534
}
534-
div.body h4 {
535+
div.cups-body h4 {
535536
}
536-
div.body h5 {
537+
div.cups-body h5 {
537538
}
538539
div.contents {
539540
}
@@ -589,9 +590,14 @@ h1, h2, h3, h4, h5, h6 {
589590
blockquote {
590591
page-break-inside: avoid;
591592
}
592-
p code, li code, p.code, pre, ul.code li {
593-
background: rgba(127,127,127,0.1);
593+
p.code, pre, ul.code li {
594594
border-left: thin dotted gray;
595+
background: rgba(191,191,191,0.1);
596+
}
597+
p code, li code {
598+
background: rgba(191,191,191,0.3);
599+
}
600+
p code, li code, p.code, pre, ul.code li {
595601
font-family: monospace;
596602
hyphens: manual;
597603
margin: 18pt 0;
@@ -644,19 +650,19 @@ ul.contents li ul.code, ul.contents li ul.subcontents {
644650
display: none;
645651
}
646652

647-
.header {
653+
.cups-header {
648654
margin: 0;
649655
position: relative;
650656
}
651-
.header ul li {
657+
.cups-header ul li {
652658
float: none;
653659
}
654660

655-
.body {
661+
.cups-body {
656662
padding: 0;
657663
}
658664

659-
.footer {
665+
.cups-footer {
660666
font-size: 10px;
661667
height: auto;
662668
position: relative;
@@ -715,6 +721,12 @@ ul.contents li ul.code, ul.contents li ul.subcontents {
715721
hr {
716722
color: #666;
717723
}
724+
table.inset {
725+
background: #1d1d1d;
726+
}
727+
h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
728+
border-bottom: solid 2pt #ccc;
729+
}
718730
div.table table td, table.list th {
719731
background: black;
720732
}

‎doc/da/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Hjem - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">Hjem</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Printere</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> til Linux® og andre UNIX<sup>&reg;</sup>-lignende styresystemer. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Ophavsret &copy; 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
50+
<div class="cups-footer">Ophavsret &copy; 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
5151
</body>
5252
</html>

‎doc/de/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Startseite - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">Startseite</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Drucker</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> zur Unterstützung lokaler und Netzwerkdrucker.</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Copyright &copy; 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
50+
<div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
5151
</body>
5252
</html>

‎doc/es/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Inicio - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">Inicio</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Impresoras</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS es el sistema de impresi&oacute;n de c&oacute;digo abierto basado en est&aacute;ndares desarrollado por <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para macOS<sup>&reg;</sup> y otros sistemas operativos tipo UNIX<sup>&reg;</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Derechos de autor &copy; 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
50+
<div class="cups-footer">Derechos de autor &copy; 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
5151
</body>
5252
</html>

‎doc/fr/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Home - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">Home</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Imprimantes</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<p>Le système d'impression open source basé sur des normes, développé par <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> pour prendre en charge l'impression vers des imprimantes locales et de réseau.</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
50+
<div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
5151
</body>
5252
</html>

‎doc/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Home - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">Home</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Printers</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<p>The standards-based, open source printing system developed by <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
50+
<div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
5151
</body>
5252
</html>

‎doc/ja/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>ホーム - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">ホーム</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">プリンター</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS は、macOS<sup>&reg;</sup> およびその他の UNIX <SUP>&reg;</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
50+
<div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
5151
</body>
5252
</html>

‎doc/pt_BR/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>In&iacute;cio - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">In&iacute;cio</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Impressoras</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS &eacute; o sistema de impress&atilde;o baseado em padr&otilde;es e de c&oacute;digo aberto desenvolvido pela <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para Linux® e outros sistemas operacionais similares ao UNIX<sup>&reg;</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer">Copyright &copy; 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
50+
<div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
5151
</body>
5252
</html>

‎doc/ru/index.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Home - CUPS @CUPS_VERSION@</title>
1111
</head>
1212
<body>
13-
<div class="header">
13+
<div class="cups-header">
1414
<ul>
1515
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
1616
<li><a class="active" href="/">Начало</a></li>
@@ -21,7 +21,7 @@
2121
<li><a href="/printers/">Принтеры</a></li>
2222
</ul>
2323
</div>
24-
<div class="body">
24+
<div class="cups-body">
2525
<div class="row">
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> для операционной системы Linux® и других UNIX<SUP>&reg;</SUP>-подобных операционных систем. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</P>
@@ -47,6 +47,6 @@
4747
</div>
4848
</div>
4949
</div>
50-
<div class="footer"> Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.</div>
50+
<div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All Rights Reserved.</div>
5151
</body>
5252
</html>

0 commit comments

Comments
 (0)