From b6033d0bbd8d253b7bea1450b1b566b96fd9f22a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Mar 2021 11:44:16 +0300
Subject: [PATCH] grid view tweaks

---
 classes/pref/prefs.php   |  2 +-
 themes/compact.css       | 19 ++++++++++++++++++-
 themes/compact_night.css | 19 ++++++++++++++++++-
 themes/light.css         | 19 ++++++++++++++++++-
 themes/light/cdm.less    |  8 ++++++++
 themes/light/tt-rss.less | 18 ++++++++++++++++--
 themes/night.css         | 19 ++++++++++++++++++-
 themes/night_blue.css    | 19 ++++++++++++++++++-
 8 files changed, 115 insertions(+), 8 deletions(-)

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 807a35e10..1d61059cb 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -118,7 +118,7 @@ class Pref_Prefs extends Handler_Protected {
 			Prefs::HEADLINES_NO_DISTINCT => array(__("Don't enforce DISTINCT headlines"), __("May produce duplicate entries")),
 			Prefs::DEBUG_HEADLINE_IDS => array(__("Show article and feed IDs"), __("In the headlines buffer")),
 			Prefs::DISABLE_CONDITIONAL_COUNTERS => array(__("Disable conditional counter updates"), __("May increase server load")),
-			Prefs::CDM_ENABLE_GRID => array(__("Show as grid"), __("On wider screens, if always expanded")),
+			Prefs::CDM_ENABLE_GRID => array(__("Grid view"), __("On wider screens, if always expanded")),
 		];
 
 		// hidden in the main prefs UI (use to hide things that have description set above)
