diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:26 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:47 +0100 |
commit | 3ec31ef9c5acd57a4a59c0d5f5e20b8d9a19bfa1 (patch) | |
tree | 8b55dd13dbc2a33fe7c857f622e10b817386bdb3 /doc/global | |
parent | 6f87f2d23fb50d8183ea173fe423b7e1a24c0e2e (diff) | |
parent | 4ad8798de428b44fe4c56e1ca111940068056c57 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2532c7f7db5e6cc3ef09753d886279816dd662b2
Diffstat (limited to 'doc/global')
-rw-r--r-- | doc/global/template/style/offline.css | 15 | ||||
-rw-r--r-- | doc/global/template/style/online.css | 25 |
2 files changed, 40 insertions, 0 deletions
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 5aabd82dcb..1f76efbd38 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -595,6 +595,21 @@ ol.a > li{ margin-left: 15px } +.flowList { + padding: 25px +} +.flowList dd { + display: inline-block; + margin-left: 10px; + width: 255px; + line-height: 1.15em; + overflow-x: hidden; + text-overflow: ellipsis +} +.alphaChar { + font-size: 2em; + position: relative +} /* ----------- Content table diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index 86e30e89b3..c7758d0ca8 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -254,6 +254,13 @@ line-height:1.4; font-size:0.875em } +@media (min-width: 1320px) { + .context .flowListDiv dl.flowList { + -webkit-column-count:3; + -moz-column-count:3; + column-count:3 + } +} @media (min-width: 1120px) { #navbar.fixed,#navbar.shadow_bottom { -moz-box-shadow:0px 0px 8px rgba(0,0,0,0.2); @@ -293,6 +300,11 @@ #navbar.fixed #mainmenu li.current-menu-item a { border-bottom:4px solid #80C342 } + .flowListDiv dl.flowList { + -webkit-column-count:2; + -moz-column-count:2; + column-count:2 + } } @media (max-width: 1120px) { #navbar { @@ -1220,6 +1232,19 @@ li a.active { .flowList { padding:25px } +.flowListDiv dl { + -webkit-column-count:1; + -moz-column-count:1; + column-count:1 +} +.flowList dd { + display:inline-block; + margin-left:10px; + width:90%; + line-height:1.15em; + overflow-x:hidden; + text-overflow:ellipsis +} .alphaChar { font-size:2em; position:absolute |