summaryrefslogtreecommitdiffstats
path: root/doc/global/template
Commit message (Collapse)AuthorAgeFilesLines
...
| * Doc: new template for qt.io online styleTopi Reinio2014-12-0310-969/+1962
| | | | | | | | | | | | | | | | | | | | | | | | An online documentation template that follows the style of qt.io site. Update the url variable for Qt modules to point to doc.qt.io/qt-5/. Task-number: QTBUG-42086 Change-Id: I5428a02cd503aef2217efd7361f4c8b7b5895a52 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-244-3/+17
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
| * qdoc: Prepare QDoc for the new style on qt.ioTopi Reinio2014-11-111-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <tt> tags with <code> 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 <div> 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 <martin.smith@digia.com>
| * Documentation CSS: remove body text colorShawn Rutledge2014-11-051-1/+0
| | | | | | | | | | | | | | | | Help text should use the QPalette color. Task-number: QTBUG-42399 Change-Id: Ibc8658b4a7affc2481d895c13cfa673b50a872e0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * New Qt logoAlessandro Portale2014-11-053-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <robert.loehning@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | qdoc: Generate cross-module links-to-links pagesMartin Smith2014-11-112-0/+10
|/ | | | | | | | | | | | | | | The cross-module link report is modified so that each module listed in the table is a link to a subpage on which all the links from the current module to that module are listed. To check that these links go to the correct place, click on one to be taken to the actual link. The actual link is marked with red asterisks. Click on that link to check that the link goes to the correct page. Repeat this process for all the links in the table. Change-Id: Ifddf7108ed7ef090c4063909fdbd10dac1f2566b Task-number: QTBUG-41850 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* qdoc: Highlight selected section / entry in the documentationTopi Reinio2014-09-052-0/+32
| | | | | | | | | | | | | | | | This commit adds id tags with the anchor reference as the value to html entities for documentation section titles and function signatures, properties etc. for both C++ and QML documentation pages. Together with new CSS rules, we can dynamically highlight the title that the user clicked on. This helps to locate the item of interest on a crowded page or when the page cannot be scrolled down enough to place the selected item on top. Change-Id: I7d1db2ed4e12779e1a9e571996ee65c3befa4e7a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Add CSS rules for subtitlesTopi Reinio2014-08-261-0/+4
| | | | | | | | | | | | | | | In the offline template, the floating elements in the navigation bar interfere with the layout of any elements displayed next to it. In particular, subtitles used for example files and nested class documentation have wrong horizontal position. This change adds CSS for the subtitles to be displayed as block elements, and disallows floating elements on the left side - TOC is still allowed to float on the right side. Task-number: QTBUG-40924 Change-Id: I89be3844985e6cf95263db575768034d9270d140 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Fix template code for unordered listsTopi Reinio2014-04-092-2/+2
| | | | | | | | | | The CSS for unordered lists placed a nested list vertically too close to its parent list item. This commit fixes the issue. Task-number: QTBUG-38217 Change-Id: Ia5003f2aab197f455ed5bbea2e1ee2e6475aaffe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated CSS used by the offline documentation.Jerome Pasion2014-02-201-85/+51
| | | | | | | | | | | | -new layout for landing page -updates to title sizes and changes to footer -fixes to general paragraph issues -index.qdoc changed in qtdoc repository Task-number: QTBUG-36411 Change-Id: Icb4fb0374e474137686f4cb67c64dc0249fef2c4 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fixed footer style and information for offline builds.Jerome Pasion2013-11-011-27/+23
| | | | | | | | | | | | -footer is left aligned and smaller text. -footer contains fewer <div> which were not used. -CSS rules for footer changed to accommodate new specifications. -information not relevant in offline builds taken out. Task-number: QTBUG-33802 Change-Id: Icc57bad9ead8ce812d5df8e72a7bac8c22831b5f Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Doc: Changed CSS text-align from "justify" to "left".Jerome Pasion2013-08-282-3/+3
| | | | | | | | | | | | | | | -Documentation looks weird when viewed in a narrow window because much of the text are long. -Qt Project's CSS uses "left". -This change affects any documentation which uses the global templates. Change-Id: I8605a191904cb727b4818d8a1abf127ce2e45eb9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Edited CSS files in doc/global/templateJerome Pasion2013-07-232-1159/+1342
| | | | | | | | -edited style convention for readability (as opposed to file size) -removed extra CSS rule which does nothing Change-Id: Ica9cbdf0c63bae87a8446afcbc22f74403e3247e Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fixed QDoc's navigation mechanism.Jerome Pasion2013-06-254-54/+109
| | | | | | | | | | | | | | | | | | | | | | | | The HTML pages need to display minimal navigation such as a link to the module landing page or Qt 5's index.html. -new variables available in qdocconf files: navigation.landingpage navigation.homepage navigation.cppclassespage navigation.qmltypespage buildversion The navigation variables are for the new navigation bar. The buildversion variable is to insert documentation build information into the pages. Note about compatibility with Qt Creator docs: The HTML template files for Qt Creator is retained to keep Qt Creator compatible with 5.0.x and 5.1.x. Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Applying new qt-project.org style to "online" style.Jerome Pasion2013-06-257-104/+220
| | | | | | | | -added images -modified template and CSS file Change-Id: I0d50f940271d6af80ade38f50d4efa2028441dba Reviewed-by: Martin Smith <martin.smith@digia.com>
* make images non-executableOswald Buddenhagen2013-06-1718-0/+0
| | | | | Change-Id: I7d6c28e7fd18125c95e56eca2d0d6d67003f9c5d Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Various changes to global CSS files.Jerome Pasion2013-02-282-38/+45
| | | | | | | | | -added style for JavaScript code blocks -code blocks is scrollable when viewed in a narrow window -improved alignment of table of contents Change-Id: I45acdb4c7aa0ae57fe030e7e68a230c1a7d41b8f Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Added margin to the QML API description.Jerome Pasion2013-02-152-4/+7
| | | | | | | -added a margin to "qmldoc" div class. Change-Id: I7297aff4de5d41a7e4de14a09c0a70acb8006bb9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc CSS: Edited CSS line-height of paragraphs and landing page.Jerome Pasion2012-12-112-2/+8
| | | | | | | | -value copied from qt-project.org -more room between lines of text and the list at the landing page. Change-Id: Iee995325ded0c803feca44d112c5e73a024917bb Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Restored CSS images for the offline HTML and QCH buildJerome Pasion2012-12-106-67/+11
| | | | | | | | | | | | | Revert "Doc: Removing entry in CSS for adding icons to HTTP links" This reverts commit ceb2799163c7e80148ef0bffafac9b05269514d7. Also: -edited image to use Qt Project brand colors -removed breadcrumbs from CSS Change-Id: I3c2e655f8eac463677b20b68bc2ffa0efd2fd468 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: Updated CSS style for QML code snippetsJerome Pasion2012-12-052-2/+2
| | | | | | | -padding should be the same as C++ code snippet. Change-Id: Idba44d252f411f70b6957161b83626811c1c69f2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Adding empty tags in the HTMLJerome Pasion2012-11-302-11/+0
| | | | | Change-Id: I7251b77b645a2085d25443826aa2b9550a373d88 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Removing entry in CSS for adding icons to HTTP linksJerome Pasion2012-11-301-10/+0
| | | | | | | | | | This is a temporary solution to QDoc bug https://bugreports.qt-project.org/browse/QTBUG-28307 The links will not have the icon. Change-Id: Ib81bcc9c55cd5f403c85fdd38c0ee71219091e76 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Doc: Modified CSS according to a graphic designer's recommendations.Jerome Pasion2012-11-302-0/+66
| | | | | | | -Landing page in qtdoc uses the CSS classes. Change-Id: I05efae40d4d6d1802585c129a0a12b2af7eee5e7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Various modifications to the online and offline stylesheets.Jerome Pasion2012-11-212-66/+40
| | | | | | | | -used Qt Project colors -changed margins and paddings Change-Id: If7a533ac3a32debbaca7b403aa68290c2b9aab2c Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Adding subtitle to the online snapshot HTMLJerome Pasion2012-11-191-6/+89
| | | | | | | -other fixes to the HTML template. Change-Id: I85070c615796c4342a89cc730ab2ca8ab51dd5e6 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Adding online stylesJerome Pasion2012-11-1931-0/+666
| | | | | | | | | -Has the Qt logo -For generating the archives and online snapshot Change-Id: I88d1d6335c0ba600a62868a25fadaed8a751f2b4 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Fixing templatedir paths according to the fix to QTBUG-27878Jerome Pasion2012-11-091-0/+706
Change-Id: Ib95be5267514e4afadad4f6fbfd48514a7552227 Reviewed-by: Martin Smith <martin.smith@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 11:11:12 +0000