diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /doc | |
parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/template/style/offline-simple.css | 2 | ||||
-rw-r--r-- | doc/global/template/style/offline.css | 8 | ||||
-rw-r--r-- | doc/global/template/style/online.css | 6 |
3 files changed, 12 insertions, 4 deletions
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 6621b6bbcb..e2081596c9 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -428,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; @@ -485,6 +485,10 @@ table, pre { margin: 0px } +.LegaleseLeft { + font-family: monospace; + white-space: pre-wrap; +} /* table bodless & white*/ .borderless { @@ -547,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 080b45749d..3c305f3ddb 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -1370,7 +1370,7 @@ div.qt_commercial { border-top:5px solid #5caa15; margin-bottom:50px } -pre { +pre, .LegaleseLeft { background-color:#404244; color:#fff; display:block; @@ -1381,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; |