From 82e266a83b8124df327001906d2848f625effbc6 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 31 Oct 2014 13:46:01 +0100 Subject: New Qt logo This patch replaces the old Qt logo with the new, flatter one. The PNGs were optimized via: optipng -o7 -strip "all" Task-number: QTBUG-41685 Change-Id: I51983a45144373bf7aee31a32990ecbb2582f488 Reviewed-by: Robert Loehning Reviewed-by: Friedemann Kleint Reviewed-by: Kai Koehne Reviewed-by: Lars Knoll --- doc/global/template/images/Qt-logo.png | Bin 4344 -> 2425 bytes doc/global/template/images/logo.png | Bin 2205 -> 2370 bytes doc/global/template/images/sprites-combined.png | Bin 62534 -> 53964 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'doc/global/template') diff --git a/doc/global/template/images/Qt-logo.png b/doc/global/template/images/Qt-logo.png index 64c1c4aaa3..01256ab08d 100644 Binary files a/doc/global/template/images/Qt-logo.png and b/doc/global/template/images/Qt-logo.png differ diff --git a/doc/global/template/images/logo.png b/doc/global/template/images/logo.png index 1e7ed4cf21..698dde9215 100644 Binary files a/doc/global/template/images/logo.png and b/doc/global/template/images/logo.png differ diff --git a/doc/global/template/images/sprites-combined.png b/doc/global/template/images/sprites-combined.png index 3a48b21f6b..c4f01c4bb9 100644 Binary files a/doc/global/template/images/sprites-combined.png and b/doc/global/template/images/sprites-combined.png differ -- cgit v1.2.3 From 7eb7dd555cc50112ae242a32976f075f070625d7 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 5 Nov 2014 07:31:01 +0100 Subject: Documentation CSS: remove body text color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Help text should use the QPalette color. Task-number: QTBUG-42399 Change-Id: Ibc8658b4a7affc2481d895c13cfa673b50a872e0 Reviewed-by: Topi Reiniö --- doc/global/template/style/offline.css | 1 - 1 file changed, 1 deletion(-) (limited to 'doc/global/template') diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 5957e3840d..126df9d806 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -2,7 +2,6 @@ body { font: normal 400 14px/1.2 Arial; margin-top: 85px; font-family: Arial, Helvetica; - color: #313131; text-align: left; margin-left: 5px; margin-right: 5px; -- cgit v1.2.3 From 1ad78f5f29ef00abae4f718265fa4bc0c35b60f9 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 21 Oct 2014 10:22:45 +0200 Subject: qdoc: Prepare QDoc for the new style on qt.io The new template and CSS have some requirements that need changes in the generated .html: - Generate a new div 'sidebar' and place the TOC (if one exists) inside it, allowing the template to extend the sidebar contents dynamically. Do this for all pages except index.html. - Change the DOCTYPE declaration to be html5-compliant - Replace tags with to be html5-compliant - Add a new config variable HTML.prologue - this allows the template to insert custom html into beginning of the page, before the page title but after any navigation or table-of-contents items. - Wrap tables inside
elements. This allows for better-working CSS design for small-screen devices. - Write out extra parameters first when outputting function synopsis to have better styling. - Inject zero-width-space characters into function names to allow the browser break up long function signatures in a nice manner. - Edit the CSS for the offline style to adapt to above changes. Task-number: QTBUG-42086 Change-Id: I3075cdc11bcb07a66150388519263fd721c8002b Reviewed-by: Martin Smith --- doc/global/template/style/offline.css | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'doc/global/template') diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 126df9d806..dc0a6d1ec9 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -359,7 +359,9 @@ h3.fn, span.fn { margin: 0px; margin-top: 45px; } - +h3.fn code { + float: right; +} h3.fn:target { background-color: #F6F6D6; } @@ -705,8 +707,21 @@ Landing page float: left; } -.icons1of3 h2 { +.icons1of3 h2, .doc-column h2 { font-size: 15px; margin: 0px; padding: 0px; } + +div.multi-column { + position: relative; +} + +div.multi-column div { + display: -moz-inline-box; + display: inline-block; + vertical-align: top; + margin-top: 1em; + margin-right: 4em; + width: 24em; +} -- cgit v1.2.3