From: Michael R Sweet Date: Mon, 7 Mar 2022 17:14:29 +0000 (-0500) Subject: Fix some web interface issues: X-Git-Tag: v2.4.2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77bcfb2b16ec25f5439ed92d53b5a3d09e36539f;p=thirdparty%2Fcups.git 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. --- diff --git a/doc/cups.css b/doc/cups.css index 670c1a4c6b..379489a174 100644 --- a/doc/cups.css +++ b/doc/cups.css @@ -1,5 +1,5 @@ /* Layout CSS */ -.header { +.cups-header { background: rgba(46,46,46,.9); box-shadow: 0 2px 5px rgba(0,0,0,0.25); color: white; @@ -11,7 +11,7 @@ top: 0; width: 100%; } -.header ul { +.cups-header ul { list-style: none; margin: 0; -webkit-margin-before: 0; @@ -20,37 +20,37 @@ -webkit-margin-end: 5px; -webkit-padding-start: 0; } -.header ul li { +.cups-header ul li { float: left; } -.header a { +.cups-header a { display: block; padding: 5px 10px !important; } -.header a:link, .header a:visited { +.cups-header a:link, .cups-header a:visited { color: white !important; text-decoration: none !important; } -.header a:hover { +.cups-header a:hover { background: #cccccc !important; color: #333333 !important; text-decoration: none !important; } -.header a.active { +.cups-header a.active { background: white !important; box-shadow: rgba(0,0,0,0.1) 0 0 10px 0 inset; color: black !important; text-decoration: none !important; } -.body { +.cups-body { padding: 40px 20px; } -.row .body { +.row .cups-body { padding: 0; } -.footer { +.cups-footer { background: rgba(46,46,46,.9); bottom: 0; box-shadow: 0 -2px 5px rgba(0,0,0,0.25); @@ -62,7 +62,7 @@ position: fixed; width: 100%; } -.footer a:link, footer a:hover, .footer a:visited { +.cups-footer a:link, footer a:hover, .cups-footer a:visited { color: white !important; text-decoration: none !important; } @@ -131,6 +131,7 @@ pre { } blockquote { + background: rgba(191,191,191,0.1); border-left: solid 2px #777; margin: 1em 0; padding: 10px; @@ -207,7 +208,7 @@ table.page { width: 100%; } -td.body { +td.cups-body { height: 100%; vertical-align: top; } @@ -365,7 +366,7 @@ h1.title { display: none; } -h2.title, h3.title, .row .body h2, .row .body h3 { +h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 { border-bottom: solid 2pt black; } @@ -451,8 +452,8 @@ div.sidebar p.l2 { } table.inset { - background: rgba(191,191,191,0.15); - border: thin solid rgba(191,191,191,0.3); + background: #f4f4f4; + border: thin solid rgba(191,191,191,0.5); margin-top: 1em; padding: 0; width: 100%; @@ -471,7 +472,7 @@ table.inset caption { } table.inset td { - padding: 2px; + padding: 2px 5px; } dt { @@ -525,15 +526,15 @@ div.tab { } /* API documentation styles... */ -div.body h1 { +div.cups-body h1 { } -div.body h2 { +div.cups-body h2 { } -div.body h3 { +div.cups-body h3 { } -div.body h4 { +div.cups-body h4 { } -div.body h5 { +div.cups-body h5 { } div.contents { } @@ -589,9 +590,14 @@ h1, h2, h3, h4, h5, h6 { blockquote { page-break-inside: avoid; } -p code, li code, p.code, pre, ul.code li { - background: rgba(127,127,127,0.1); +p.code, pre, ul.code li { border-left: thin dotted gray; + background: rgba(191,191,191,0.1); +} +p code, li code { + background: rgba(191,191,191,0.3); +} +p code, li code, p.code, pre, ul.code li { font-family: monospace; hyphens: manual; margin: 18pt 0; @@ -644,19 +650,19 @@ ul.contents li ul.code, ul.contents li ul.subcontents { display: none; } - .header { + .cups-header { margin: 0; position: relative; } - .header ul li { + .cups-header ul li { float: none; } - .body { + .cups-body { padding: 0; } - .footer { + .cups-footer { font-size: 10px; height: auto; position: relative; @@ -715,6 +721,12 @@ ul.contents li ul.code, ul.contents li ul.subcontents { hr { color: #666; } + table.inset { + background: #1d1d1d; + } + h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 { + border-bottom: solid 2pt #ccc; + } div.table table td, table.list th { background: black; } diff --git a/doc/da/index.html.in b/doc/da/index.html.in index e7db89abcb..284cd451e4 100644 --- a/doc/da/index.html.in +++ b/doc/da/index.html.in @@ -10,7 +10,7 @@ Hjem - CUPS @CUPS_VERSION@ -
+
-
+

CUPS @CUPS_VERSION@

CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af OpenPrinting til Linux® og andre UNIX®-lignende styresystemer. CUPS uses IPP Everywhere™ to support printing to local and network printers

@@ -47,6 +47,6 @@
-
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
+
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
diff --git a/doc/de/index.html.in b/doc/de/index.html.in index eb52203d7e..642079e6a9 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -10,7 +10,7 @@ Startseite - CUPS @CUPS_VERSION@ -
+
-
+

OpenPrinting CUPS @CUPS_VERSION@

CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch OpenPrinting für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt IPP Everywhere™ zur Unterstützung lokaler und Netzwerkdrucker.

@@ -47,6 +47,6 @@
-
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
+
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 78e8215472..15675a91a5 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -10,7 +10,7 @@ Inicio - CUPS @CUPS_VERSION@ -
+
-
+

CUPS @CUPS_VERSION@

CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por OpenPrinting para macOS® y otros sistemas operativos tipo UNIX®. CUPS uses IPP Everywhere™ to support printing to local and network printers.

@@ -47,6 +47,6 @@
-
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
+
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in index 0d7cdcc9cf..3081dd818b 100644 --- a/doc/fr/index.html.in +++ b/doc/fr/index.html.in @@ -10,7 +10,7 @@ Home - CUPS @CUPS_VERSION@ -
+
-
+

OpenPrinting CUPS @CUPS_VERSION@

Le système d'impression open source basé sur des normes, développé par OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ pour prendre en charge l'impression vers des imprimantes locales et de réseau.

@@ -47,6 +47,6 @@
-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+
Copyright © 2021-2022 OpenPrinting. All rights reserved.
diff --git a/doc/index.html.in b/doc/index.html.in index 6e2b9ef547..d3dabd35aa 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -10,7 +10,7 @@ Home - CUPS @CUPS_VERSION@ -
+
-
+

OpenPrinting CUPS @CUPS_VERSION@

The standards-based, open source printing system developed by OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ to support printing to local and network printers.

@@ -47,6 +47,6 @@
-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+
Copyright © 2021-2022 OpenPrinting. All rights reserved.
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index e88b1b3b28..36e98bf5b4 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -10,7 +10,7 @@ ホーム - CUPS @CUPS_VERSION@ -
+
-
+

CUPS @CUPS_VERSION@

CUPS は、macOS® およびその他の UNIX ® ç³» OS のために、Apple Inc. によって開発された標準ベースのオープンソース印刷システムです。

@@ -47,6 +47,6 @@
-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+
Copyright © 2021-2022 OpenPrinting. All rights reserved.
diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index 02a7c5dfaf..91553f58d0 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -10,7 +10,7 @@ Início - CUPS @CUPS_VERSION@ -
+
-
+

CUPS @CUPS_VERSION@

CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela OpenPrinting para Linux® e outros sistemas operacionais similares ao UNIX®. CUPS uses IPP Everywhere™ to support printing to local and network printers.

@@ -47,6 +47,6 @@
-
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
+
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index c4767938a1..ca77abff19 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -10,7 +10,7 @@ Home - CUPS @CUPS_VERSION@ -
+
-
+

OpenPrinting CUPS @CUPS_VERSION@

CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией OpenPrinting для операционной системы Linux® и других UNIX®-подобных операционных систем. CUPS uses IPP Everywhere™ to support printing to local and network printers

@@ -47,6 +47,6 @@
-
Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.
+
Copyright © 2021-2022 OpenPrinting. All Rights Reserved.
diff --git a/templates/da/header.tmpl.in b/templates/da/header.tmpl.in index 6af89c25a8..44110e5a43 100644 --- a/templates/da/header.tmpl.in +++ b/templates/da/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/da/trailer.tmpl b/templates/da/trailer.tmpl index aede375c2d..4f509ec783 100644 --- a/templates/da/trailer.tmpl +++ b/templates/da/trailer.tmpl @@ -1,5 +1,5 @@
-
CUPS og CUPS-logoet er varemærker som tilhører Apple Inc. Ophavsret © 2007-2019 Apple Inc. Alle rettigheder forbeholdt.
+
Copyright © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
diff --git a/templates/de/header.tmpl.in b/templates/de/header.tmpl.in index 1a42e4fe70..508ae3d8a8 100644 --- a/templates/de/header.tmpl.in +++ b/templates/de/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl index c1f5d38d81..264136f990 100644 --- a/templates/de/trailer.tmpl +++ b/templates/de/trailer.tmpl @@ -1,5 +1,5 @@
-
CUPS und das CUPS-Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2019 Apple Inc. Alle Rechte vorbehalten.
+
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl.in index 01a78743b5..4ddc39a094 100644 --- a/templates/es/header.tmpl.in +++ b/templates/es/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl index c1cb58ff54..b3686614c0 100644 --- a/templates/es/trailer.tmpl +++ b/templates/es/trailer.tmpl @@ -1,5 +1,5 @@
-
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2019 Apple Inc. Todos los derechos reservados.
+
Copyright © 2021-2022 OpenPrinting. Todos los derechos reservados.
diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl.in index e3aa316110..8bea68a373 100644 --- a/templates/fr/header.tmpl.in +++ b/templates/fr/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl index 6e9b8b1fea..cf9b95be62 100644 --- a/templates/fr/trailer.tmpl +++ b/templates/fr/trailer.tmpl @@ -1,5 +1,5 @@
-
CUPS et le logo CUPS sont des marques déposées de Apple Inc. CUPS est sous copyright 2007-2019 Apple Inc. Tous droits réservés.
+
Copyright © 2021-2022 OpenPrinting. Tous droits réservés.
diff --git a/templates/header.tmpl.in b/templates/header.tmpl.in index 764b99edaf..a3ab8f29e9 100644 --- a/templates/header.tmpl.in +++ b/templates/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/ja/header.tmpl.in b/templates/ja/header.tmpl.in index 10dbd578e7..87f5263b0a 100644 --- a/templates/ja/header.tmpl.in +++ b/templates/ja/header.tmpl.in @@ -19,7 +19,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl index a4f86b1a68..a65356b075 100644 --- a/templates/ja/trailer.tmpl +++ b/templates/ja/trailer.tmpl @@ -1,5 +1,5 @@
-
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2019 Apple Inc. All rights reserved.
+
Copyright © 2021-2022 OpenPrinting. All Rights Reserved.
diff --git a/templates/pt_BR/header.tmpl.in b/templates/pt_BR/header.tmpl.in index d6fdf8a093..df5f2c9c77 100644 --- a/templates/pt_BR/header.tmpl.in +++ b/templates/pt_BR/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/pt_BR/trailer.tmpl b/templates/pt_BR/trailer.tmpl index 673a555573..cfaad91931 100644 --- a/templates/pt_BR/trailer.tmpl +++ b/templates/pt_BR/trailer.tmpl @@ -1,5 +1,5 @@
-
CUPS e sua logo são marcas registradas da Apple Inc. Copyright © 2007-2019 Apple Inc. Todos os direitos reservados.
+
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl.in index 8d9d3abbb7..7cf4400907 100644 --- a/templates/ru/header.tmpl.in +++ b/templates/ru/header.tmpl.in @@ -27,7 +27,7 @@ {title} - CUPS @CUPS_VERSION@ -
+
-
+

{title}

diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl index 260d0e9c2c..a65356b075 100644 --- a/templates/ru/trailer.tmpl +++ b/templates/ru/trailer.tmpl @@ -1,6 +1,5 @@
-
CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками -Apple Inc. Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.
+
Copyright © 2021-2022 OpenPrinting. All Rights Reserved.
diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index 240c56b5c6..c00daeca9f 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -1,5 +1,5 @@
-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+
Copyright © 2021-2022 OpenPrinting. All rights reserved.