summaryrefslogtreecommitdiffstats
path: root/doc/global
diff options
context:
space:
mode:
Diffstat (limited to 'doc/global')
-rw-r--r--doc/global/externalsites/external-resources.qdoc2
-rw-r--r--doc/global/qt-cpp-defines.qdocconf1
-rw-r--r--doc/global/template/style/offline-simple.css2
-rw-r--r--doc/global/template/style/offline.css14
-rw-r--r--doc/global/template/style/online.css12
5 files changed, 24 insertions, 7 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index b231bb1f4a..d9859ba295 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -474,7 +474,7 @@
*/
/*!
- \externalpage http://git.iksaif.net/?p=qsslkey-p11.git
+ \externalpage https://github.com/iksaif/qsslkey-p11
\title qsslkey example
*/
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index 13e523411a..fe8b7fb87e 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -7,7 +7,6 @@ defines += Q_QDOC \
QT_KEYPAD_NAVIGATION \
QT_NO_EGL \
QT3_SUPPORT \
- Q_DEAD_CODE_FROM_QT4_.* \
Q_OS_.* \
Q_BYTE_ORDER \
QT_DEPRECATED \
diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css
index 84d206b2d0..a805b924a3 100644
--- a/doc/global/template/style/offline-simple.css
+++ b/doc/global/template/style/offline-simple.css
@@ -1,4 +1,4 @@
-pre {
+pre, .LegaleseLeft {
background-color: #f0f0f0;
font-family: Courier, monospace;
font-weight: 600;
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 612c1087d5..e2081596c9 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -18,8 +18,12 @@ img {
height: auto;
}
-.content {
+.content .border img {
+ box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
+}
+.content .border .player {
+ box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
}
.content .indexboxcont li {
@@ -424,7 +428,7 @@ table styles
/* table with border alternative colours*/
-table, pre {
+table, pre, .LegaleseLeft {
-moz-border-radius: 7px 7px 7px 7px;
-webkit-border-radius: 7px 7px 7px 7px;
border-radius: 7px 7px 7px 7px;
@@ -481,6 +485,10 @@ table, pre {
margin: 0px
}
+.LegaleseLeft {
+ font-family: monospace;
+ white-space: pre-wrap;
+}
/* table bodless & white*/
.borderless {
@@ -543,7 +551,7 @@ ol.a > li{
text-align: left
}
-.cpp {
+.cpp, .LegaleseLeft {
display: block;
margin: 10px;
overflow: auto;
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index be278a27da..3c305f3ddb 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -1280,6 +1280,12 @@ li a.active {
margin-top:0.75em;
max-width:100%
}
+.context .border img {
+ box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
+ }
+.context .border .player {
+ box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
+ }
.context table {
vertical-align:initial
}
@@ -1364,7 +1370,7 @@ div.qt_commercial {
border-top:5px solid #5caa15;
margin-bottom:50px
}
-pre {
+pre, .LegaleseLeft {
background-color:#404244;
color:#fff;
display:block;
@@ -1375,6 +1381,10 @@ pre {
padding:25px;
margin-top:0.75em
}
+.mainContent .LegaleseLeft p {
+ color:#fff;
+ white-space: pre-wrap
+}
.copy_text {
background-color:#46a2da;
color:#fff;