Browse Source

add night_base so that output files would generate properly, etc

Andrew Dolgov 1 year ago
parent
commit
b6a021461d

+ 2 - 5
classes/pref/prefs.php

@@ -992,12 +992,9 @@ class Pref_Prefs extends Handler_Protected {
 		print_hidden("method", "setpref");
 		print_hidden("key", "USER_STYLESHEET");
 
-		print "<table width='100%'><tr><td>";
-		print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
-			style='font-size : 12px; width : 98%; height: 200px;'
-			placeHolder='body#ttrssMain { font-size : 14px; };'
+		print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea'
+			style='font-size : 12px;'
 			name='value'>$value</textarea>";
-		print "</td></tr></table>";
 
 		print "<div class='dlgButtons'>";
 		print "<button dojoType=\"dijit.form.Button\"

+ 4 - 0
css/default.css

@@ -1472,6 +1472,10 @@ body.ttrss_prefs div#labellistLoading {
 body.ttrss_prefs #errorButton {
   color: red;
 }
+body.ttrss_prefs .user-css-editor {
+  height: 300px;
+  width: 575px;
+}
 body.ttrss_prefs table.prefPluginsList td label,
 body.ttrss_prefs table.prefUserList td {
   cursor: pointer;

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


+ 5 - 0
css/prefs.less

@@ -71,6 +71,11 @@ body.ttrss_prefs {
 		color : red;
 	}
 
+	.user-css-editor {
+		height : 300px;
+		width : 575px;
+	}
+
 	table.prefPluginsList td label, table.prefUserList td {
 		cursor : pointer;
 	}

+ 5 - 0
themes/night.css

@@ -1,4 +1,5 @@
 @import "../lib/flat-ttrss/flat_combined_dark.css";
[email protected] "../lib/flat-ttrss/flat_combined_dark.css";
 body.ttrss_main,
 body.ttrss_prefs,
 #main {
@@ -1472,6 +1473,10 @@ body.ttrss_prefs div#labellistLoading {
 body.ttrss_prefs #errorButton {
   color: red;
 }
