summaryrefslogtreecommitdiffstats
path: root/doc/global
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-31 20:09:14 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-01 06:02:55 +0100
commita732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (patch)
treed09875c3543ad837fbfaaf10bd4eef1d3de42941 /doc/global
parentcd9de59177ccbeb7fdfacf8716af7bb20112c880 (diff)
parent8e20daae9fee5f3b999daffce0d7156015ee974b (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts: config.tests/win/msvc_version.cpp configure.pri mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf src/corelib/io/qsettings_mac.cpp src/corelib/json/qjsondocument.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.h src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/qiosintegration.h src/plugins/platforms/minimalegl/qminimaleglintegration.cpp tests/auto/gui/painting/qpainter/tst_qpainter.cpp tools/configure/environment.cpp Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
Diffstat (limited to 'doc/global')
-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
3 files changed, 23 insertions, 5 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 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;