rebuild flat theme with dark base color and rebase night.css on it

This commit is contained in:
Andrew Dolgov 2018-12-07 08:33:28 +03:00
parent 1e3a53c037
commit b786713560
10 changed files with 2339 additions and 598 deletions

View File

@ -1543,101 +1543,6 @@ body.ttrss_prefs hr {
border-color: #ecf4ff; border-color: #ecf4ff;
max-width: 100%; max-width: 100%;
} }
.flat li {
padding: 2px;
}
.flat .filterRules span.inverse,
.flat #filterDlg_Matches span.filterRule.inverse {
color: red;
}
.flat .dijitDialog .dijitDialogPaneContent {
background: #f5f5f5;
}
.flat .dijitAccordionContainer {
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.1);
}
.flat .filterRules span {
display: block;
color: green;
}
.flat #filterDlg_Matches span.filterRule {
color: green;
}
.flat .dijitToolbar {
font-size: 13px;
padding: 0px;
}
.flat .dijitTab:not(.dijitTabChecked) {
background: #f5f5f5;
}
.flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel {
padding: 4px 8px;
font-size: 13px;
}
.flat .dijitMenu .dijitMenuItem td {
padding: 0px;
}
.flat .dijitCheckBox {
border: 0px;
background: #ccc;
}
.flat .dijitCheckBox:before {
font-family: "flat-icon";
content: "\f00c";
color: white;
}
.flat .dijitCheckBox.dijitCheckBoxChecked {
background-color: #69C671;
}
.flat .dijitTree .dijitFolderClosed,
.flat .dijitTree .dijitFolderOpened {
display: none;
}
.flat .dijitTree .dijitTreeRow .dijitTreeExpando {
position: relative;
top: -2px;
}
.flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando {
color: #257aa7;
}
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 1em;
}
.flat .dijitTree .labelParam.filterDisabled,
.flat .dijitTree .dijitTreeLabel.filterDisabled {
text-decoration: line-through;
}
.flat .dijitTree .feedParam {
color: #555555;
float: right;
margin-right: 1em;
}
.flat .dijitTree .filterRules {
display: block;
color: #ccc;
font-size: 12px;
margin-left: 100px;
line-height: normal;
}
.flat .dijitTree .dijitTreeRowSelected .filterRules span {
color: white;
}
.flat .dijitTree .dijitTreeContainer {
max-width: 100%;
}
.flat .dijitTree .dijitTreeRow {
overflow: hidden;
text-overflow: ellipsis;
}
.flat .dijitTree .dijitTreeNode .dijitTreeRow {
padding: 4px 0px 4px;
border-width: 1px;
color: #333;
}
body.ttrss_utility.sanity_failed { body.ttrss_utility.sanity_failed {
background: #900; background: #900;
} }
@ -1879,6 +1784,136 @@ body#sharepopup form {
body#sharepopup input { body#sharepopup input {
width: 100%; width: 100%;
} }
.flat li {
padding: 2px;
}
.flat .filterRules span {
display: block;
color: green;
}
.flat #filterDlg_Matches span.filterRule {
color: green;
}
.flat .dijitToolbar {
font-size: 13px;
padding: 0px;
}
.flat .dijitTab:not(.dijitTabChecked) {
background: #f5f5f5;
}
.flat .dijitCheckBox.dijitCheckBoxChecked {
background-color: #69C671;
}
.flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel {
padding: 4px 8px;
font-size: 13px;
}
.flat .dijitMenu .dijitMenuItem td {
padding: 0px;
}
.flat .dijitCheckBox:before {
font-family: "flat-icon";
content: "\f00c";
color: white;
}
.flat .dijitTree .dijitFolderClosed,
.flat .dijitTree .dijitFolderOpened {
display: none;
}
.flat .dijitTree .dijitTreeRow .dijitTreeExpando {
position: relative;
top: -2px;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 1em;
}
.flat .dijitTree .labelParam.filterDisabled,
.flat .dijitTree .dijitTreeLabel.filterDisabled {
text-decoration: line-through;
}
.flat .dijitTree .feedParam {
color: #555555;
float: right;
margin-right: 1em;
}
.flat .dijitTree .filterRules {
display: block;
color: #ccc;
font-size: 12px;
margin-left: 100px;
line-height: normal;
}
.flat .dijitTree .dijitTreeContainer {
max-width: 100%;
}
.flat .dijitTree .dijitTreeRow {
overflow: hidden;
text-overflow: ellipsis;
}
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../lib/iconfont/MaterialIcons-Regular.eot);
src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
/* For IE6-8 */
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 18px;
/* Preferred icon size */
display: inline-block;
line-height: 1;
color: #777;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
vertical-align: middle;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
font-feature-settings: 'liga';
}
.flat .filterRules span.inverse,
.flat #filterDlg_Matches span.filterRule.inverse {
color: red;
}
.flat .dijitDialog .dijitDialogPaneContent {
background: #f5f5f5;
}
.flat .dijitAccordionContainer {
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.1);
}
.flat .dijitTab:not(.dijitTabChecked) {
background: #f5f5f5;
}
.flat .dijitCheckBox {
background: #ccc;
}
.flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando {
color: #257aa7;
}
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .dijitTreeRowSelected .filterRules span {
color: white;
}
.flat .dijitTree .dijitTreeNode .dijitTreeRow {
padding: 4px 0px 4px;
border-width: 1px;
color: #333;
}
body.ttrss_zoom { body.ttrss_zoom {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -1976,37 +2011,4 @@ body.ttrss_zoom div.post div.content pre {
max-width: 98%; max-width: 98%;
overflow: auto; overflow: auto;
} }
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../lib/iconfont/MaterialIcons-Regular.eot);
src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
/* For IE6-8 */
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 18px;
/* Preferred icon size */
display: inline-block;
line-height: 1;
color: #777;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
vertical-align: middle;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
font-feature-settings: 'liga';
}
/*# sourceMappingURL=default.css.map */ /*# sourceMappingURL=default.css.map */

