From c770015876390de0cc9c77a3d5b123637204b92c Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Fri, 14 Feb 2025 13:43:27 +0100
Subject: [PATCH] Doc: Use Qt Design System colors also in help CSS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replace colors in offline-dark.css
- Do not use the note and attention icons in offline templates

Task-number: QTBUG-133761
Pick-to: 6.9 6.9.0 6.8
Change-Id: I55e81d6c3887764542e23c8f85f4d46e273b3885
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 doc/global/html-config.qdocconf               |   4 ---
 doc/global/qt-html-templates-offline.qdocconf |   6 ----
 doc/global/template/images/ico_note.png       | Bin 649 -> 0 bytes
 .../template/images/ico_note_attention.png    | Bin 529 -> 0 bytes
 doc/global/template/style/offline-dark.css    |  34 +++++++++---------
 doc/global/template/style/offline.css         |   4 +--
 6 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 doc/global/template/images/ico_note.png
 delete mode 100644 doc/global/template/images/ico_note_attention.png

diff --git a/doc/global/html-config.qdocconf b/doc/global/html-config.qdocconf
index 216f3a50cff..78ee1c2c53b 100644
--- a/doc/global/html-config.qdocconf
+++ b/doc/global/html-config.qdocconf
@@ -7,8 +7,6 @@ HTML.tocdepth = 2
 HTML.extraimages += template/images/arrow_bc.png \
                     template/images/home.png \
                     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 \
@@ -22,8 +20,6 @@ HTML.extraimages += template/images/arrow_bc.png \
                     images/arrow_bc.png \
                     images/home.png \
                     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 \
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index cbd896f6550..00fc58ba666 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -11,8 +11,6 @@ defines                  += offlinedocs
 HTML.stylesheets = template/style/offline.css \
                    template/style/offline-dark.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 \
@@ -25,8 +23,6 @@ sourcedirs += includes
 qhp.extraFiles +=   style/offline.css \
                     style/offline-dark.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 \
@@ -35,8 +31,6 @@ qhp.extraFiles +=   style/offline.css \
 
 DocBook.extraimages += \
                     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 \
