Browse Source

css updates; night theme fixes for changed CSS classes

Andrew Dolgov 11 months ago
parent
commit
2e01a1d41d
4 changed files with 44 additions and 37 deletions
  1. 5 5
      classes/feeds.php
  2. 1 1
      css/default.css
  3. 15 15
      css/tt-rss.less
  4. 23 16
      themes/night.css

+ 5 - 5
classes/feeds.php

@@ -402,7 +402,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<div class='hl hlMenuAttach $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
 
-					$reply['content'] .= "<div class='hlLeft'>";
+					$reply['content'] .= "<div class='left'>";
 
 					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
                         type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
@@ -414,14 +414,14 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "</div>";
 
 					$reply['content'] .= "<div onclick='return hlClicked(event, $id)'
-                    class=\"title\"><span class='hlContent $hlc_suffix'>";
+                    class=\"title\"><span class='hl-content $hlc_suffix'>";
 					$reply['content'] .= "<a class=\"title $hlc_suffix\"
                     href=\"" . htmlspecialchars($line["link"]) . "\"
                     onclick=\"\">" .
 						truncate_string($line["title"], 200);
 
 					if (get_pref('SHOW_CONTENT_PREVIEW')) {
-						$reply['content'] .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
+						$reply['content'] .= "<span class=\"preview\">" . $line["content_preview"] . "</span>";
 					}
 
 					$reply['content'] .= "</a></span>";
@@ -440,12 +440,12 @@ class Feeds extends Handler_Protected {
 					}
 
 
-					$reply['content'] .= "<span class=\"hlUpdated\">";
+					$reply['content'] .= "<span class=\"updated\">";
 
 					$reply['content'] .= "<div title='$date_entered_fmt'>$updated_fmt</div>
                     </span>";
 
-					$reply['content'] .= "<div class=\"hlRight\">";
+					$reply['content'] .= "<div class=\"right\">";
 
 					$reply['content'] .= $score_pic;
 

File diff suppressed because it is too large
+ 1 - 1
css/default.css


+ 15 - 15
css/tt-rss.less

@@ -233,20 +233,20 @@ body.ttrss_main {
 			padding: 4px 6px;
 		}
 