+body.ttrss_prefs .user-css-editor {
+  height: 300px;
+  width: 575px;
+}
 body.ttrss_prefs table.prefPluginsList td label,
 body.ttrss_prefs table.prefUserList td {
   cursor: pointer;

File diff suppressed because it is too large
+ 0 - 0
themes/night.css.map


+ 1 - 310
themes/night.less

@@ -1,311 +1,2 @@
[email protected] "../css/defines.less";
[email protected] "night_base.less";
 @import "../lib/flat-ttrss/flat_combined_dark.css";
-
[email protected]: #b87d2c;
[email protected] : #222;
[email protected]: #ccc;
[email protected]: @default-text;
[email protected]: #222;
[email protected] : #333;
-
[email protected] : #666;
-
[email protected]: #ccc;
-
[email protected]: darken(@default-text, 20%);
[email protected] : lighten(@default-text, 10%);
-
-body.flat.ttrss_main.ttrss_prefs {
-	#main, #footer {
-		background: @color-panel-bg;
-	}
-
-	#footer a {
-		color : #fff;
-	}
-
-	td.filename,
-	div.prefHelp {
-		color : @fg-insensitive;
-	}
-}
-
-body.flat.ttrss_main {
-	img[src*='indicator_white.gif'] {
-		filter : invert(1);
-	}
-
-	a:hover {
-		color : lighten(@color-link, 20%);
-	}
-
-	#main, #overlay {
-		color : @default-text;
-		background: @default-bg;
-	}
-
-	#toolbar-frame #toolbar {
-		background : @color-panel-bg;
-		color : @fg-light;
-	}
-
-	#feeds-holder {
-		background : @color-panel-bg;
-		box-shadow : inset -1px 0px 2px -1px @border-light;
-
-		#feedTree {
-			.counterNode.aux {
-				background: @color-panel-bg;
-				color: @default-text;
-				border-color: @default-bg;
-			}
-
-			.dijitTreeRowSelected {
-				background : @default-bg;
-				border-color : @default-bg transparent;
-				color : @fg-light;
-			}
-
-			.dijitTreeRowSelected .dijitTreeLabel {
-				text-shadow : none;
-			}
-		}
-	}
-
-	#floatingTitle {
-		background-color : @default-bg;
-
-		.feed a {
-			color : @fg-light;
-		}
-
-		i.material-icons {
-			opacity : 0.7;
-		}
-	}
-
-	div#floatingTitle.Unread a.title {
-		color : @fg-light;
-	}
-
-	#headlines-frame {
-		.hl:not(.active):not(.Selected):not(.Unread),
-		.cdm.expandable:not(.active):not(.Selected):not(.Unread) {
-			background : @default-bg;
-		}
-
-		.hl.Unread:not(.active):not(.Selected),
-		.cdm.expandable.Unread:not(.active):not(.Selected) {
-			background : @color-panel-bg;
-		}
-
-		.cdm.expanded {
-			background: @default-bg;
-		}
-
-		.hl.Unread .title,
-		.cdm.Unread .title {
-			color : @fg-light;
-		}
-
-		.hl.active,
-		.hl.Selected,
-		.cdm.expandable.Selected {
-			> * {
-				filter : invert(1);
-
-				img {
-					filter : invert(1);
-				}
-			}
-
-			.dijitCheckBox {
-				filter : invert(1);
-			}
-		}
-
-		.hl.Selected.marked,
-		.cdm.expandable.Selected.marked,
-		.hl.active.marked {
-			i.marked-pic {
-				filter : invert(1);
-			}
-		}
-
-		.hl.Selected.published,
-		.cdm.expandable.Selected.published,
-		.hl.active.published {
-			i.pub-pic {
-				filter : invert(1);
-			}
-		}
-
-		.cdm.expanded.active .title,
-		.cdm.expandable.active .title {
-			color : @color-accent;
-		}
-
-		.cdm.expandable.active {
-			background : @color-panel-bg ! important;
-		}
-
-		.hl, .cdm {
-			color : @default-text;
-
-			.title {
-				color : @default-text;
-			}
-
-			.author {
-				color : @fg-insensitive;
-			}
-
-			.updated, .content {
-				color : @default-text;
-			}
-
-			.feed a {
-				color : @fg-light;
-			}
-		}
-
-		.cdm .footer {
-			border-color : @color-panel-bg;
-			color : @default-text;
-		}
-
-		.left {
-			i.material-icons,
-			.dijitCheckBox {
-				opacity: 0.7;
-			}
-		}
-
-	}
-
-	.dijitToolbar {
-		.dijitSelect {
-			.dijitButtonContents, .dijitButtonNode {
-				transition: background-color 0.3s linear;
-			}
-		}
-
-		.dijitSelect:not(.dijitHover) {
-			.dijitButtonContents, .dijitButtonNode {
-				background-color: @color-panel-bg;
-			}
-		}
-	}
-
-	.dijitCheckBox:not(.dijitChecked)::before {
-		color : @fg-insensitive;
-		background: @color-panel-bg;
-	}
-
-	.insensitive {
-		color : @fg-insensitive;
-	}
-
-	.dijitAccordionInnerContainerSelected .dijitAccordionTitle {
-		color : white;
-	}
-
-	.dijitDialog .dijitDialogPaneContent {
-		background : @color-panel-bg;
-	}
-
-	.dijitTab:not(.dijitTabChecked) {
-		background : @color-panel-bg;
-	}
-
-	.dijitTab.dijitTabChecked.dijitTabHover {
-		color : @fg-light;
-	}
-
-	label.dijitButton {
-		border: 1px solid @border-light;
-	}
-
-	label.dijitButton:hover {
-		border-color : lighten(@border-default, 5%);
-		background-color: @default-bg;
-	}
-
-	textarea {
-		color : @fg-light;
-	}
-
-	code {
-		color : #c90 ! important;
-	}
-
-	.panel {
-		background-color : @color-panel-bg;
-		border-color : @border-light;
-	}
-
-	.dijitDialog .panel {
-		background-color : @default-bg;
-	}
-
-	#headlines-frame blockquote,
-	#content-insert blockquote {
-		color : @default-text;
-		border-color : @color-accent;
-	}
-
-	pre {
-		color : @default-text;
-		background : @color-panel-bg ! important;
-	}
-
-	ul#filterDlg_Matches, ul#filterDlg_Actions {
-		background: @color-panel-bg;
-		border-color : @border-light;
-	}
-
-	/*
-	.post .content img,
-	.cdm .content-inner img,
-	.post .content video,
-	.cdm .content-inner video {
-		transition : opacity 0.2s linear, filter 0.2s linear;
-	}
-
-	.post .content img:not(:hover),
-	.cdm .content-inner img:not(:hover),
-	.post .content video:not(:hover),
-	.cdm .content-inner video:not(:hover) {
-		opacity : 0.5;
-		filter: grayscale(80%);
-	} */
-
-	.article-note {
-		background : @color-accent;
-		border-color : @color-accent;
-		color : @default-bg;
-
-		i.material-icons {
-			color : @default-bg;
-		}
-	}
-
-	::-webkit-scrollbar {
-		width: 4px;
-	}
-
-	::-webkit-scrollbar-thumb {
-		background-color: @border-light;
-	}
-
-	::-webkit-scrollbar-track {
-		background-color: @color-panel-bg;
-	}
-
-	.alert {
-		background: @color-panel-bg;
-		border-color : darken(@color-accent, 20%);
-	}
-
-}
-

