From fac02ddc39145963646ad0f36b9e41573e49e6c5 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 6 Dec 2012 16:17:43 +0100 Subject: [PATCH] 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 Reviewed-by: Eike Ziller --- doc/global/qt-html-templates-offline.qdocconf | 20 +++++ doc/global/qt-module-defaults.qdocconf | 3 - doc/global/template/images/btn_next.png | Bin 689 -> 695 bytes doc/global/template/images/btn_next_green.png | Bin 695 -> 0 bytes doc/global/template/images/btn_prev.png | Bin 676 -> 687 bytes doc/global/template/images/btn_prev_green.png | Bin 687 -> 0 bytes doc/global/template/images/ico_out.png | Bin 362 -> 388 bytes doc/global/template/style/offline.css | 78 +++--------------- 8 files changed, 31 insertions(+), 70 deletions(-) mode change 100755 => 100644 doc/global/template/images/btn_next.png delete mode 100644 doc/global/template/images/btn_next_green.png mode change 100755 => 100644 doc/global/template/images/btn_prev.png delete mode 100644 doc/global/template/images/btn_prev_green.png diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index abe7e5e3498..5f989d2fa89 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 = \ " \n" diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf index 7d0705c4755..8c8df29437f 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 = "*" -#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 new mode 100644 index f7bc2b7170a51ae5ddda0c72959c7f54a96bdc3b..c649f18572e23f65f8485e7fe35c21bee8973831 GIT binary patch delta 636 zcmV-?0)zdr1-Au|B#}8Ke_2UHK~#9!d{awk6Hyes@6ESKTSx1scA=x9NU;!5>Q1J$ z_`y#FS9aBnbyHXV&_!Zh6od*9aU&=qsOU!MLTjO>E5U*=pbLMYaZ`dJ?KGK8=JRHr zGouZOnfT!F-n;Lfdk^>Bi=f3iH+59@H~H^1_x$qPT$CUB*Dx}5e{9qi^^`5>GGWco z#@lgVowgirwNE^|H1jwzfS*yK9LX5cuLKc{NL8F2gP68O1)CZ06=}5qAz5@X#>RYt zA`kwz5XI15>``g;PY@g!F=kTE`qczR7#Lt-YkV6_4m^P&`D}QvN8n>gD+!L_Q(?d$ zJ9OBKrnD@rW!W6>e}OwkUO=4dfO`u`$mFJ*l*CG#G;fvJ5hzHwF;fbpt)ZajA^C0$ zDozt*+Wez%V$VppSL`yBt+MY|=M!+KUq9D#=8+|U>(T~{e;-W2;LejF`Nr%Rg$<60k8~7Go{X9GhXl;iGuBD@aV(+ z7L9~}*E?0>a=Gb-Rz7}nNOFO^GGaxAuvR3QB?5?*uJ^9PoXJei6(Wa8xqfKW#^x25 zGkd+@tAbATIKY;W#Y9MFm-Gkur>fm@8f$}ddVAOY-Q9h``Q!KeCujO+G0N|^00RK4 Wyd%f3+a2Zr0000B*i#8+E7wsz_ww& zAQV1Pp!)7WW^sD6*?`Lp8??HbM>L*5zr0=e@_l8t>{a()fB^veTn*4GG+Fcj O0000XN diff --git a/doc/global/template/images/btn_next_green.png b/doc/global/template/images/btn_next_green.png deleted file mode 100644 index c649f18572e23f65f8485e7fe35c21bee8973831..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 695 zcmV;o0!aOdP)wtR;Nyy};o0P;#n>25g*%2s6xG_@- zq^+T#=OOuS3@T0;F81GoL3tSJ-vcg$<60k8~7Go{X9GhXl; ziGuBD@aV(+7L9~}*E?0>x#@;hK7MmZa)G=uVnv0pRwS7v0*IBa_pZa7$xO}_B8N%2 zerVLj<`tJSd%fVRf==}~z?P83L`Y|s^auH;s@-xLYlCxod)NNm-F?CNaRXo|#UaXhu#Xt1WwIT(fhdp}|K?N^@2d#y6dr&VTEGSacr7J=SZdccCHk)K7 ziJ2(7jiwHK%*=c5d-LY~AXsCaojR-poAT#ceRTOnHO>zGEf|?Pf0B13qu_{!LU}8c zC7cxSq^Fv&(-RLbP2Y=k5WFb+0xg;HH=fUh%r|n>wc;jVc>v|U`ROwlY{qRQ))|iXEwI{LlwA0A>^{x zy;M8z@iYjBiy)_*e};?M+b|&Sj>ws~G3pBsgm zp-1#YGG&36R30I$QB1-2y9F7LcfnY8B0P`Jo`=Q8$A1b&F@b=jVT?HNgS`13>Y!;i zq2)9~!(%%~BDyXZKgfaWk$Gf`;JSVX`pOdAm>CV7+d|i`fQqK|KvGZ&BtMd@1^q*aZX+Q`7`U-@H?o?@VwiY`~+Vz8Z2U}NM!OD27RIJ-P z0kADrFcpiHCF8FCpzN$Ujh(?cxwUWqj*WZS`RynD9eMht9%uJUfB^v1O*Z{877&gA O0000Ya3~6h!||aUsSX=@e)W%wU#O#8bPX;ik?)oC+kJ8dh#raUbGZiFReLAvT*T7TY#0DaIE^Ln!c9wyasG%gox0!GxbweVn^6-=>(k(YRyyYPm%~e zNFoW~?8!lRcz*)Yscyc<9Oqwk4|0$z;pqhEanGfHJfYLZh7ZB*>p7^K4u~6qXqbx} zxR$BSZ+0Pvs86%(W)@#+^l2uNcso)1aniTa7%4$JMM$Z4d;Zjr{|?oQ!sp zk-rtIfj9y=$mKO{4%SV|Pe#k1KDs5|0&l8g+wbLw!j^s;YvsQ%eRq+IjAjqOt*hBU z9Dy8vTJ39eXJjuV*@b% z@*@~^oBJd=0?}Avx$t!2gw*tC=M>dnb)3p>-}3?jpTCwl+M`Pd8}062$O(+{_~oTO z*RfVjL+_)G9Xf^h-!UywmLk!^g~w;gp^qs_cYgK>>+cx5re5k&UZE_>t|%)yTQ0qw zo4mB`Yi!xj$b+7qWE$HK)!(IeAC{-9VR`=r7y#qc4KVMD;e!AG002ovPDHLkV1ga_ BE%X2Y diff --git a/doc/global/template/images/btn_prev_green.png b/doc/global/template/images/btn_prev_green.png deleted file mode 100644 index d1d29895b27ef56c21b6a1e185fe0ca584f00601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)amOMlpeaq+yIW z@PoYh9_pZJH=*S;L&IY`Myde6i{QF`2l~nq+?W{+o#eJ1hp_{Nh@OFQ z5D4=u2W8YwG+gSzYJ9FOz_sV+LMMl|pMXsNzK9;Rr3UegGWUL_V(rl~JvL`*)OW%2 z{0{1^Wq9-T6?`|B;pO5SSi}zHi0~j9>+d|i`fQqK|KvGZ&BtMd@1^q*a zZX+Q`7`KSz2TMAj3SYw&pD1BV zpaeHyi4t}@K=L6{E|ZIih^0i%mn>_>{(tP5Ux)|*+NuT^fdOcM{j}eKn>WFcpb!zX zRV}ar3$S_<_VXoe)diTM$bapJf{4)1wd?1)6A}Je{am+cu8h@pZ^A|fv{k#dYC7Ty zXn`zp?8gSYYpXh7tTKscs|KJ09PkWW0hcWhCv-i#ZZu4%dT8f>0Cyf4M;30T-?)w0;rp zODv6uv>yr-SZ+=R(9C}UHAQ%q%Ig-&eG(C{;T-oOK9K%*wOe@+}AQlF~M0`gV(t( zI8{TVa4~){ksg@vGhTV4?4~W3R=L7b&R&xmPU%}9cufn5(T5~Io&pR25V(e79HbsF P00000NkvXXu0mjfX0wOI diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index f13e8805e4e..3370f7142ca 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;