-		div.hlLeft {
+		div.left {
 			display : table-cell;
 			vertical-align : middle;
 			white-space: nowrap;
 		}
 
-		div.hlRight {
+		div.right {
 			display : table-cell;
 			white-space: nowrap;
 			text-align : right;
 			vertical-align : middle;
 		}
 
-		div.hlRight img {
+		div.right img {
 			max-width : 16px;
 			max-height : 16px;
 		}
@@ -272,7 +272,7 @@ body.ttrss_main {
 			color : @color-accent;
 		}
 
-		span.hlUpdated {
+		span.updated {
 			color : @default-text;
 			display : table-cell;
 			vertical-align : middle;
@@ -282,24 +282,24 @@ body.ttrss_main {
 			padding-left : 10px;
 		}
 
-		span.hlUpdated div {
+		span.updated div {
 			display : inline-block;
 		}
 
-		div.hlLeft {
+		div.left {
 			padding-left : 8px;
 		}
 
-		div.hlLeft input {
+		div.left input {
 			margin-left : 4px;
 			margin-right : 4px;
 		}
 
-		div.hlLeft img, div.hlRight img {
+		div.left img, div.right img {
 			margin : 0px 4px;
 		}
 
-		div.hlLeft img {
+		div.left img {
 			width : 16px;
 			height : 16px;
 		}
@@ -311,17 +311,17 @@ body.ttrss_main {
 			color : #777;
 		}
 
-		a.title.high, span.hlContent.high .contentPreview {
+		a.title.high, span.hl-content.high .preview {
 			color : #00aa00;
 		}
 	}
 
-	.hl.Unread a.title.high, .hl.Unread span.hlContent.high .contentPreview {
+	.hl.Unread a.title.high, .hl.Unread span.hl-content.high .preview {
 		color : #00dd00;
 	}
 
-	.hl a.title.low, span.hlContent.low .contentPreview,
-	.hl.Unread a.title.low, .hl.Unread span.hlContent.low .contentPreview {
+	.hl a.title.low, span.hl-content.low .preview,
+	.hl.Unread a.title.low, .hl.Unread span.hl-content.low .preview {
 		color : #909090;
 		text-decoration : line-through;
 	}
@@ -346,7 +346,7 @@ body.ttrss_main {
 
 		a,
 		.feed a,
-		.hlContent a.title,
+		.hl-content a.title,
 		span {
 			color : white;
 		}
@@ -541,7 +541,7 @@ body.ttrss_main {
 	}
 
 
-	span.contentPreview {
+	span.preview {
 		color : #999;
 		font-weight : normal;
 		font-size : 12px;

+ 23 - 16
themes/night.css

@@ -73,12 +73,13 @@ body.claro.ttrss_main #overlay {
 	color : #ccc;
 }
 
-body.claro.ttrss_main .hlFeed a {
+body.claro.ttrss_main .hl .feed a,
+body.claro.ttrss_main .cdm .feed a {
 	color : white;
 }
 
-body.claro.ttrss_main div.cdm.expanded div.cdmFooter,
-body.claro.ttrss_main div.cdm.expandable div.cdmFooter {
+body.claro.ttrss_main div.cdm.expanded div.footer,
+body.claro.ttrss_main div.cdm.expandable div.footer {
 	border-color : #666;
 	color : #ccc;
 }
@@ -87,12 +88,12 @@ body.claro.ttrss_main div.cdm.expandable.Selected {
 	background : #6280AD;
 }
 
-body.claro.ttrss_main div.cdm.expanded.Unread div.cdmHeader a.title,
+body.claro.ttrss_main div.cdm.expanded.Unread .header a.title,
 body.claro.ttrss_main div.cdm.expandable.Unread a.title {
 	color : #ccc;
 }
 
-body.claro.ttrss_main div.cdm.expanded div.cdmHeader a.title,
+body.claro.ttrss_main div.cdm.expanded .header a.title,
 body.claro.ttrss_main div.cdm.expandable a.title {
 	color : #aaa;
 }
@@ -107,21 +108,27 @@ body.claro.ttrss_main .cdm.active {
 	background : transparent ! important;
 }
 
-body.claro.ttrss_main .cdm .cdmContentInner,
+body.claro.ttrss_main .cdm .content-inner,
 body.claro.ttrss_main .cdm .titleWrap {
 	color : #bbb;
 }
 
-#content-insert blockquote, #headlines-frame blockquote, .dijitContentPane blockquote {
+body.claro.ttrss_main #content-insert blockquote,
+body.claro.ttrss_main #headlines-frame blockquote,
+body.claro.ttrss_main .dijitContentPane blockquote {
 	color : #999;
 	border-color : #666;
 }
 
-#content-insert code, #headlines-frame code, .dijitContentPane code {
+body.claro.ttrss_main #content-insert code,
+body.claro.ttrss_main #headlines-frame code,
+body.claro.ttrss_main .dijitContentPane code {
 	color : #009900;
 }
 
-#content-insert pre, #headlines-frame pre, .dijitContentPane pre {
+body.claro.ttrss_main #content-insert pre,
+body.claro.ttrss_main #headlines-frame pre,
+body.claro.ttrss_main.dijitContentPane pre {
 	color : #999;
 	background : black;
 }
@@ -130,21 +137,21 @@ body.claro.ttrss_main .dijitInputField.dijitButtonText {
 	background : #333;
 }
 
-body.claro.ttrss_main .cdm .cdmContentInner img,
+/*body.claro.ttrss_main .cdm .content-inner img,
 body.claro.ttrss_main .cdm img.tinyFeedIcon,
-body.claro.ttrss_main .cdm .cdmFooter img,
+body.claro.ttrss_main .cdm .footer img,
 body.claro.ttrss_main #feedTree img,
-body.claro.ttrss_main .postContent img {
+body.claro.ttrss_main .post .content img {
 	filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); // firefox lol
 	filter: grayscale(1);
 	-webkit-filter: grayscale(1);
-}
+}*/
 
 body.claro.ttrss_main .hl img.hlScorePic {
 	opacity : 0.5;
 }
 
-body.claro.ttrss_main .cdm .cdmFooter img {
+body.claro.ttrss_main .cdm .footer img {
 	opacity : 0.6;
 }
 
@@ -174,7 +181,7 @@ body.claro.ttrss_main .hl {
 	border-color : #666;
 }
 
-body.claro.ttrss_main .hl .hlTitle a {
+body.claro.ttrss_main .hl .hl-title a {
 	color : #ccc;
 }
 
@@ -183,7 +190,7 @@ body.claro.ttrss_main .hl.active {
 	background : #6280AD ! important;
 }
 
-body.claro.ttrss_main .postHeader {
+body.claro.ttrss_main .post .header {
 	background : #333;
 	border-color : #666;
 }