+ 311 - 0
themes/night_base.less

@@ -0,0 +1,311 @@
[email protected] "../css/defines.less";
[email protected] "../lib/flat-ttrss/flat_combined_dark.css";
+
[email protected]: #b87d2c;
[email protected] : #222;
[email protected]: #ccc;
[email protected]: @default-text;
[email protected]: #222;
[email protected] : #333;
+
[email protected] : #666;
+
[email protected]: #ccc;
+
[email protected]: darken(@default-text, 20%);
[email protected] : lighten(@default-text, 10%);
+
+body.flat.ttrss_main.ttrss_prefs {
+	#main, #footer {
+		background: @color-panel-bg;
+	}
+
+	#footer a {
+		color : #fff;
+	}
+
+	td.filename,
+	div.prefHelp {
+		color : @fg-insensitive;
+	}
+}
+
+body.flat.ttrss_main {
+	img[src*='indicator_white.gif'] {
+		filter : invert(1);
+	}
+
+	a:hover {
+		color : lighten(@color-link, 20%);
+	}
+
+	#main, #overlay {
+		color : @default-text;
+		background: @default-bg;
+	}
+
+	#toolbar-frame #toolbar {
+		background : @color-panel-bg;
+		color : @fg-light;
+	}
+
+	#feeds-holder {
+		background : @color-panel-bg;
+		box-shadow : inset -1px 0px 2px -1px @border-light;
+
+		#feedTree {
+			.counterNode.aux {
+				background: @color-panel-bg;
+				color: @default-text;
+				border-color: @default-bg;
+			}
+
+			.dijitTreeRowSelected {
+				background : @default-bg;
+				border-color : @default-bg transparent;
+				color : @fg-light;
+			}
+
+			.dijitTreeRowSelected .dijitTreeLabel {
+				text-shadow : none;
+			}
+		}
+	}
+
+	#floatingTitle {
+		background-color : @default-bg;
+
+		.feed a {
+			color : @fg-light;
+		}
+
+		i.material-icons {
+			opacity : 0.7;
+		}
+	}
+
+	div#floatingTitle.Unread a.title {
+		color : @fg-light;
+	}
+
+	#headlines-frame {
+		.hl:not(.active):not(.Selected):not(.Unread),
+		.cdm.expandable:not(.active):not(.Selected):not(.Unread) {
+			background : @default-bg;
+		}
+
+		.hl.Unread:not(.active):not(.Selected),
+		.cdm.expandable.Unread:not(.active):not(.Selected) {
+			background : @color-panel-bg;
+		}
+
+		.cdm.expanded {
+			background: @default-bg;
+		}
+
+		.hl.Unread .title,
+		.cdm.Unread .title {
+			color : @fg-light;
+		}
+
+		.hl.active,
+		.hl.Selected,
+		.cdm.expandable.Selected {
+			> * {
+				filter : invert(1);
+
+				img {
+					filter : invert(1);
+				}
+			}
+
+			.dijitCheckBox {
+				filter : invert(1);
+			}
+		}
+
+		.hl.Selected.marked,
+		.cdm.expandable.Selected.marked,
+		.hl.active.marked {
+			i.marked-pic {
+				filter : invert(1);
+			}
+		}
+
+		.hl.Selected.published,
+		.cdm.expandable.Selected.published,
+		.hl.active.published {
+			i.pub-pic {
+				filter : invert(1);
+			}
+		}
+
+		.cdm.expanded.active .title,
+		.cdm.expandable.active .title {
+			color : @color-accent;
+		}
+
+		.cdm.expandable.active {
+			background : @color-panel-bg ! important;
+		}
+
+		.hl, .cdm {
+			color : @default-text;
+
+			.title {
+				color : @default-text;
+			}
+
+			.author {
+				color : @fg-insensitive;
+			}
+
+			.updated, .content {
+				color : @default-text;
+			}
+
+			.feed a {
+				color : @fg-light;
+			}
+		}
+
+		.cdm .footer {
+			border-color : @color-panel-bg;
+			color : @default-text;
+		}
+
+		.left {
+			i.material-icons,
+			.dijitCheckBox {
+				opacity: 0.7;
+			}
+		}
+
+	}
+
+	.dijitToolbar {
+		.dijitSelect {
+			.dijitButtonContents, .dijitButtonNode {
+				transition: background-color 0.3s linear;
+			}
+		}
+
+		.dijitSelect:not(.dijitHover) {
+			.dijitButtonContents, .dijitButtonNode {
+				background-color: @color-panel-bg;
+			}
+		}
+	}
+
+	.dijitCheckBox:not(.dijitChecked)::before {
+		color : @fg-insensitive;
+		background: @color-panel-bg;
+	}
+
+	.insensitive {
+		color : @fg-insensitive;
+	}
+
+	.dijitAccordionInnerContainerSelected .dijitAccordionTitle {
+		color : white;
+	}
+
+	.dijitDialog .dijitDialogPaneContent {
+		background : @color-panel-bg;
+	}
+
+	.dijitTab:not(.dijitTabChecked) {
+		background : @color-panel-bg;
+	}
+
+	.dijitTab.dijitTabChecked.dijitTabHover {
+		color : @fg-light;
+	}
+
+	label.dijitButton {
+		border: 1px solid @border-light;
+	}
+
+	label.dijitButton:hover {
+		border-color : lighten(@border-default, 5%);
+		background-color: @default-bg;
+	}
+
+	textarea {
+		color : @fg-light;
+	}
+
+	code {
+		color : #c90 ! important;
+	}
+
+	.panel {
+		background-color : @color-panel-bg;
+		border-color : @border-light;
+	}
+
+	.dijitDialog .panel {
+		background-color : @default-bg;
+	}
+
+	#headlines-frame blockquote,
+	#content-insert blockquote {
+		color : @default-text;
+		border-color : @color-accent;
+	}
+
+	pre {
+		color : @default-text;
+		background : @color-panel-bg ! important;
+	}
+
+	ul#filterDlg_Matches, ul#filterDlg_Actions {
+		background: @color-panel-bg;
+		border-color : @border-light;
+	}
+
+	/*
+	.post .content img,
+	.cdm .content-inner img,
+	.post .content video,
+	.cdm .content-inner video {
+		transition : opacity 0.2s linear, filter 0.2s linear;
+	}
+
+	.post .content img:not(:hover),
+	.cdm .content-inner img:not(:hover),
+	.post .content video:not(:hover),
+	.cdm .content-inner video:not(:hover) {
+		opacity : 0.5;
+		filter: grayscale(80%);
+	} */
+
+	.article-note {
+		background : @color-accent;
+		border-color : @color-accent;
+		color : @default-bg;
+
+		i.material-icons {
+			color : @default-bg;
+		}
+	}
+
+	::-webkit-scrollbar {
+		width: 4px;
+	}
+
+	::-webkit-scrollbar-thumb {
+		background-color: @border-light;
+	}
+
+	::-webkit-scrollbar-track {
+		background-color: @color-panel-bg;
+	}
+
+	.alert {
+		background: @color-panel-bg;
+		border-color : darken(@color-accent, 20%);
+	}
+
+}
+

+ 4 - 6
themes/night_blue.css

@@ -1435,12 +1435,6 @@ body.ttrss_prefs #header img {
   vertical-align: middle;
   cursor: pointer;
 }
-body.ttrss_prefs #user-css-editor {
-  height: 300px;
-}
-body.ttrss_prefs #user-css-editor .codeflask {
-  position: relative;
-}
 body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon,
 body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
 body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {
@@ -1479,6 +1473,10 @@ body.ttrss_prefs div#labellistLoading {
 body.ttrss_prefs #errorButton {
   color: red;
 }
+body.ttrss_prefs .user-css-editor {
+  height: 300px;
+  width: 575px;
+}
 body.ttrss_prefs table.prefPluginsList td label,
 body.ttrss_prefs table.prefUserList td {
   cursor: pointer;

File diff suppressed because it is too large
+ 0 - 0
themes/night_blue.css.map


+ 1 - 1
themes/night_blue.less

@@ -1,4 +1,4 @@
[email protected] "night.less";
[email protected] "night_base.less";
 @import "../lib/flat-ttrss/flat_combined_dark_blue.css";
 
 @color-accent: #257aa7;

Some files were not shown because too many files changed in this diff