From a0ddecb98dc56b63f039fd9ac2058cff21e2c201 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 29 Mar 2013 18:53:16 +0400 Subject: [PATCH] remove cdm tiles; update cdm stylesheet as to stop reading on yellow --- cdm.css | 74 ++++++++++++++++++++++++++++++--- classes/feeds.php | 4 +- images/cdm_footer_selected.png | Bin 225 -> 0 bytes images/cdm_footer_tile.png | Bin 221 -> 0 bytes js/viewfeed.js | 8 +++- tt-rss.css | 46 ++++++++++---------- 6 files changed, 99 insertions(+), 33 deletions(-) delete mode 100644 images/cdm_footer_selected.png delete mode 100644 images/cdm_footer_tile.png diff --git a/cdm.css b/cdm.css index 7ab3471ca..6f253cc5a 100644 --- a/cdm.css +++ b/cdm.css @@ -63,17 +63,67 @@ div.cdmContentInner img { } div.cdmFooter { - background-color : #f0f0f0; - background-image : url("images/cdm_footer_tile.png"); padding : 5px; font-weight : normal; color : gray; clear : both; } -.Selected div.cdmFooter { - background-color : #FFE587; - background-image : url("images/cdm_footer_selected.png"); +div.cdm { + border-width : 0px 1px 1px 0px; + border-collapse : collapse; + border-bottom-color : #c0c0c0; + border-right-color : #c0c0c0; + border-style : solid; + background : #f0f0f0; +} + +div.cdm.expanded div.cdmHeader { + background : #e0e0e0; +} + +div.cdm.Unread { + background : #fafafa; +} + +div.cdm.Unread div.cdmHeader { + background : #ecf4ff; +} + +div.cdm.Selected { + background : #fff7d5; +} + +div.cdm.expanded.Selected div.cdmHeader { + background : #FFEA9E; +} + +div.cdm.expandable.Selected div.cdmHeader { + background : #fff7d5; +} + +div.cdm.expandable.active.Selected div.cdmHeader, +div.cdm.expanded.active.Selected div.cdmHeader { + background : #ecf4ff; +} + +div.cdm.active { + border-right-color : #88b0f0; + border-bottom-color : #88b0f0; + background : white ! important; +} + +div.cdm.active div.cdmHeader { + background : #ecf4ff; +} + +div.cdm.active div.cdmHeader a.title { + color : #4684ff; + font-weight : bold; +} + +div.cdm.active div.cdmContent { + background : white; } span.cdmExcerpt { @@ -120,7 +170,7 @@ div.cdmHeader span.hlFeed { font-style : italic; } -div.cdm.expanded .cdmHeader { +/* div.cdm.expanded .cdmHeader { background : #E0E0E0; } @@ -144,6 +194,18 @@ div.cdm.expanded.even, div.cdm.expanded.odd { background : #f9f9f9; } +div.cdm.odd.active, div.cdm.even.active { + background : white; +} + +div.cdm.active .cdmHeader { + background : #ecf4ff; +} + +div.cdm.active .cdmFooter { + background : white; +} */ + div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a { vertical-align : middle; color : gray; diff --git a/classes/feeds.php b/classes/feeds.php index 51103e8d1..ddf48c4c5 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -447,7 +447,7 @@ class Feeds extends Handler_Protected { $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' onmouseout='postMouseOut($id)'"; - $reply['content'] .= "
"; + $reply['content'] .= "
"; $reply['content'] .= "
"; @@ -548,7 +548,7 @@ class Feeds extends Handler_Protected { $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' onmouseout='postMouseOut($id)'"; - $expanded_class = $expand_cdm ? "expanded" : ""; + $expanded_class = $expand_cdm ? "expanded" : "expandable"; $reply['content'] .= "
"; diff --git a/images/cdm_footer_selected.png b/images/cdm_footer_selected.png deleted file mode 100644 index def21426be06003bb3cf478f45a259e4462a125a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamUKs7M+SzC{oH>NS%G}c0*}aI zpqc|9%$RkplM^T?RpJ^^5}cn_Ql40p$`Fv4nOCCc=Nh6=W~^tbXJ}yXrD!2gRjj9r zV~BNS%G}c0*}aI zpqfJ<%qXhi)c_QfDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc+*xQnV1LD$>)% zF~q`u?rB3V1_KV~!1wjZ%cqD;3E9$oxP4MMZ^KS&le~*5tChbkXnHsIX**X``uB^D zCXs!jH_nH--wAWiDLo<=a$)c0KLL)f-`H7osGZ)(^!w&3js{t?&W+7ot>