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

exp: tweak headline label styles

This commit is contained in:
Andrew Dolgov 2018-12-10 21:39:12 +03:00
parent ad5a43bf66
commit 93dfdb2fcd
7 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/article.php
View File

@ -629,9 +629,9 @@ class Article extends Handler_Protected {
$labels_str = ""; $labels_str = "";
foreach ($labels as $l) { foreach ($labels as $l) {
$labels_str .= sprintf("<span class='hlLabelRef' $labels_str .= sprintf("<div1 class='label'
style='color : %s; background-color : %s'>%s</span>", style='color : %s; background-color : %s'><i class='material-icons' style='color : %s'>label</i><div>%s</div></div1>",
$l[2], $l[3], $l[1]); $l[2], $l[3], $l[2], $l[1]);
} }
return $labels_str; return $labels_str;

2
classes/pref/labels.php
View File

@ -27,7 +27,7 @@ class Pref_Labels extends Handler_Protected {
print "<div class=\"dlgSecCont\">"; print "<div class=\"dlgSecCont\">";
$fg_color = $line['fg_color']; $fg_color = $line['fg_color'];
$bg_color = $line['bg_color']; $bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear' print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear'
id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox' id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox'

21
css/default.css
View File

@ -401,21 +401,24 @@ body.ttrss_main span.preview {
font-size: 12px; font-size: 12px;
padding-left: 4px; padding-left: 4px;
} }
body.ttrss_main .hl.Selected .hlLabelRef, body.ttrss_main .label {
body.ttrss_main .hl.active .hlLabelRef { display: inline-flex;
color: #000000; vertical-align: middle;
}
body.ttrss_main span.hlLabelRef {
background-color: #fff7d5; background-color: #fff7d5;
font-size: 8px; font-size: 9px;
color: #000000; color: #000000;
font-weight: normal; font-weight: normal;
margin-left: 2px; margin-left: 2px;
padding: 1px 4px 1px 4px; padding: 1px 4px;
display: inline-block;
vertical-align: middle;
white-space: nowrap; white-space: nowrap;
border-radius: 4px; border-radius: 4px;
border: 1px solid;
}
body.ttrss_main .label i {
margin-right: 2px;
}
body.ttrss_main .label > * {
align-self: center;
} }
body.ttrss_main i.marked-pic, body.ttrss_main i.marked-pic,
body.ttrss_main i.pub-pic { body.ttrss_main i.pub-pic {

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

24
css/tt-rss.less
View File

@ -464,22 +464,26 @@ body.ttrss_main {
padding-left : 4px; padding-left : 4px;
} }
.hl.Selected .hlLabelRef, .label {
.hl.active .hlLabelRef { display : inline-flex;
color : @default-fg; vertical-align: middle;
}
span.hlLabelRef {
background-color : #fff7d5; background-color : #fff7d5;
font-size : 8px; font-size : 9px;
color : @default-fg; color : @default-fg;
font-weight : normal; font-weight : normal;
margin-left : 2px; margin-left : 2px;
padding : 1px 4px 1px 4px; padding : 1px 4px;
display : inline-block;
vertical-align : middle;
white-space: nowrap; white-space: nowrap;
border-radius : 4px; border-radius : 4px;
border : 1px solid;
i {
margin-right : 2px;
}
> * {
align-self: center;
}
} }
i.marked-pic, i.pub-pic { i.marked-pic, i.pub-pic {

21
themes/night.css
View File

@ -401,21 +401,24 @@ body.ttrss_main span.preview {
font-size: 12px; font-size: 12px;
padding-left: 4px; padding-left: 4px;
} }
body.ttrss_main .hl.Selected .hlLabelRef, body.ttrss_main .label {
body.ttrss_main .hl.active .hlLabelRef { display: inline-flex;
color: #cccccc; vertical-align: middle;
}
body.ttrss_main span.hlLabelRef {
background-color: #fff7d5; background-color: #fff7d5;
font-size: 8px; font-size: 9px;
color: #cccccc; color: #cccccc;
font-weight: normal; font-weight: normal;
margin-left: 2px; margin-left: 2px;
padding: 1px 4px 1px 4px; padding: 1px 4px;
display: inline-block;
vertical-align: middle;
white-space: nowrap; white-space: nowrap;
border-radius: 4px; border-radius: 4px;
border: 1px solid;
}
body.ttrss_main .label i {
margin-right: 2px;
}
body.ttrss_main .label > * {
align-self: center;
} }
body.ttrss_main i.marked-pic, body.ttrss_main i.marked-pic,
body.ttrss_main i.pub-pic { body.ttrss_main i.pub-pic {

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long