From a9bb1c63dc12034ebac1dd9402c9719dca7a92e1 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 3 Mar 2015 11:27:28 +0100 Subject: Adjust wiki links to the new redirect it looks nicer this way Change-Id: I872976bdef5f581187a758aa92b02e2f5f32b130 Reviewed-by: Oswald Buddenhagen --- doc/README | 2 +- doc/global/externalsites/qt-webpages.qdoc | 12 ++++++------ doc/global/html-footer-online.qdocconf | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/README b/doc/README index a00256d195..ed8410db71 100644 --- a/doc/README +++ b/doc/README @@ -106,4 +106,4 @@ More Information ================ For more information about Qt 5's documentation, refer to the Qt Project wiki: -http://wiki.qt.io/?title=Qt5DocumentationProject +http://wiki.qt.io/Qt5DocumentationProject diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index ec704cec62..e9fbe33bbf 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -58,7 +58,7 @@ */ /*! - \externalpage http://wiki.qt.io/?title=Qt_Coding_Style + \externalpage http://wiki.qt.io/Qt_Coding_Style \title Qt Coding Style */ /*! @@ -78,16 +78,16 @@ \title Pimp my video */ /*! - \externalpage http://wiki.qt.io/?title=QtMediaHub + \externalpage http://wiki.qt.io/QtMediaHub \title QtMediaHub */ /*! - \externalpage http://wiki.qt.io/?title=Qt_RaspberryPi + \externalpage http://wiki.qt.io/Qt_RaspberryPi \title QtonPi */ /*! - \externalpage http://wiki.qt.io/?title=jom + \externalpage http://wiki.qt.io/jom \title jom */ @@ -102,11 +102,11 @@ */ /*! - \externalpage http://wiki.qt.io/?title=Qt_Localization + \externalpage http://wiki.qt.io/Qt_Localization \title external: Translating Qt Into Other Languages */ /*! - \externalpage http://wiki.qt.io/?title=BlackBerry + \externalpage http://wiki.qt.io/BlackBerry \title Qt for BlackBerry */ diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index 6b3ea82968..0060fe69f6 100644 --- a/doc/global/html-footer-online.qdocconf +++ b/doc/global/html-footer-online.qdocconf @@ -38,7 +38,7 @@ HTML.footer += \ "
  • Tools
    • \n" \ "
  • Wiki
    • \n" \ "
  • Forums
    • \n" \ - "
  • Contribute to Qt
    • \n" \ + "
  • Contribute to Qt
    • \n" \ "\n" \ "\n" \ "
  • Services\n" \ -- cgit v1.2.3 From 2002103baac593e9193d9501dc0e1b1e9e28446a Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 6 Feb 2015 15:51:23 +0100 Subject: Doc: Update the online documentation template This change fixes a number of issues in the online template: - Missing vertical line after the login icon in the header - Update header, footer links and appearance - Adjust alternate background color of table cells to improve readability - Fix style of cookie notification in the html header - Add The Qt Company logo in the footer - Adjust list item marker image - Improve responsiveness of footer Change-Id: I77147b4b4161d6001c095a4b67e15552132100e6 Reviewed-by: Martin Smith Reviewed-by: Leena Miettinen --- doc/global/html-footer-online.qdocconf | 13 +++-- doc/global/html-header-online.qdocconf | 9 ++- doc/global/template/scripts/extras.js | 5 +- doc/global/template/style/cookiebar-x.png | Bin 0 -> 3680 bytes doc/global/template/style/list_arrow.png | Bin 1115 -> 236 bytes doc/global/template/style/online.css | 89 ++++++++++++++++++----------- doc/global/template/style/theqtcompany.png | Bin 0 -> 11748 bytes 7 files changed, 74 insertions(+), 42 deletions(-) create mode 100644 doc/global/template/style/cookiebar-x.png create mode 100644 doc/global/template/style/theqtcompany.png (limited to 'doc') diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index 0060fe69f6..9e30c635f8 100644 --- a/doc/global/html-footer-online.qdocconf +++ b/doc/global/html-footer-online.qdocconf @@ -27,7 +27,7 @@ HTML.footer += \ "
  • Qt Features
    • \n" \ "
  • Qt Quick
    • \n" \ "
  • Qt for Device Creation
    • \n" \ - "
  • Qt in Use
    • \n" \ + "
  • Qt for Mobile Apps
    • \n" \ "
  • Showroom
    • \n" \ "\n" \ "\n" \ @@ -48,6 +48,7 @@ HTML.footer += \ "
  • Proof of Concept
    • \n" \ "
  • Design & Implementation
    • \n" \ "
  • Productization
    • \n" \ + "
  • Qt Cloud Services
    • \n" \ "\n" \ "\n" \ "
  • Download\n" \ @@ -60,11 +61,10 @@ HTML.footer += \ "\n" \ "
    • \n" \ "\n" \ - "\n" \ + "\n" \ "
    \n" \ "
    \n" \ - "
    \n" \ + " \n" \ "
    \n" \ "
    \n" \ " \n" \ @@ -75,8 +75,9 @@ HTML.footer += \ "
    \n" \ "
    \n" \ " \n" \ "
    \n" \ "
    \n" \ diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf index b7fa9e1a65..fc297605f5 100644 --- a/doc/global/html-header-online.qdocconf +++ b/doc/global/html-header-online.qdocconf @@ -7,7 +7,9 @@ HTML.stylesheets = template/style/online.css \ template/style/icomoon.svg \ template/style/icomoon.ttf \ template/style/icomoon.woff \ - template/style/doc_search.png + template/style/cookiebar-x.png \ + template/style/doc_search.png \ + template/style/theqtcompany.png #for including files into the qch file. Relative to the outputdir of a QDoc build. qhp.extraFiles += style/online.css \ @@ -16,7 +18,10 @@ qhp.extraFiles += style/online.css \ style/icomoon.eot \ style/icomoon.svg \ style/icomoon.ttf \ - style/icomoon.woff + style/icomoon.woff \ + style/cookiebar-x.png \ + style/doc_search.png \ + style/theqtcompany.png HTML.headerstyles = \ " \n" \ diff --git a/doc/global/template/scripts/extras.js b/doc/global/template/scripts/extras.js index cb1102d493..409215f2d8 100644 --- a/doc/global/template/scripts/extras.js +++ b/doc/global/template/scripts/extras.js @@ -1,13 +1,14 @@ var vOffset = 65; $(function () { - $('a[href*=#]:not([href=#])').on('click', function () { + $('a[href*=#]:not([href=#])').on('click', function (e) { + if (e.which == 2) + return true; var target = $(this.hash); target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); if (target.length) { setTimeout(function () { $('html, body').animate({scrollTop: target.offset().top - vOffset}, 50);}, 50); - // return false; } }); }); diff --git a/doc/global/template/style/cookiebar-x.png b/doc/global/template/style/cookiebar-x.png new file mode 100644 index 0000000000..6aea1e62d1 Binary files /dev/null and b/doc/global/template/style/cookiebar-x.png differ diff --git a/doc/global/template/style/list_arrow.png b/doc/global/template/style/list_arrow.png index a6a6be665b..7bb07b32d0 100644 Binary files a/doc/global/template/style/list_arrow.png and b/doc/global/template/style/list_arrow.png differ diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index 97498f16d7..b4f5be18b6 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -153,7 +153,8 @@ } #mainmenu { float:left; - list-style:none + list-style:none; + margin-left:16px } #mainmenu li { float:left; @@ -212,6 +213,9 @@ min-width:85px; font-weight:100 } +#menuextras li:last-child a { + border-right:1px solid #eee; +} #menuextras li a:before { display:inline-block; font-family:'Qt Icons'; @@ -372,12 +376,37 @@ #menuextras li.navbar-search { padding:5px 0 } - .container { - padding:0 2% + #footerbar .container { + padding:0 } body .main { margin-top:0px } + #footerbar .footer-main .footer-nav { + padding:3.9% 0 3.9% 3%; + border-bottom:1px solid #413d3b; + float:none; + display:block; + width:auto + } + #footerbar .footer-main .theqtcompany { + clear:both; + float:left; + margin:30px 0 28px 3% + } + #footerbar .footer-main .footer-social { + float:left; + padding:30px 0px 0px 3% + } + #footerbar #menu-footer-submenu { + clear:both; + float:none; + display:block; + padding:0px 0px 3.9% 3% + } + ul#menu-footer-submenu { + margin-left: 0 + } } .in-page-nav { width:100%; @@ -449,8 +478,9 @@ body.qt-account #navbar .navbar-oneQt h2 { margin-bottom:40px } .cookies_yum { - background-color:#006325; + background-color:#d6d6d6; display:none; + line-height:1.625em; width:100% } .cookies_yum img { @@ -462,18 +492,18 @@ body.qt-account #navbar .navbar-oneQt h2 { } .cookies_yum div { margin:0 auto; - max-width:1180px; + max-width:1280px; min-height:30px; padding:6px 0px 6px 0px; position:relative } .cookies_yum p { - color:white; + color:#585a5c; margin:0px; font-size:0.79em; display:inline-block; line-height:1.2; - padding:0 30px 0 40px + padding:0 30px 0 50px } .cookies_yum p a { white-space:nowrap @@ -484,13 +514,14 @@ body.qt-account #navbar .navbar-oneQt h2 { .cookies_yum .close { width:15px; height:15px; - background-image:url("../images/cookiebar-x.png"); + background-image:url("cookiebar-x.png"); background-size:15px 30px; background-position:top left; cursor:pointer; - top:6px; - right:6px; - position:absolute + top:13px; + right:13px; + position:absolute; + transition:none; } .cookies_yum .close:hover { background-position:bottom left @@ -691,7 +722,7 @@ body.qt-account #navbar .navbar-oneQt h2 { left:0; width:100% } -#footerbar .footer-main .footer-nav { +#footerbar .footer-nav { display:inline; float:left } @@ -734,29 +765,20 @@ body.qt-account #navbar .navbar-oneQt h2 { #footerbar .footer-main .footer-nav .sub-menu li a:hover,#footerbar .footer-main .footer-nav .sub-menu li.current-menu-item a { color:#eee } -#footerbar .footer-main .footer-logo { +#footerbar .theqtcompany { + background:url("theqtcompany.png") no-repeat; + background-size:100%; + width:150px; + height:68px; display:inline; float:right; - padding:29px 0 28px 10px; - margin-left:30px; - width:56px + margin:29px 0 28px 30px } -#footerbar .footer-main .footer-logo:before { - content:attr(data-icon); - font-family:'Qt Icons'; - width:100%; - line-height:1.2; - display:inline-block; - font-size:1.875em; - color:#706e6d -} -#footerbar .footer-main .footer-logo:hover { - padding:31px 0 26px 10px -} -#footerbar .footer-main .footer-social { +#footerbar .footer-social { display:inline; float:right; - padding-top:31px + padding-top:31px; + width:164px } #footerbar .footer-main .footer-social>div { margin-left:0.1em; @@ -848,6 +870,9 @@ body.qt-account #navbar .navbar-oneQt h2 { .clearfix { *zoom:1 } +.clearfix .right { + float:right +} html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video { margin:0; padding:0; @@ -1169,7 +1194,7 @@ li a.active { position:absolute } .flowList.odd { - background-color:#eee + background-color:#f9f9f9 } .context ul>li,.doc-column ul>li { list-style-image:url("list_arrow.png"); @@ -1203,7 +1228,7 @@ li a.active { vertical-align:initial } table .odd { - background-color:#eee + background-color:#f9f9f9 } table thead { text-align:left; diff --git a/doc/global/template/style/theqtcompany.png b/doc/global/template/style/theqtcompany.png new file mode 100644 index 0000000000..b9799f387c Binary files /dev/null and b/doc/global/template/style/theqtcompany.png differ -- cgit v1.2.3 From f44db5e1390d81fb851752f2249cb17e4b90e914 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 11 Mar 2015 16:45:50 +0100 Subject: Doc: Remove link to old Nokia Wiki MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The link does not work anymore and it is not referenced anywhere in Qt Change-Id: I54dd7a40668c5a3963c8c1e95a9684385e5ac083 Reviewed-by: Topi Reiniö --- doc/global/externalsites/external-resources.qdoc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'doc') diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index a7aaedfe5b..958aac2bf0 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -448,11 +448,6 @@ \title publicsuffix.org */ -/*! - \externalpage http://wiki.forum.nokia.com/ - \title Forum Nokia Wiki -*/ - /*! \externalpage http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html \title AccessibleEventID.idl File Reference -- cgit v1.2.3 From 642daa76e5dceb6d97dd1aa20f6aef60f09bd1b3 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 11 Mar 2015 16:51:43 +0100 Subject: Doc: Update links to forum.qt.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I10c1fd388b44c45412fad544604e51fbd2807f96 Reviewed-by: Topi Reiniö --- doc/global/html-footer-online.qdocconf | 2 +- doc/global/html-header-online.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index 9e30c635f8..5c72819341 100644 --- a/doc/global/html-footer-online.qdocconf +++ b/doc/global/html-footer-online.qdocconf @@ -37,7 +37,7 @@ HTML.footer += \ "
  • Examples & Tutorials
    • \n" \ "
  • Tools
    • \n" \ "
  • Wiki
    • \n" \ - "
  • Forums
    • \n" \ + "
  • Forums
    • \n" \ "
  • Contribute to Qt
    • \n" \ "\n" \ "\n" \ diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf index fc297605f5..e6dcbe19fa 100644 --- a/doc/global/html-header-online.qdocconf +++ b/doc/global/html-header-online.qdocconf @@ -121,7 +121,7 @@ HTML.postheader = \ " \n" \ -- cgit v1.2.3