diff --git a/themes/compact.css b/themes/compact.css
index bf65e336f..312b0421c 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -658,9 +658,19 @@ body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed {
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .header[stuck] {
     top: -8px;
   }
-  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded {
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header,
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
     background: white;
     border: 1px solid #ddd;
+    overflow: hidden;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
+    border-top-width: 0;
+    padding: 0 4px 4px 4px;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header {
+    border-bottom-width: 0;
+    padding: 4px;
   }
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .footer {
     border: 0;
@@ -1267,12 +1277,19 @@ video::-webkit-media-controls-overlay-play-button {
   line-height: 1.5;
   font-size: 16px;
 }
+.cdm .intermediate iframe,
+.cdm .content-inner iframe {
+  max-width: 98%;
+  width: auto;
+  height: auto;
+}
 .cdm .intermediate img,
 .cdm .intermediate video,
 .cdm .content-inner img,
 .cdm .content-inner video {
   border-width: 0px;
   max-width: 98%;
+  width: auto;
   height: auto;
 }
 .cdm.expanded {
diff --git a/themes/compact_night.css b/themes/compact_night.css
index ca2888978..17674c4d9 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -658,9 +658,19 @@ body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed {
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .header[stuck] {
     top: -8px;
   }
-  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded {
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header,
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
     background: #333;
     border: 1px solid #222;
+    overflow: hidden;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
+    border-top-width: 0;
+    padding: 0 4px 4px 4px;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header {
+    border-bottom-width: 0;
+    padding: 4px;
   }
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .footer {
     border: 0;
@@ -1267,12 +1277,19 @@ video::-webkit-media-controls-overlay-play-button {
   line-height: 1.5;
   font-size: 16px;
 }
+.cdm .intermediate iframe,
+.cdm .content-inner iframe {
+  max-width: 98%;
+  width: auto;
+  height: auto;
+}
 .cdm .intermediate img,
 .cdm .intermediate video,
 .cdm .content-inner img,
 .cdm .content-inner video {
   border-width: 0px;
   max-width: 98%;
+  width: auto;
   height: auto;
 }
 .cdm.expanded {
diff --git a/themes/light.css b/themes/light.css
index 4c27b8175..da0d33acc 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -658,9 +658,19 @@ body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed {
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .header[stuck] {
     top: -8px;
   }
-  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded {
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header,
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
     background: white;
     border: 1px solid #ddd;
+    overflow: hidden;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
+    border-top-width: 0;
+    padding: 0 4px 4px 4px;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header {
+    border-bottom-width: 0;
+    padding: 4px;
   }
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .footer {
     border: 0;
@@ -1267,12 +1277,19 @@ video::-webkit-media-controls-overlay-play-button {
   line-height: 1.5;
   font-size: 16px;
 }
+.cdm .intermediate iframe,
+.cdm .content-inner iframe {
+  max-width: 98%;
+  width: auto;
+  height: auto;
+}
 .cdm .intermediate img,
 .cdm .intermediate video,
 .cdm .content-inner img,
 .cdm .content-inner video {
   border-width: 0px;
   max-width: 98%;
+  width: auto;
   height: auto;
 }
 .cdm.expanded {
diff --git a/themes/light/cdm.less b/themes/light/cdm.less
index 3a5b602f2..dfcc42e20 100644
--- a/themes/light/cdm.less
+++ b/themes/light/cdm.less
@@ -86,12 +86,20 @@
 		font-size : 16px;
 	}
 
+	.intermediate iframe,
+	.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;
 	}
 }
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index ac21938c7..dc76c6846 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -768,8 +768,22 @@ body.ttrss_main {
 			}
 
 			.cdm.expanded {
-				background : @default-bg;
-				border : 1px solid @border-default;
+
+				.header, .content {
+					background : @default-bg;
+					border : 1px solid @border-default;
+					overflow : hidden;
+				}
+
+				.content {
+					border-top-width : 0;
+					padding : 0 4px 4px 4px;
+				}
+
+				.header {
+					border-bottom-width : 0;
+					padding : 4px;
+				}
 
 				.footer {
 					border : 0;
diff --git a/themes/night.css b/themes/night.css
index 38a8bf491..e06686fdd 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -659,9 +659,19 @@ body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed {
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .header[stuck] {
     top: -8px;
   }
-  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded {
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header,
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
     background: #333;
     border: 1px solid #222;
+    overflow: hidden;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
+    border-top-width: 0;
+    padding: 0 4px 4px 4px;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header {
+    border-bottom-width: 0;
+    padding: 4px;
   }
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .footer {
     border: 0;
@@ -1268,12 +1278,19 @@ video::-webkit-media-controls-overlay-play-button {
   line-height: 1.5;
   font-size: 16px;
 }
+.cdm .intermediate iframe,
+.cdm .content-inner iframe {
+  max-width: 98%;
+  width: auto;
+  height: auto;
+}
 .cdm .intermediate img,
 .cdm .intermediate video,
 .cdm .content-inner img,
 .cdm .content-inner video {
   border-width: 0px;
   max-width: 98%;
+  width: auto;
   height: auto;
 }
 .cdm.expanded {
diff --git a/themes/night_blue.css b/themes/night_blue.css
index e9f4d55a0..a51e800dc 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -659,9 +659,19 @@ body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed {
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .header[stuck] {
     top: -8px;
   }
-  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded {
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header,
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
     background: #333;
     border: 1px solid #222;
+    overflow: hidden;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .content {
+    border-top-width: 0;
+    padding: 0 4px 4px 4px;
+  }
+  body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .header {
+    border-bottom-width: 0;
+    padding: 4px;
   }
   body.ttrss_main #headlines-frame[data-is-cdm="true"][data-is-cdm-expanded="true"][data-enable-grid="true"] .cdm.expanded .footer {
     border: 0;
@@ -1268,12 +1278,19 @@ video::-webkit-media-controls-overlay-play-button {
   line-height: 1.5;
   font-size: 16px;
 }
+.cdm .intermediate iframe,
+.cdm .content-inner iframe {
+  max-width: 98%;
+  width: auto;
+  height: auto;
+}
 .cdm .intermediate img,
 .cdm .intermediate video,
 .cdm .content-inner img,
 .cdm .content-inner video {
   border-width: 0px;
   max-width: 98%;
+  width: auto;
   height: auto;
 }
 .cdm.expanded {