diff --git a/doc/global/template/images/ico_note.png b/doc/global/template/images/ico_note.png
deleted file mode 100644
index 13794046cf2fec79410bb09f19f688cad261d217..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq0015U000{Z1^@s6YyCeF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!D@jB_RCwBAU>F6XfJT6kT#eIDr5OOJ
zcp!EFVgn?p3qX7Th!<v>&ALD}i-8sj0IB(Z{`?Dg_2Lu5yEk7MzJB@10OT{UurM)j
z^RP1riEuNBN$`RA8-QvPfe!dUk;PD7?gv^XaQntfuw}Ra$Pua<;vh$WEOkWpJtGO0
zDgdeTw{N@>0QnRd$crg67^~Va>^QTQ;oHwIC~_d5t7?dWEH?yN{s1P<M1qIsKYQ{4
z!%`54cFJZ5w2EV})p5s=1E~k;1L;Q=XCl(K2|s`Qad`aT9bR?Z96VUXLHa=YLFSO^
zWB*4$&G_OJ1it?Gf>j)(?-9h&{-jzQ@b1kQoRT*lUj);SUfsc|2C6@RXp4ct;{XgM
zg1#jLK>9)EfXpM>$3K4jCd%;FpI#De4huDkze87cGRTQ4Graluf@nR&`1k?804H7r
zAPXmKs3T|))SL%ISq#ne4?smBE)e6C#jv<^FR&1?#+}t5`X9gw5n@yI1}PZ<oRT7Z
z5-2n_0M);N)Ht3fCc&EkEQJI<e)x_dIcs|tgZx=#hU?I5g)NAI`a#9!M3V9`G<X_8
zg+8e8M+czt8JDH7$^xVxxvVC&cA5{Y0uz801-L3C1VHf$tRO)20-&Xdl-9=$K&l>8
z{sIestOX0mm!LS6RS<&tw1Fxu5NN$z4=MsdaSrnRU!Vh+p$!3Ow%Gu+^a53zK1i(*
jtW6(mt&Wim00ImEt2*(XY?G#g00000NkvXXu0mjfG7b=W

diff --git a/doc/global/template/images/ico_note_attention.png b/doc/global/template/images/ico_note_attention.png
deleted file mode 100644
index b85b696b10eb2275f9e52eebc1227890d9016d0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq0015U000{Z1^@s6YyCeF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvq?ljRCwBAU>F6XfC%v9w5I?NE0Cgx
ziAr|w2jcrc%MIveG0?Jv|G$43{C)cj#O<f2kLy8}{(b+F0q6h+phE&^ZZXgj2cTsN
z|31B8VEFf!0p@E^oYUIJ^-#;e0OWxG-#>#ASpm%~hWge4WEm41KLdxjHCX)5tH&TJ
zpHM1iqK0opEhaHYI<IHoQHo&r|MMHr=WjtlT~Bq3LB0jXDcHAQLx4U80ak8VsIMP^
z;yeMYj><l+2c=@10F=-m^7T}+80K4Ki+{bp0;a#eItCX5MFTW@B~Z)95Z?lQ1^3{u
zk60D{ef<b$_F|&cw<sZu=74`+K7g{90JiMKM5%9KK@74K7Uam_&x;3OedyVXi5kBB
z@$x9c!!@c{_5J_-6PD2W$@MW--+}-r|4O=SU|<u}!5-J3{QmE60CM(XqDI{E0xjkc
zvtr<u@x-0I&}uJYeH@R=w;=HLYz@PQ%iRngZ_dJL0JQcp0D1zP&=`sEtpd=(`@im8
z!f7$lbubq%1B;CM2Ov|CiITV_75w}58I;99*(-sC2=xz{g{2rkcoa|q00ImEoRJ7P
T2ls(P00000NkvXXu0mjf#K-TF

diff --git a/doc/global/template/style/offline-dark.css b/doc/global/template/style/offline-dark.css
index 7f30cf4fa72..d188c7a3dba 100644
--- a/doc/global/template/style/offline-dark.css
+++ b/doc/global/template/style/offline-dark.css
@@ -5,7 +5,7 @@ body {
     text-align: left;
     margin-left: 5px;
     margin-right: 5px;
-    background-color: #2E2F30;
+    background-color: #262626;
     color: #d0d0d0
 }
 
@@ -60,7 +60,7 @@ links
 */
 
 a:link {
-    color: #9a9ef9;
+    color: #1ec974;
     text-decoration: none;
     text-align: left;
 }
@@ -71,18 +71,18 @@ a.qa-mark:target:before {
 }
 
 a:hover {
-    color: #9a9ef9;
+    color: #1ec974;
     text-decoration:underline;
     text-align: left;
 }
 
 a:visited {
-    color: #9a9ef9;
+    color: #1ec974;
     text-align: left;
 }
 
 a:visited:hover {
-    color: #9a9ef9;
+    color: #1ec974;
     text-align: left;
 }
 
@@ -123,11 +123,11 @@ NOTE styles
 }
 
 .admonition.note, .admonition.important {
-    background: #353637 3px 6px no-repeat url(../images/ico_note.png);
+    background: #353637 3px 6px no-repeat;
 }
 
 .admonition.warning {
-    background: #353637 3px 6px no-repeat url(../images/ico_note_attention.png);
+    background: #353637 3px 6px no-repeat);
 }
 /*
 -------------------------------
@@ -312,7 +312,7 @@ headers
         position: absolute;
         right: 0;
         top: 0;
-        background-color: #2E2F30;
+        background-color: #262626;
         border-bottom: 1px #404142 solid;
         font-weight: bold;
         margin-left: 0px;
@@ -405,9 +405,9 @@ table styles
 .table img {
     border: none;
     margin-left: 0px;
-    -moz-box-shadow: 0px 0px 0px #2E2F30;
-    -webkit-box-shadow: 0px 0px 0px #2E2F30;
-    box-shadow: 0px 0px 0px #2E2F30;
+    -moz-box-shadow: 0px 0px 0px #262626;
+    -webkit-box-shadow: 0px 0px 0px #262626;
+    box-shadow: 0px 0px 0px #262626;
 }
 
 /* table with border alternative colors*/
@@ -426,7 +426,7 @@ table, pre, .LegaleseLeft {
 }
 
  table tr.even {
-     background-color: #2E2F30;
+     background-color: #262626;
      color: #a4a6a8;
  }
 
@@ -442,7 +442,7 @@ table, pre, .LegaleseLeft {
  table thead {
      text-align: left;
      padding-left: 20px;
-     background-color: #2E2F30;
+     background-color: #262626;
      border-left: none;
      border-right: none;
  }
@@ -477,18 +477,18 @@ table, pre, .LegaleseLeft {
 
 .borderless {
     border-radius: 0px 0px 0px 0px;
-    background-color: #2E2F30;
-    border: 1px solid #2E2F30;
+    background-color: #262626;
+    border: 1px solid #262626;
 }
 
 .borderless tr {
-     background-color: #2E2F30;
+     background-color: #262626;
      color: #d0d0d0;
  }
 
 .borderless td {
      border: none;
-     border-bottom: #2E2F30 dotted 1px;
+     border-bottom: #262626 dotted 1px;
  }
 
 /*
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index b627372ed06..0f05b3edf63 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -120,11 +120,11 @@ NOTE styles
 }
 
 .admonition.note, .admonition.important {
-    background: #f2f2f2 3px 6px no-repeat url(../images/ico_note.png);
+    background: #f2f2f2 3px 6px no-repeat;
 }
 
 .admonition.warning {
-    background: #f2f2f2 3px 6px no-repeat url(../images/ico_note_attention.png);
+    background: #f2f2f2 3px 6px no-repeat;
 }
 /*
 -------------------------------