diff options
author | Topi Reinio <topi.reinio@digia.com> | 2013-04-29 14:01:12 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2013-04-29 16:18:38 +0300 |
commit | 62fdd5ee286d482b97ab6b3112a3ec76309e209e (patch) | |
tree | dae258f83563cbcfed29506aa88586e1a0cbb26b /src/doc | |
parent | 50ce908098eb617ae0f37176b97048d8c60f6bd4 (diff) |
Doc: Updated CSS style and license information
Adopted the same style and license texts as the emulator doc set.
Also a few minor fixes to doc content.
Change-Id: Iee8ab5c4405ba636d9891aad25c0c68b7ca9d716
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/doc')
-rw-r--r-- | src/doc/config/b2qt.qdocconf | 6 | ||||
-rw-r--r-- | src/doc/config/html-offline.qdocconf | 52 | ||||
-rw-r--r-- | src/doc/config/template/style/offline.css | 301 | ||||
-rw-r--r-- | src/doc/src/b2qt.qdoc | 14 |
4 files changed, 180 insertions, 193 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index d64e3a3..0e2d178 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -4,12 +4,12 @@ naturallanguage = en_US outputencoding = UTF-8 sourceencoding = UTF-8 -project = B2Qt +project = Boot2Qt description = Boot to Qt Technology Preview Documentation -version = tp1 +version = tp sourcedirs = ../src -imagedirs = ../images +imagedirs += ../images sources.fileextensions = "*.qdoc" diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index 2bbce93..103d739 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -1,34 +1,54 @@ -HTML.nobreadcrumbs = "true" +#HTML.nobreadcrumbs = "true" -HTML.stylesheets = template/style/offline.css +HTML.stylesheets = template/style/offline.css -qhp.extraFiles += style/offline.css +# Copy images used by the template to images folder in output directory +HTML.extraimages = template/images/bgrContent.png \ + template/images/blu_dot.png \ + template/images/btn_next.png \ + template/images/btn_prev.png \ + template/images/ico_note.png \ + template/images/ico_note_attention.png \ + template/images/ico_out.png \ + template/images/arrow_bc.png \ + template/images/home.png + +# Add style-related files into qch package +qhp.extraFiles += style/offline.css \ + images/bgrContent.png \ + images/blu_dot.png \ + images/btn_next.png \ + images/btn_prev.png \ + images/ico_note.png \ + images/ico_note_attention.png \ + images/ico_out.png \ + images/home.png \ + images/arrow_bc.png HTML.headerstyles = \ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" HTML.endheader = \ "</head>\n" \ - "<body>\n" \ - "<div class=\"header\" id=\"qtdocheader\"></div>\n"\ - "<div class=\"content\">\n" \ - "<div class=\"line\">\n" \ - "<div class=\"content mainContent\">\n" \ + "<body>\n" HTML.footer = \ - "</div>\n" \ - "</div>\n" \ - "</div>\n" \ + " <div class=\"ft\">\n" \ + " <span></span>\n" \ + " </div>\n" \ + "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its subsidiaries.</p>\n" \ + " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ + " subsidiaries.</p>\n" \ " <p>\n" \ - " Licensees holding valid Qt Commercial licenses may use this document in accordance\n" \ - " with the Qt Commercial License Agreement provided with the Software or, alternatively,\n" \ - " in accordance with the terms contained in a written agreement between you and Digia.</p>\n" \ + " Licensees holding valid Qt Commercial licenses may use this document in\n" \ + " accordance with the Qt Commercial License Agreement provided with the\n" \ + " Software or, alternatively, in accordance with the terms contained in a\n" \ + " written agreement between you and Digia.<\p>\n" \ " <p>\n" \ " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ - "</div>\n" \ + "</div>\n" diff --git a/src/doc/config/template/style/offline.css b/src/doc/config/template/style/offline.css index 6753cba..3bab27b 100644 --- a/src/doc/config/template/style/offline.css +++ b/src/doc/config/template/style/offline.css @@ -8,9 +8,6 @@ margin-left:5px; margin-right:5px; } -p { -line-height: 20px; -} img{ -moz-box-shadow: 3px 3px 3px #ccc; -webkit-box-shadow: 3px 3px 3px #ccc; @@ -21,6 +18,10 @@ max-width: 800px; height: auto } +b{ +font-weight:600; +} + .content{} .descr{ @@ -28,6 +29,7 @@ margin-top:35px; /*max-width: 75%;*/ margin-left:5px; text-align:justify; +min-height:700px; vertical-align:top; } @@ -46,31 +48,28 @@ links */ a:link{ -color: #007330; +color: #2C418D; text-decoration: none; text-align:left; } a:hover{ -color: #44a51c; +color: #869CD1; +text-decoration:underline; text-align:left; } a:visited{ -color: #007330; +color: #869CD1; +text-decoration: none; text-align:left; } a:visited:hover{ -color: #44a51c; +text-decoration:underline; text-align:left; } -/* ------------ -offline viewing: HTML links display an icon ------------ -*/ a[href*="http://"], a[href*="ftp://"],a[href*="https://"] { text-decoration: none; @@ -129,9 +128,17 @@ Top navigation ------------------------------- */ +.header{ + +height:1px; +padding:0px; +margin:0px; +} + .qtref{ display: block; position: relative; +top: -76px; height:15px; z-index: 1; font-size:11px; @@ -140,11 +147,10 @@ float:right; } .naviNextPrevious{ -clear: both; display: block; position: relative; text-align: right; -top: -47px; +top: -53px; float:right; height:20px; z-index:1; @@ -155,7 +161,7 @@ margin:0px; } -.naviNextPrevious > a:first-child{ +.naviNextPrevious > a.prevPage { background-image:url(../images/btn_prev.png); background-repeat:no-repeat; background-position:left; @@ -164,7 +170,7 @@ height:20px; padding-left:20px; } -.naviNextPrevious > a:last-child{ +.naviNextPrevious > a.nextPage { background-image:url(../images/btn_next.png); background-repeat:no-repeat; background-position:right; @@ -172,15 +178,72 @@ padding-right:20px; height:20px; margin-left:30px; } -/* ------------ -footer and license ------------ -*/ -.footer{ -text-align:center + +.breadcrumb{ +display: block; +position: relative; +top:-20px; +/*border-top:2px solid #ffffff;*/ +border-bottom: 1px solid #cecece; +background-color:#F2F2F2; +z-index:1; +height:20px; +padding:0px; +margin:0px; +padding-left:10px; +padding-top:2px; +margin-left:-5px; +margin-right:-5px; } +.breadcrumb ul{ + margin:0px; + padding:0px; +} + +.breadcrumb ul li{ +background-color:#F2F2F2; +list-style-type:none; +padding:0; +margin:0; +height:20px; +} + +.breadcrumb li{ +float:left; +} + +.breadcrumb .first { +background:url(../images/home.png); +background-position:left; +background-repeat:no-repeat; +padding-left:20px; +} + + +.breadcrumb li a{ +color:#2C418D; +display:block; +text-decoration:none; +background:url(../images/arrow_bc.png); +background-repeat:no-repeat; +background-position:right; +padding-right:25px; +padding-left:10px; +} + +.breadcrumb li a:hover{ +color:#909090; +display:block; +text-decoration:none; +background:url(../images/arrow.png); +background-repeat:no-repeat; +background-position:right; +padding-right:20px; +padding-left:10px; +} + + /* table of content no display */ @@ -222,12 +285,13 @@ font: 500 16px/1.2 Arial; font-weight:100; background-color:#F2F3F4; padding:4px; +padding-left: 14px; margin-bottom:30px; margin-top:30px; +margin-left: -10px; +margin-right: -5px; border-top:#E0E0DE 1px solid; border-bottom: #E0E0DE 1px solid; -max-width: 99%; -overflow: hidden; } h3{ @@ -254,7 +318,7 @@ font-weight:bold; max-width:75%; font-size:14px; margin:0px; -margin-top:45px; +margin-top:30px; } @@ -303,10 +367,14 @@ box-shadow: 0px 0px 0px #fff; background-color: #F6F6F6; border: 1px solid #E6E6E6; border-collapse: separate; +font-size: 12px; +line-height: 1.2; margin-bottom: 25px; margin-left: 15px; font-size: 12px; line-height: 1.2; +margin-bottom: 25px; +margin-left: 15px; } @@ -403,16 +471,11 @@ text-align: left; .cpp{ display: block; -margin: 10px; -overflow: auto; -padding: 20px 20px 20px 20px; -} - -.js{ -display: block; -margin: 10px; -overflow: auto; -padding: 20px 20px 20px 20px; +margin: 10; +overflow: hidden; +overflow-x: hidden; +overflow-y: hidden; +padding: 20px 0 20px 0; } .footer{ @@ -424,6 +487,11 @@ border-top: 1px solid #999; padding-top:11px; } +.footer a[href*="http://"], a[href*="ftp://"],a[href*="https://"]{ +background-size: 13px 11px; +padding-left: 16px; +} + .footerNavi{ width:auto; text-align:right; @@ -442,8 +510,10 @@ padding: 3px 15px 3px 0; .qml{ display: block; margin: 10; -overflow: auto; -padding: 20px 20px 20px 20px; +overflow: hidden; +overflow-x: hidden; +overflow-y: hidden; +padding: 20px 0 20px 0; } .qmldefault{ @@ -463,9 +533,6 @@ padding: 3px 5px 3px 10px; text-align: right; } -.qmldoc { -margin-left: 15px; -} /* ----------- Content table @@ -475,7 +542,6 @@ Content table @media print{ .toc { float: right; -clear: right; padding-bottom: 10px; padding-top: 50px; width: 100%; @@ -487,8 +553,8 @@ background-repeat:no-repeat; @media screen{ .toc{ +clear:both; float:right; -clear: right; vertical-align:top; -moz-border-radius: 7px 7px 7px 7px; -webkit-border-radius: 7px 7px 7px 7px; @@ -502,7 +568,11 @@ padding-bottom:10px; height: auto; width: 200px; text-align:left; +z-index:2; margin-left:20px; +margin-right:20px; +margin-top:0px; +padding-top:0px; } } @@ -520,148 +590,39 @@ padding-left:5px; .toc ul{ +width:160px; padding-left:10px; padding-right:5px; +padding-top:10px; } .toc ul li{ -margin-left:15px; -list-style-image:url(../images/bullet_dn.png); -marker-offset: 0px; -margin-bottom:8px; -padding-left:0px; -} - -.toc .level1{ -border:none;} - -.toc .level2{ -border:none; -margin-left: 25px; -} - -.level3{ -border:none; -margin-left: 30px; -} - -.clearfix{ -clear:both;} - -/* start index box */ -.indexbox -{ -width: 100%; -display:inline-block; -} - -.indexboxcont -{ -display: block; - -} - -.indexboxcont .section -{ -display: inline-block; -width: 49%; -*width:42%; -_width:42%; -padding:0 2% 0 1%; -vertical-align:top; -} - -.indexboxcont .indexIcon -{ -width: 11%; -*width:18%; -_width:18%; -overflow:hidden; -} - -.indexboxcont .section { - float: left; -} - -.indexboxcont .section p -{ -padding-top: 20px; -padding-bottom: 20px; -} -.indexboxcont .sectionlist -{ -display: inline-block; -vertical-align:top; -width: 32.5%; -padding: 0; -} -.indexboxcont .sectionlist ul -{ -margin-bottom: 20px; -} - -.indexboxcont .sectionlist ul li -{ -line-height: 1.5; -} - -.content .indexboxcont li -{ -font: normal bold 13px/1 Verdana; -} +margin-left:20px; +list-style-image:url(../images/blu_dot.png); +list-style:outside; -.content .normallist li -{ -font: normal 13px/1 Verdana; } -.indexbox .indexIcon { -width: 11%; -} -.indexbox .indexIcon span -{ -display: block; +.toc ul li a:link{ +color: #2C418D; +text-decoration: none; } -.indexboxcont:after -{ -content: "."; -display: block; -height: 0; -clear: both; -visibility: hidden; -} +.toc ul li a:hover{ +color: #869CD1; +text-decoration:underline; -/* ------------ -Landing page ------------ -*/ -.col-group { - white-space: nowrap; - vertical-align: top; } -.col-1 { - display: inline-block; - white-space: normal; - width: 70%; - height: 100%; - float: left; +.toc ul li a:visited{ +color: #869CD1; +font-weight: bold; } -.col-1 h1 { - margin: 20px 0 0 0; -} +.level1{ +border:none;} -.col-2 { - display: inline-block; - white-space: normal; - width: 25%; - margin: 0 0 0 50px; -} +.clearfix{ +clear:both;} -.sectionlist { - width: 100% !important; -} diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index c558e95..a856142 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -1,13 +1,19 @@ -/************************************************************************** +/**************************************************************************** ** ** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). ** +** Qt and Qt logos are trademarks of of Digia Corporation in Finland and/or +** other countries worldwide. All other trademarks are property of their +** respective owners. +** +** ** Licensees holding valid Qt Commercial licenses may use this document in ** accordance with the Qt Commercial License Agreement provided with the ** Software or, alternatively, in accordance with the terms contained in a ** written agreement between you and Digia. ** -**************************************************************************/ +** +****************************************************************************/ /*! \contentspage{index.html}{Boot to Qt} @@ -81,7 +87,7 @@ \section1 \B2Q SDK \B2Q SDK provides a complete software development package for - creating applications on embedded linux devices. It comes with Qt Creator + creating applications on embedded Android devices. It comes with Qt Creator IDE with preconfigured build targets for hardware platforms as well as an \l{Emulator}{emulator}. */ @@ -95,7 +101,7 @@ \B2Q SDK provides you all the tools to start developing embedded linux devices using Qt and Qt Quick. - \B2Q runs on top of Android 4.0 based kernels. For the technology + \B2Q runs on top of Android 4.0/4.1 baselayers. For the technology preview release, following devices are in focus and tested to work: |