Merge branch 'dont-wrap-excerpt' into 'master'

Make sure author and excerpt spans don't wrap even if active.

In combined display mode with an article collapsed via keyboard nav,
the article remains active, which lets the excerpt bubble out to several
lines depending on display width. Keep the excerpt nowrap always.

While here, fix the author display; nowrap always to keep the name
from splitting across lines in rare cases.

See merge request !26

diff --git a/css/cdm.css b/css/cdm.css
index c7d34c4b7b6622542f3a2e709796400605bcdb4d..1ee4715fb11009e897704fbe768db82e7f155987 100644 (file)
--- a/css/cdm.css
+++ b/css/cdm.css
@@ -211,6 +211,7 @@ div.cdm.active div.cdmContent {
 }
 
 span.cdmExcerpt {
+       white-space : nowrap;
        font-size : 11px;
        color : #999;
        font-weight : normal;
@@ -275,6 +276,7 @@ div.cdmContentInner iframe {
 }
 
 div.cdmHeader span.author {
+       white-space : nowrap;
        color : #555;
        font-size : 11px;
        font-weight : normal;