File diff suppressed because one or more lines are too long

View File

@ -1 +1,4 @@
@import "defines.less"; @import "defines.less";
@import "dijit_light.less";
@import "zoom.less";
@import "../lib/flat-ttrss/flat_combined.css";

View File

@ -24,11 +24,8 @@ body.ttrss_prefs,
@import "tt-rss.less"; @import "tt-rss.less";
@import "cdm.less"; @import "cdm.less";
@import "prefs.less"; @import "prefs.less";
@import "dijit.less";
@import "utility.less"; @import "utility.less";
@import "zoom.less"; @import "dijit_basic.less";
@import "../lib/flat-ttrss/flat_combined.css";
@font-face { @font-face {
font-family: 'Material Icons'; font-family: 'Material Icons';

View File

@ -4,19 +4,6 @@
padding: 2px; padding: 2px;
} }
.filterRules span.inverse,
#filterDlg_Matches span.filterRule.inverse {
color: red;
}
.dijitDialog .dijitDialogPaneContent {
background : @color-panel-bg;
}
.dijitAccordionContainer {
box-shadow : 0px 0px 8px rgba(0,0,0,0.1);
}
.filterRules span { .filterRules span {
display: block; display: block;
color: green; color: green;
@ -26,13 +13,30 @@
color: green; color: green;
} }
.filterRules span.inverse,
#filterDlg_Matches span.filterRule.inverse {
color: red;
}
.dijitToolbar { .dijitToolbar {
font-size: 13px; font-size: 13px;
padding: 0px; padding: 0px;
} }
.dijitAccordionContainer {
box-shadow : 0px 0px 8px rgba(0,0,0,0.1);
}
.dijitDialog .dijitDialogPaneContent {
background : @bg-panel;
}
.dijitTab:not(.dijitTabChecked) { .dijitTab:not(.dijitTabChecked) {
background : @color-panel-bg; background : @bg-panel;
}
.dijitCheckBox.dijitCheckBoxChecked {
background-color : #69C671;
} }
.dijitMenu .dijitMenuItem .dijitMenuItemLabel { .dijitMenu .dijitMenuItem .dijitMenuItemLabel {
@ -44,40 +48,36 @@
padding: 0px; padding: 0px;
} }
.dijitCheckBox {
border : 0px;
background : #ccc;
}
.dijitCheckBox:before { .dijitCheckBox:before {
font-family: "flat-icon"; font-family: "flat-icon";
content: "\f00c"; content: "\f00c";
color: white; color: white;
} }
.dijitCheckBox.dijitCheckBoxChecked {
background-color : #69C671;
}
.dijitTree { .dijitTree {
.dijitFolderClosed, .dijitFolderClosed,
.dijitFolderOpened { .dijitFolderOpened {
display : none; display : none;
} }
.dijitTreeRow .dijitTreeExpando { .dijitTreeRowSelected {
position : relative; .filterRules span {
top : -2px; color : white;
} }
.dijitTreeRowSelected .dijitTreeExpando { .dijitTreeExpando {
color : @color-accent; color : @color-accent;
} }
}
.dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color : white; color : white;
} }
.dijitTreeRow .dijitTreeExpando {
position : relative;
top : -2px;
}
.labelParam { .labelParam {
float: right; float: right;
margin-right: 1em; margin-right: 1em;
@ -102,9 +102,6 @@
line-height : normal; line-height : normal;
} }
.dijitTreeRowSelected .filterRules span {
color : white;
}
.dijitTreeContainer { .dijitTreeContainer {
max-width : 100%; max-width : 100%;
@ -115,10 +112,5 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.dijitTreeNode .dijitTreeRow {
padding : 4px 0px 4px;
border-width : 1px;
color : #333;
}
} }
} }

