valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace a few more hardcoded colors with less variables

This commit is contained in:
Andrew Dolgov 2018-12-09 10:00:41 +03:00
parent 4142f63e10
commit e28a993955
9 changed files with 82 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
css/default.css
View File

@ -10,7 +10,7 @@ body.ttrss_prefs,
margin: 0; margin: 0;
} }
body.ttrss_main { body.ttrss_main {
background: white; background: #ffffff;
color: #000000; color: #000000;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
@ -28,7 +28,7 @@ body.ttrss_main div.post div.header {
color: #909090; color: #909090;
border: 0px solid #dddddd; border: 0px solid #dddddd;
border-bottom-width: 1px; border-bottom-width: 1px;
background: #f0f0f0; background: #f5f5f5;
} }
body.ttrss_main div.post div.header .left, body.ttrss_main div.post div.header .left,
body.ttrss_main div.post div.header .right { body.ttrss_main div.post div.header .right {
@ -394,12 +394,12 @@ body.ttrss_main span.preview {
} }
body.ttrss_main .hl.Selected .hlLabelRef, body.ttrss_main .hl.Selected .hlLabelRef,
body.ttrss_main .hl.active .hlLabelRef { body.ttrss_main .hl.active .hlLabelRef {
color: #063064; color: #000000;
} }
body.ttrss_main span.hlLabelRef { body.ttrss_main span.hlLabelRef {
background-color: #fff7d5; background-color: #fff7d5;
font-size: 8px; font-size: 8px;
color: #063064; color: #000000;
font-weight: normal; font-weight: normal;
margin-left: 2px; margin-left: 2px;
padding: 1px 4px 1px 4px; padding: 1px 4px 1px 4px;
@ -453,7 +453,7 @@ body.ttrss_main .noborder {
border-width: 0px; border-width: 0px;
} }
body.ttrss_main #overlay { body.ttrss_main #overlay {
background: white; background: #ffffff;
left: 0; left: 0;
top: 0; top: 0;
height: 100%; height: 100%;
@ -481,8 +481,8 @@ body.ttrss_main div.whiteBox {
body.ttrss_main div.autocomplete { body.ttrss_main div.autocomplete {
position: absolute; position: absolute;
width: 250px; width: 250px;
background-color: white; background-color: #ffffff;
border: 1px solid #778899; border: 1px solid #dddddd;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
@ -492,7 +492,7 @@ body.ttrss_main div.autocomplete ul {
padding: 0px; padding: 0px;
} }
body.ttrss_main div.autocomplete ul li.selected { body.ttrss_main div.autocomplete ul li.selected {
background-color: #fff7d5; background-color: #e6e6e6;
} }
body.ttrss_main div.autocomplete ul li { body.ttrss_main div.autocomplete ul li {
list-style-type: none; list-style-type: none;
@ -557,7 +557,7 @@ body.ttrss_main div#cmdline {
font-size: 11px; font-size: 11px;
color: #555555; color: #555555;
font-weight: bold; font-weight: bold;
background-color: white; background-color: #ffffff;
border: 1px solid #257aa7; border: 1px solid #257aa7;
padding: 3px 5px 3px 5px; padding: 3px 5px 3px 5px;
z-index: 5; z-index: 5;
@ -597,9 +597,9 @@ body.ttrss_main #feeds-holder #feedTree {
font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
body.ttrss_main #feeds-holder #feedTree .counterNode.aux { body.ttrss_main #feeds-holder #feedTree .counterNode.aux {
background: #f0f0f0; background: #f5f5f5;
color: #999; color: #6f6f6f;
border-color: #f0f0f0; border-color: #dcdcdc;
} }
body.ttrss_main #feeds-holder #feedTree .counterNode { body.ttrss_main #feeds-holder #feedTree .counterNode {
font-weight: bold; font-weight: bold;
@ -637,7 +637,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected { body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1); box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
border-color: #dddddd transparent; border-color: #dddddd transparent;
background: white; background: #ffffff;
color: #333; color: #333;
} }
body.ttrss_main #feeds-holder #feedTree .icon { body.ttrss_main #feeds-holder #feedTree .icon {
@ -806,14 +806,14 @@ body.ttrss_main .player {
margin: 0px 2px 0px 2px; margin: 0px 2px 0px 2px;
width: 50px; width: 50px;
text-align: center; text-align: center;
background: white; background: #ffffff;
} }
body.ttrss_main .player.playing { body.ttrss_main .player.playing {
color: #00c000; color: #00c000;
border-color: #00c000; border-color: #00c000;
} }
body.ttrss_main .player:hover { body.ttrss_main .player:hover {
background: #f0f0f0; background: #f5f5f5;
cursor: pointer; cursor: pointer;
} }
body.ttrss_main #headlines-spacer { body.ttrss_main #headlines-spacer {
@ -841,7 +841,7 @@ body.ttrss_main ul#filterDlg_Actions {
border-style: solid; border-style: solid;
border-color: #dddddd; border-color: #dddddd;
border-width: 1px 1px 1px 1px; border-width: 1px 1px 1px 1px;
background-color: white; background-color: #ffffff;
margin: 0px 0px 5px 0px; margin: 0px 0px 5px 0px;
padding: 4px; padding: 4px;
min-height: 16px; min-height: 16px;
@ -1007,7 +1007,7 @@ body.ttrss_main .panel {
padding: 4px; padding: 4px;
} }
body.ttrss_main .dijitDialog .panel { body.ttrss_main .dijitDialog .panel {
background: white; background: #ffffff;
} }
body.ttrss_main .panel-scrollable { body.ttrss_main .panel-scrollable {
overflow: auto; overflow: auto;
@ -1024,7 +1024,7 @@ body.ttrss_main ul.list-unstyled {
} }
::selection { ::selection {
background: #257aa7; background: #257aa7;
color: white; color: #ffffff;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 4px; width: 4px;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

1
css/defines.less
View File

@ -2,6 +2,7 @@
@fonts-ui: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; @fonts-ui: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
@default-fg: black; @default-fg: black;
@default-bg: white;
@color-accent: #257aa7; @color-accent: #257aa7;
@color-accent-light: lighten(@color-accent, 50%); @color-accent-light: lighten(@color-accent, 50%);
@color-link: @color-accent; @color-link: @color-accent;

36
css/tt-rss.less
View File

@ -1,5 +1,5 @@
body.ttrss_main { body.ttrss_main {
background : white; background : @default-bg;
color : @default-fg; color : @default-fg;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
@ -18,7 +18,7 @@ body.ttrss_main {
color : #909090; color : #909090;
border: 0px solid @border-default; border: 0px solid @border-default;
border-bottom-width: 1px; border-bottom-width: 1px;
background: #f0f0f0; background: @color-panel-bg;
.left, .right { .left, .right {
display : flex; display : flex;
@ -454,13 +454,13 @@ body.ttrss_main {
.hl.Selected .hlLabelRef, .hl.Selected .hlLabelRef,
.hl.active .hlLabelRef { .hl.active .hlLabelRef {
color : #063064; color : @default-fg;
} }
span.hlLabelRef { span.hlLabelRef {
background-color : #fff7d5; background-color : #fff7d5;
font-size : 8px; font-size : 8px;
color : #063064; color : @default-fg;
font-weight : normal; font-weight : normal;
margin-left : 2px; margin-left : 2px;
padding : 1px 4px 1px 4px; padding : 1px 4px 1px 4px;
@ -524,7 +524,7 @@ body.ttrss_main {
} }
#overlay { #overlay {
background : white; background : @default-bg;
left : 0; left : 0;
top : 0; top : 0;
height : 100%; height : 100%;
@ -556,8 +556,8 @@ body.ttrss_main {
div.autocomplete { div.autocomplete {
position : absolute; position : absolute;
width : 250px; width : 250px;
background-color : white; background-color : @default-bg;
border :1px solid #778899; border :1px solid @border-default;
margin : 0px; margin : 0px;
padding : 0px; padding : 0px;
@ -568,7 +568,7 @@ body.ttrss_main {
} }
ul li.selected { ul li.selected {
background-color : #fff7d5; background-color : darken(@default-bg, 10%);
} }
ul li { ul li {
@ -650,7 +650,7 @@ body.ttrss_main {
font-size : 11px; font-size : 11px;
color : @default-text; color : @default-text;
font-weight : bold; font-weight : bold;
background-color : white; background-color : @default-bg;
border : 1px solid @color-accent; border : 1px solid @color-accent;
padding : 3px 5px 3px 5px; padding : 3px 5px 3px 5px;
z-index : 5; z-index : 5;
@ -696,9 +696,9 @@ body.ttrss_main {
font-family : @fonts-ui; font-family : @fonts-ui;
.counterNode.aux { .counterNode.aux {
background : #f0f0f0; background : @color-panel-bg;
color : #999; color : lighten(@default-text, 10%);
border-color : #f0f0f0; border-color : darken(@color-panel-bg, 10%);
} }
.counterNode { .counterNode {
@ -742,7 +742,7 @@ body.ttrss_main {
.dijitTreeNode .dijitTreeRowSelected { .dijitTreeNode .dijitTreeRowSelected {
box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1); box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1);
border-color : @border-default transparent; border-color : @border-default transparent;
background : white; background : @default-bg;
color : #333; color : #333;
} }
@ -945,7 +945,7 @@ body.ttrss_main {
margin : 0px 2px 0px 2px; margin : 0px 2px 0px 2px;
width : 50px; width : 50px;
text-align : center; text-align : center;
background : white; background : @default-bg;
} }
.player.playing { .player.playing {
@ -954,7 +954,7 @@ body.ttrss_main {
} }
.player:hover { .player:hover {
background : #f0f0f0; background : @color-panel-bg;
cursor : pointer; cursor : pointer;
} }
@ -984,7 +984,7 @@ body.ttrss_main {
border-style : solid; border-style : solid;
border-color : @border-default; border-color : @border-default;
border-width : 1px 1px 1px 1px; border-width : 1px 1px 1px 1px;
background-color : white; background-color : @default-bg;
margin : 0px 0px 5px 0px; margin : 0px 0px 5px 0px;
padding : 4px; padding : 4px;
min-height : 16px; min-height : 16px;
@ -1191,7 +1191,7 @@ body.ttrss_main {
} }
.dijitDialog .panel { .dijitDialog .panel {
background : white; background : @default-bg;
} }
.panel-scrollable { .panel-scrollable {
@ -1215,7 +1215,7 @@ body.ttrss_main {
::selection { ::selection {
background : @color-accent; background : @color-accent;
color : white; color : @default-bg;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {

2
index.php
View File

@ -138,7 +138,7 @@
<div id="overlay" style="display : block"> <div id="overlay" style="display : block">
<div id="overlay_inner"> <div id="overlay_inner">
<div class="insensitive"><?php echo __("Loading, please wait...") ?></div> <?php echo __("Loading, please wait...") ?>
<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar" <div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
progress="0" maximum="100"> progress="0" maximum="100">
</div> </div>

2
prefs.php
View File

@ -107,7 +107,7 @@
<div id="overlay"> <div id="overlay">
<div id="overlay_inner"> <div id="overlay_inner">
<div class="insensitive"><?php echo __("Loading, please wait...") ?></div> <?php echo __("Loading, please wait...") ?>
<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar" <div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
progress="0" maximum="100"> progress="0" maximum="100">
</div> </div>

47
themes/night.css
View File

@ -10,7 +10,7 @@ body.ttrss_prefs,
margin: 0; margin: 0;
} }
body.ttrss_main { body.ttrss_main {
background: white; background: #333333;
color: #cccccc; color: #cccccc;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
@ -28,7 +28,7 @@ body.ttrss_main div.post div.header {
color: #909090; color: #909090;
border: 0px solid #222222; border: 0px solid #222222;
border-bottom-width: 1px; border-bottom-width: 1px;
background: #f0f0f0; background: #222222;
} }
body.ttrss_main div.post div.header .left, body.ttrss_main div.post div.header .left,
body.ttrss_main div.post div.header .right { body.ttrss_main div.post div.header .right {
@ -394,12 +394,12 @@ body.ttrss_main span.preview {
} }
body.ttrss_main .hl.Selected .hlLabelRef, body.ttrss_main .hl.Selected .hlLabelRef,
body.ttrss_main .hl.active .hlLabelRef { body.ttrss_main .hl.active .hlLabelRef {
color: #063064; color: #cccccc;
} }
body.ttrss_main span.hlLabelRef { body.ttrss_main span.hlLabelRef {
background-color: #fff7d5; background-color: #fff7d5;
font-size: 8px; font-size: 8px;
color: #063064; color: #cccccc;
font-weight: normal; font-weight: normal;
margin-left: 2px; margin-left: 2px;
padding: 1px 4px 1px 4px; padding: 1px 4px 1px 4px;
@ -453,7 +453,7 @@ body.ttrss_main .noborder {
border-width: 0px; border-width: 0px;
} }
body.ttrss_main #overlay { body.ttrss_main #overlay {
background: white; background: #333333;
left: 0; left: 0;
top: 0; top: 0;
height: 100%; height: 100%;
@ -481,8 +481,8 @@ body.ttrss_main div.whiteBox {
body.ttrss_main div.autocomplete { body.ttrss_main div.autocomplete {
position: absolute; position: absolute;
width: 250px; width: 250px;
background-color: white; background-color: #333333;
border: 1px solid #778899; border: 1px solid #222222;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
@ -492,7 +492,7 @@ body.ttrss_main div.autocomplete ul {
padding: 0px; padding: 0px;
} }
body.ttrss_main div.autocomplete ul li.selected { body.ttrss_main div.autocomplete ul li.selected {
background-color: #fff7d5; background-color: #1a1a1a;
} }
body.ttrss_main div.autocomplete ul li { body.ttrss_main div.autocomplete ul li {
list-style-type: none; list-style-type: none;
@ -557,7 +557,7 @@ body.ttrss_main div#cmdline {
font-size: 11px; font-size: 11px;
color: #cccccc; color: #cccccc;
font-weight: bold; font-weight: bold;
background-color: white; background-color: #333333;
border: 1px solid #b87d2c; border: 1px solid #b87d2c;
padding: 3px 5px 3px 5px; padding: 3px 5px 3px 5px;
z-index: 5; z-index: 5;
@ -597,9 +597,9 @@ body.ttrss_main #feeds-holder #feedTree {
font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
body.ttrss_main #feeds-holder #feedTree .counterNode.aux { body.ttrss_main #feeds-holder #feedTree .counterNode.aux {
background: #f0f0f0; background: #222222;
color: #999; color: #e6e6e6;
border-color: #f0f0f0; border-color: #080808;
} }
body.ttrss_main #feeds-holder #feedTree .counterNode { body.ttrss_main #feeds-holder #feedTree .counterNode {
font-weight: bold; font-weight: bold;
@ -637,7 +637,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected { body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1); box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
border-color: #222222 transparent; border-color: #222222 transparent;
background: white; background: #333333;
color: #333; color: #333;
} }
body.ttrss_main #feeds-holder #feedTree .icon { body.ttrss_main #feeds-holder #feedTree .icon {
@ -806,14 +806,14 @@ body.ttrss_main .player {
margin: 0px 2px 0px 2px; margin: 0px 2px 0px 2px;
width: 50px; width: 50px;
text-align: center; text-align: center;
background: white; background: #333333;
} }
body.ttrss_main .player.playing { body.ttrss_main .player.playing {
color: #00c000; color: #00c000;
border-color: #00c000; border-color: #00c000;
} }
body.ttrss_main .player:hover { body.ttrss_main .player:hover {
background: #f0f0f0; background: #222222;
cursor: pointer; cursor: pointer;
} }
body.ttrss_main #headlines-spacer { body.ttrss_main #headlines-spacer {
@ -841,7 +841,7 @@ body.ttrss_main ul#filterDlg_Actions {
border-style: solid; border-style: solid;
border-color: #222222; border-color: #222222;
border-width: 1px 1px 1px 1px; border-width: 1px 1px 1px 1px;
background-color: white; background-color: #333333;
margin: 0px 0px 5px 0px; margin: 0px 0px 5px 0px;
padding: 4px; padding: 4px;
min-height: 16px; min-height: 16px;
@ -1007,7 +1007,7 @@ body.ttrss_main .panel {
padding: 4px; padding: 4px;
} }
body.ttrss_main .dijitDialog .panel { body.ttrss_main .dijitDialog .panel {
background: white; background: #333333;
} }
body.ttrss_main .panel-scrollable { body.ttrss_main .panel-scrollable {
overflow: auto; overflow: auto;
@ -1024,7 +1024,7 @@ body.ttrss_main ul.list-unstyled {
} }
::selection { ::selection {
background: #b87d2c; background: #b87d2c;
color: white; color: #333333;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 4px; width: 4px;
@ -2000,9 +2000,6 @@ body.flat.ttrss_main #headlines-frame .left i.material-icons,
body.flat.ttrss_main #headlines-frame .left .dijitCheckBox { body.flat.ttrss_main #headlines-frame .left .dijitCheckBox {
opacity: 0.7; opacity: 0.7;
} }
body.flat.ttrss_main #content-insert .post .header {
background: #222222;
}
body.flat.ttrss_main .dijitToolbar .dijitSelect .dijitButtonContents, body.flat.ttrss_main .dijitToolbar .dijitSelect .dijitButtonContents,
body.flat.ttrss_main .dijitToolbar .dijitSelect .dijitButtonNode { body.flat.ttrss_main .dijitToolbar .dijitSelect .dijitButtonNode {
transition: background-color 0.3s linear; transition: background-color 0.3s linear;
@ -2065,8 +2062,12 @@ body.flat.ttrss_main ul#filterDlg_Actions {
border-color: #666666; border-color: #666666;
} }
body.flat.ttrss_main .article-note { body.flat.ttrss_main .article-note {
background: #222222; background: #b87d2c;
border-color: #9a8c59; border-color: #b87d2c;
color: #333333;
}
body.flat.ttrss_main .article-note i.material-icons {
color: #333333;
} }
body.flat.ttrss_main ::-webkit-scrollbar { body.flat.ttrss_main ::-webkit-scrollbar {
width: 4px; width: 4px;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long

38
themes/night.less
View File

@ -6,8 +6,7 @@
@default-text: #ccc; @default-text: #ccc;
@default-fg: @default-text; @default-fg: @default-text;
@border-default: #222; @border-default: #222;
@default-bg : #333;
@bg-main : #333;
@border-light : #666; @border-light : #666;
@ -42,7 +41,7 @@ body.flat.ttrss_main {
#main, #overlay { #main, #overlay {
color : @default-text; color : @default-text;
background: @bg-main; background: @default-bg;
} }
#toolbar-frame #toolbar { #toolbar-frame #toolbar {
@ -58,12 +57,12 @@ body.flat.ttrss_main {
.counterNode.aux { .counterNode.aux {
background: @color-panel-bg; background: @color-panel-bg;
color: @default-text; color: @default-text;
border-color: @bg-main; border-color: @default-bg;
} }
.dijitTreeRowSelected { .dijitTreeRowSelected {
background : @bg-main; background : @default-bg;
border-color : @bg-main transparent; border-color : @default-bg transparent;
color : @fg-light; color : @fg-light;
} }
@ -74,7 +73,7 @@ body.flat.ttrss_main {
} }
#floatingTitle { #floatingTitle {
background-color : @bg-main; background-color : @default-bg;
.feed a { .feed a {
color : @fg-light; color : @fg-light;
@ -92,7 +91,7 @@ body.flat.ttrss_main {
#headlines-frame { #headlines-frame {
.hl:not(.active):not(.Selected):not(.Unread), .hl:not(.active):not(.Selected):not(.Unread),
.cdm.expandable:not(.active):not(.Selected):not(.Unread) { .cdm.expandable:not(.active):not(.Selected):not(.Unread) {
background : @bg-main; background : @default-bg;
} }
.hl.Unread:not(.active):not(.Selected), .hl.Unread:not(.active):not(.Selected),
@ -101,7 +100,7 @@ body.flat.ttrss_main {
} }
.cdm.expanded { .cdm.expanded {
background: @bg-main; background: @default-bg;
} }
.hl.Unread .title, .hl.Unread .title,
@ -184,14 +183,6 @@ body.flat.ttrss_main {
} }
#content-insert {
.post {
.header {
background : @color-panel-bg;
}
}
}
.dijitToolbar { .dijitToolbar {
.dijitSelect { .dijitSelect {
.dijitButtonContents, .dijitButtonNode { .dijitButtonContents, .dijitButtonNode {
@ -237,7 +228,7 @@ body.flat.ttrss_main {
label.dijitButton:hover { label.dijitButton:hover {
border-color : lighten(@border-default, 5%); border-color : lighten(@border-default, 5%);
background-color: @bg-main; background-color: @default-bg;
} }
textarea { textarea {
@ -254,7 +245,7 @@ body.flat.ttrss_main {
} }
.dijitDialog .panel { .dijitDialog .panel {
background-color : @bg-main; background-color : @default-bg;
} }
#headlines-frame blockquote, #headlines-frame blockquote,
@ -290,8 +281,13 @@ body.flat.ttrss_main {
} */ } */
.article-note { .article-note {
background : @color-panel-bg; background : @color-accent;
border-color : #9a8c59; border-color : @color-accent;
color : @default-bg;
i.material-icons {
color : @default-bg;
}
} }
::-webkit-scrollbar { ::-webkit-scrollbar {