* cdm: render enclosures into content element

 * deprecate cdm.intermediate
 * implement lazy-load for rendered enclosures
 * simplify pack/unpack logic for articles

2 files changed, 13 insertions, 24 deletions

diff --git a/themes/light/cdm.less b/themes/light/cdm.less
index a89ceed27..5641a0380 100644
--- a/themes/light/cdm.less
+++ b/themes/light/cdm.less
@@ -103,35 +103,26 @@
 		}
 	}
 
-	.intermediate {
-		margin-top : 10px;
-		margin-left : 10px;
-		line-height : 1.5;
-	}
-
 	.content-inner {
 		margin : 10px;
 		line-height : 1.5;
 		font-size : 16px;
 	}
 
-	.intermediate,
 	.content-inner {
 		iframe {
 			max-width : 98%;
 			width : auto;
 			height : auto;
 		}
-	}
 
-	.intermediate img,
-	.intermediate video,
-	.content-inner img,
-	.content-inner video {
-		border-width : 0px;
-		max-width : 98%;
-		width : auto;
-		height : auto;
+		img,
+		video {
+			border-width : 0px;
+			max-width : 98%;
+			width : auto;
+			height : auto;
+		}
 	}
 
 	&.expanded {
@@ -210,7 +201,6 @@
 		}
 	}
 
-	.intermediate,
 	.content-inner {
 		.embed-responsive {
 			overflow : hidden;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 088a3c7ff..0e85d53fb 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -754,6 +754,12 @@ body.ttrss_main {
 			.content {
 				border-top-width : 0;
 				padding : 0 4px 4px 4px;
+
+				.content-inner {
+					a {
+						word-break: break-all;
+					}
+				}
 			}
 
 			.header[data-is-stuck] {
@@ -787,13 +793,6 @@ body.ttrss_main {
 					text-overflow: ellipsis;
 				}
 			}
-
-			.content-inner,
-			.intermediate {
-				a {
-					word-break: break-all;
-				}
-			}
 		}
 	}