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>

diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index abe7e5e..5f989d2 100644 (file)
--- 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 7d0705c..8c8df29 100644 (file)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index f7bc2b7..c649f18
Binary files a/doc/global/template/images/btn_next.png and b/doc/global/template/images/btn_next.png differ

diff --git a/doc/global/template/images/btn_next_green.png b/doc/global/template/images/btn_next_green.png
deleted file mode 100644 (file)
index c649f18..0000000
Binary files a/doc/global/template/images/btn_next_green.png and /dev/null differ

diff --git a/doc/global/template/images/btn_prev.png b/doc/global/template/images/btn_prev.png
old mode 100755 (executable)
new mode 100644 (file)
index 10a620c..d1d2989
Binary files a/doc/global/template/images/btn_prev.png and b/doc/global/template/images/btn_prev.png differ

diff --git a/doc/global/template/images/btn_prev_green.png b/doc/global/template/images/btn_prev_green.png
deleted file mode 100644 (file)
index d1d2989..0000000
Binary files a/doc/global/template/images/btn_prev_green.png and /dev/null differ

diff --git a/doc/global/template/images/ico_out.png b/doc/global/template/images/ico_out.png
index ff6e458..790a05e 100755 (executable)
Binary files a/doc/global/template/images/ico_out.png and b/doc/global/template/images/ico_out.png differ

diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index f13e880..3370f71 100644 (file)
--- 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;