diff options
author | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
---|---|---|
committer | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
commit | 3b96b0ed7cf8d960dd3ec2208ad8addb584bc1c9 (patch) | |
tree | d83db38f58511d5648b6bd665ab3760d74e73875 /css | |
parent | ef3a8db1cc83e02a9f8933869d19f299f2abe72a (diff) | |
parent | e4e9ac1fc288d6715f6419cd4c8a44386362ecf0 (diff) |
Merge branch 'master' into hookhead
Conflicts:
include/functions.php
changes for conflicts with master
Diffstat (limited to 'css')
-rw-r--r-- | css/cdm.css | 19 | ||||
-rw-r--r-- | css/tt-rss.css | 17 |
2 files changed, 25 insertions, 11 deletions
diff --git a/css/cdm.css b/css/cdm.css index 18bedce01..7e85cbfff 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -265,3 +265,22 @@ div#floatingTitle span.author, div#floatingTitle img.tinyFeedIcon { display : none; } + +.cdm.high .cdmHeader a.title.high, .cdm.high .cdmHeader .cdmExcerpt, +.cdm.high .cdmHeader span.author { + color : #00aa00; +} + +.cdm.Unread.high .cdmHeader a.title.high, .cdm.Unread.high .cdmHeader .cdmExcerpt, +.cdm.Unread.high .cdmHeader span.author { + color : #00dd00; +} + +.cdm .cdmHeader a.title.low, .cdm.low .cdmHeader .cdmExcerpt, +.cdm.Unread .cdmHeader a.title.low, .cdm.Unread.low .cdmHeader .cdmExcerpt, +.cdm.low .cdmHeader span.author { + color : #909090; + text-decoration : line-through; +} + + diff --git a/css/tt-rss.css b/css/tt-rss.css index 3e6b8cd38..c5ab8d991 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -606,20 +606,15 @@ div#headlines-frame.wide .hlTitle { white-space : normal; } -.hlContentH a, .hlContentH span { - color : #00cc00; +.hl a.title.high, span.hlContent.high .contentPreview { + color : #00aa00; } - -.hlContentL a, .hlContentL span { - color : #909090; - text-decoration : line-through; -} - -span.titleWrapH, span.titleWrapH a { - color : #00cc00; +.hl.Unread a.title.high, .hl.Unread span.hlContent.high .contentPreview { + color : #00dd00; } -span.titleWrapL, span.titleWrapL a { +.hl a.title.low, span.hlContent.low .contentPreview, +.hl.Unread a.title.low, .hl.Unread span.hlContent.low .contentPreview { color : #909090; text-decoration : line-through; } |