diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
| commit | f4900d340a4c620b56871995741696d28e53c167 (patch) | |
| tree | 66d4ed6e4e8012e8a534717e87bf15cf8a992652 /doc/global/template/style/offline.css | |
| parent | 7c33ae6a7bbbd42ce70acf77aa55c1bc2a23c8ec (diff) | |
| parent | 843de37bca944110fdf3aab161d680e3845d2dd2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qmacstyle_mac.mm
Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
Diffstat (limited to 'doc/global/template/style/offline.css')
| -rw-r--r-- | doc/global/template/style/offline.css | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 8b8a7d9ae1..40257730ff 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -290,14 +290,10 @@ box-shadow: 0px 0px 0px #fff; background-color: #F6F6F6; border: 1px solid #E6E6E6; border-collapse: separate; -font-size: 12px; -line-height: 1.2; margin-bottom: 25px; margin-left: 15px; font-size: 12px; line-height: 1.2; -margin-bottom: 25px; -margin-left: 15px; } @@ -451,6 +447,9 @@ padding: 3px 5px 3px 10px; text-align: right; } +.qmldoc { +margin-left: 15px; +} /* ----------- Content table |