Skip to content

Commit

Permalink
Doc: Use Qt Design System colors also in help CSS
Browse files Browse the repository at this point in the history
- 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ö <[email protected]>
(cherry picked from commit c770015)
Reviewed-by: Jani Heikkinen <[email protected]>
  • Loading branch information
leena-miettinen committed Mar 6, 2025
1 parent 8f5e26f commit 0ad4091
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 29 deletions.
4 changes: 0 additions & 4 deletions doc/global/html-config.qdocconf
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
6 changes: 0 additions & 6 deletions doc/global/qt-html-templates-offline.qdocconf
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
Binary file removed doc/global/template/images/ico_note.png
Binary file not shown.
Binary file removed doc/global/template/images/ico_note_attention.png
Binary file not shown.
34 changes: 17 additions & 17 deletions doc/global/template/style/offline-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body {
text-align: left;
margin-left: 5px;
margin-right: 5px;
background-color: #2E2F30;
background-color: #262626;
color: #d0d0d0
}

Expand Down Expand Up @@ -60,7 +60,7 @@ links
*/

a:link {
color: #9a9ef9;
color: #1ec974;
text-decoration: none;
text-align: left;
}
Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
}
/*
-------------------------------
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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*/
Expand All @@ -426,7 +426,7 @@ table, pre, .LegaleseLeft {
}

table tr.even {
background-color: #2E2F30;
background-color: #262626;
color: #a4a6a8;
}

Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}

/*
Expand Down
4 changes: 2 additions & 2 deletions doc/global/template/style/offline.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
/*
-------------------------------
Expand Down

0 comments on commit 0ad4091

Please sign in to comment.