22
css/dijit_light.less Normal file
View File

@ -0,0 +1,22 @@
.flat {
.dijitDialog .dijitDialogPaneContent {
background : @color-panel-bg;
}
.dijitTab:not(.dijitTabChecked) {
background : @color-panel-bg;
}
.dijitCheckBox {
background : #ccc;
}
.dijitTree {
.dijitTreeNode .dijitTreeRow {
padding : 4px 0px 4px;
border-width : 1px;
color : #333;
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,157 +1,144 @@
@import "../css/default.css"; @import "../css/defines.less";
@import "../lib/flat-ttrss/flat_combined_dark.css";
:root { @bg-main : #333;
--bg-main : #333; @border-main : #666;
--border-main : #666; @border-dark : #222;
--border-dark : #222; @bg-panel : #222;
--bg-panel : #222; @fg-main: #ccc;
--fg-main: #999; @fg-light : #ccc;
--fg-light : #ccc; @bg-active: #2a89bc;
--bg-active: #2a89bc;
body.flat.ttrss_main.ttrss_prefs {
#main, #footer {
background: @bg-panel;
} }
/* main layout overrides */ #footer a {
color : #fff;
}
}
body.flat.ttrss_main.ttrss_index { body.flat.ttrss_main {
color : @fg-main;
#main, #overlay {
color : @fg-main;
background: @bg-main;
}
#toolbar-frame #toolbar {
background : @bg-panel;
border-color : @border-dark;
color : @fg-light;
}
#feeds-holder { #feeds-holder {
background : var(--bg-panel); background : @bg-panel;
box-shadow : inset -1px 0px 2px -1px var(--border-main); box-shadow : inset -1px 0px 2px -1px @border-main;
#feedTree {
.counterNode.aux {
background: @bg-panel;
color: @fg-main;
border-color: @bg-main;
} }
#headlines-frame, .dijitTreeRowSelected {
div.whiteBox { background : @bg-main;
border-color : var(--border-main); border-color : @bg-main transparent;
color : @fg-light;
} }
#main, .dijitTreeRowSelected .dijitTreeLabel {
#overlay {
background : var(--bg-main);
color : var(--fg-main);
}
#content-insert {
background : var(--bg-main);
}
#content-insert_splitter {
border-color : var(--border-main);
background : var(--bg-panel);
}
#feeds-holder_splitter {
border-color : var(--border-main);
background : var(--bg-main);
}
/* misc */
.insensitive {
color : var(--fg-light);
}
hr,
h1,
h2,
h3 {
border-color : var(--border-dark);
}
code {
color : #c90 ! important;
}
pre {
color : var(--fg-main);
background : var(--bg-panel) ! important;
}
/* feeds */
#feeds-holder {
#feedTree .dijitTreeRow {
color : var(--fg-light) ! important;
}
#feedTree.dijitTree .dijitTreeRowHover {
background : var(--bg-panel);
border-color : var(--border-main) transparent;
}
#feedTree.dijitTree .dijitTreeRowSelected {
background : var(--bg-main);
border-color : var(--bg-main) transparent;
}
#feedTree .dijitTreeRowSelected .dijitTreeLabel {
text-shadow : none; text-shadow : none;
} }
#feedTree .counterNode.aux {
background : var(--bg-panel);
color : var(--fg-main);
border-color : var(--bg-main);
} }
} }
/* headlines */
#headlines-frame { #headlines-frame {
background : var(--bg-main); .hl:not(.active):not(.Selected),
color : var(--fg-light); .cdm:not(.Selected) {
background: @bg-main;
}
.hl, .cdm {
border-color : @border-dark;
color : @fg-main;
.title {
color : darken(@fg-main, 30%);
}
.feed a {
color : @fg-light;
}
.content {
color : @fg-main;
}
}
.cdm .footer {
border-color : @bg-panel;
color : @fg-main;
}
.hl.Unread .title,
.cdm.Unread .title {
color : @fg-light;
}
i.material-icons, i.material-icons,
.dijitCheckBox { .dijitCheckBox {
opacity : 0.7; opacity : 0.7;
} }
.hl { .cdm.expandable.active {
border-color : var(--border-dark); background : darken(@bg-main, 5%) ! important;
}
.hl:not(.Selected):not(.active) .title a {
color : var(--fg-main);
}
.hl.Unread:not(.Selected):not(.active) .title a {
color : var(--fg-light);
} }
} }
/* toolbar */ #content-insert {
.post {
#toolbar-frame #toolbar { .header {
background : var(--bg-panel); background : @bg-panel;
border-color : var(--border-dark); border-color: @border-dark;
.dijitButtonText {
color : var(--fg-light);
} }
.dijitSelect,
.dijitDropDownButton .dijitButtonNode,
.dijitComboButton .dijitButtonNode,
.dijitSelect .dijitButtonText {
background : var(--bg-panel);
} }
} }
.hl .feed a, .insensitive {
.cdm .feed a { color : @fg-light;
}
.dijitAccordionInnerContainerSelected .dijitAccordionTitle {
color : white; color : white;
} }
textarea {
.post .header { color : @fg-light;
background : var(--bg-panel);
border-color : var(--border-main);
} }
.post .content, code {
.cdm .content-inner { color : #c90 ! important;
color : var(--fg-main); }
#headlines-frame blockquote,
#content-insert blockquote {
color : @fg-main;
border-color : @color-accent;
}
pre {
color : @fg-main;
background : @bg-panel ! important;
}
ul#filterDlg_Matches, ul#filterDlg_Actions {
background: @bg-panel;
border-color : @border-main;
} }
.post .content img, .post .content img,
@ -169,94 +156,8 @@ body.flat.ttrss_main.ttrss_index {
filter: grayscale(80%); filter: grayscale(80%);
} }
div.cdm div.footer {
border-color : var(--border-dark);
color : var(--fg-light);
}
div.cdm .header a.title {
color : var(--fg-main);
}
div.cdm.Unread .header a.title {
color : var(--fg-light);
}
.cdm.expandable.active .header a.title,
.cdm.expanded.active .header a.title {
color : #2a89bc;
}
#headlines-frame .cdm {
border-color : var(--border-dark);
}
#headlines-frame .cdm .header .author {
color : var(--fg-main);
}
#headlines-frame .cdm.expandable {
background : var(--bg-main) ! important;
}
#headlines-frame .cdm.expandable.Selected {
background : var(--bg-active) ! important;
}
#headlines-frame .cdm.expandable.active {
background : var(--bg-main);
}
#headlines-frame .cdm.expanded.active {
background : var(--bg-main);
}
#content-insert blockquote,
#headlines-frame blockquote,
.dijitContentPane blockquote {
color : var(--fg-main);
border-color : var(--border-main);
}
.dijitInputField.dijitButtonText {
background : var(--bg-main);
}
.cdm .footer img {
opacity : 0.6;
}
#floatingTitle {
background : var(--bg-panel);
border-color : var(--border-main);
}
#floatingTitle * {
color : var(--fg-light) ! important;
}
/* other dijits */
.dijitMenu,
.dijitMenuTable,
.dijitMenu .dijitMenuItem td {
border-color : var(--bg-panel);
background : var(--bg-panel);
color : var(--fg-main);
}
.dijitMenu .dijitMenuItemSelected,
.dijitMenu .dijitMenuItemSelected td {
background : black;
color : white;
}
.dijitMenu .dijitMenuSeparator * {
border-bottom-color : var(--border-dark) ! important;
}
.article-note { .article-note {
background : var(--bg-panel); background : @bg-panel;
border-color : #9a8c59; border-color : #9a8c59;
} }
@ -265,11 +166,11 @@ body.flat.ttrss_main.ttrss_index {
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: var(--border-main); background-color: @border-main;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background-color: var(--bg-panel); background-color: @bg-panel;
} }
} }