diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-12-06 16:17:43 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 23:10:43 +0100 |
commit | fac02ddc39145963646ad0f36b9e41573e49e6c5 (patch) | |
tree | d72457842218306f397cda706568cdf6643afc55 /doc | |
parent | a5bca210965fb31e998477c15fb0b1f41ee1ca18 (diff) |
Doc: Restored CSS images for the offline HTML and QCH build
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>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/qt-html-templates-offline.qdocconf | 20 | ||||
-rw-r--r-- | doc/global/qt-module-defaults.qdocconf | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | doc/global/template/images/btn_next.png | bin | 689 -> 695 bytes | |||
-rw-r--r-- | doc/global/template/images/btn_next_green.png | bin | 695 -> 0 bytes | |||
-rw-r--r--[-rwxr-xr-x] | doc/global/template/images/btn_prev.png | bin | 676 -> 687 bytes | |||
-rw-r--r-- | doc/global/template/images/btn_prev_green.png | bin | 687 -> 0 bytes | |||
-rwxr-xr-x | doc/global/template/images/ico_out.png | bin | 362 -> 388 bytes | |||
-rw-r--r-- | doc/global/template/style/offline.css | 78 |
8 files changed, 31 insertions, 70 deletions
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index abe7e5e349..5f989d2fa8 100644 --- a/doc/global/qt-html-templates-offline.qdocconf +++ b/doc/global/qt-html-templates-offline.qdocconf @@ -1,6 +1,26 @@ HTML.nobreadcrumbs = "true" HTML.stylesheets = template/style/offline.css +HTML.extraimages += template/images/ico_out.png \ + template/images/ico_note.png \ + template/images/ico_note_attention.png \ + template/images/btn_prev.png \ + template/images/btn_next.png \ + template/images/bullet_dn.png \ + template/images/bullet_sq.png \ + template/images/bgrContent.png + +#specify which files in the output directory should be packed into the qch file. +qhp.extraFiles += style/offline.css \ + images/ico_out.png \ + images/ico_note.png \ + images/ico_note_attention.png \ + images/btn_prev.png \ + images/btn_next.png \ + images/bullet_dn.png \ + images/bullet_sq.png \ + images/bgrContent.png + HTML.headerstyles = \ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf index 7d0705c475..8c8df29437 100644 --- a/doc/global/qt-module-defaults.qdocconf +++ b/doc/global/qt-module-defaults.qdocconf @@ -25,8 +25,5 @@ versionsym = QT_VERSION_STR macro.raisedaster.HTML = "<sup>*</sup>" -#for including files into the qch file -qhp.extraFiles += style/offline.css - #include the external websites sourcedirs += externalsites diff --git a/doc/global/template/images/btn_next.png b/doc/global/template/images/btn_next.png Binary files differindex f7bc2b7170..c649f18572 100755..100644 --- a/doc/global/template/images/btn_next.png +++ b/doc/global/template/images/btn_next.png diff --git a/doc/global/template/images/btn_next_green.png b/doc/global/template/images/btn_next_green.png Binary files differdeleted file mode 100644 index c649f18572..0000000000 --- a/doc/global/template/images/btn_next_green.png +++ /dev/null diff --git a/doc/global/template/images/btn_prev.png b/doc/global/template/images/btn_prev.png Binary files differindex 10a620c518..d1d29895b2 100755..100644 --- a/doc/global/template/images/btn_prev.png +++ b/doc/global/template/images/btn_prev.png diff --git a/doc/global/template/images/btn_prev_green.png b/doc/global/template/images/btn_prev_green.png Binary files differdeleted file mode 100644 index d1d29895b2..0000000000 --- a/doc/global/template/images/btn_prev_green.png +++ /dev/null diff --git a/doc/global/template/images/ico_out.png b/doc/global/template/images/ico_out.png Binary files differindex ff6e458fb1..790a05e51d 100755 --- a/doc/global/template/images/ico_out.png +++ b/doc/global/template/images/ico_out.png diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index f13e8805e4..3370f7142c 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -63,6 +63,16 @@ color: #44a51c; text-align:left; } +a[href*="http://"], a[href*="ftp://"],a[href*="https://"] +{ +text-decoration: none; +background-image:url(../images/ico_out.png); +background-repeat:no-repeat; +background-position:left; +padding-left:20px; +text-align:left; +} + .flags{ text-decoration:none; text-height:24px; @@ -155,71 +165,6 @@ height:20px; margin-left:30px; } -.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.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 */ @@ -566,8 +511,7 @@ padding-right:5px; .toc ul li{ margin-left:15px; -list-style-image:url(../images/blu_dot.png); -list-style:outside; +list-style-image:url(../images/bullet_dn.png); marker-offset: 0px; margin-bottom:8px; padding-left:0px; |