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

floatingTitle: show collapse button if in expandable mode

This commit is contained in:
Andrew Dolgov 2019-02-14 16:20:10 +03:00
parent 510f99fa25
commit 848bb6579c
8 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
css/cdm.less Normal file → Executable file
View File

@ -212,6 +212,12 @@ div.cdm.vgrlf .feed {
}
}
#main:not(.expandable) div#floatingTitle {
.collapse {
display : none;
}
}
div#floatingTitle {
position : absolute;
z-index : 5;
@ -256,6 +262,15 @@ div#floatingTitle {
}
}
.excerpt {
display : none;
}
.collapse i {
color : @color-accent;
cursor : pointer;
}
span.author {
color : @default-text;
font-size : 11px;
@ -297,10 +312,6 @@ div#floatingTitle {
color : @default-text;
}
.collapse, .excerpt {
display : none;
}
span.titleWrap {
width : 100%;
white-space : normal;

14
css/default.css
View File

@ -1239,6 +1239,9 @@ div.cdm.vgrlf .feed {
display: inline-block;
padding: 1px 4px 1px 4px;
}
#main:not(.expandable) div#floatingTitle .collapse {
display: none;
}
div#floatingTitle {
position: absolute;
z-index: 5;
@ -1282,6 +1285,13 @@ div#floatingTitle .right i.icon-anchor {
color: #ccc;
cursor: pointer;
}
div#floatingTitle .excerpt {
display: none;
}
div#floatingTitle .collapse i {
color: #257aa7;
cursor: pointer;
}
div#floatingTitle span.author {
color: #555;
font-size: 11px;
@ -1317,10 +1327,6 @@ div#floatingTitle span.updated {
div#floatingTitle div.feed a {
color: #555;
}
div#floatingTitle .collapse,
div#floatingTitle .excerpt {
display: none;
}
div#floatingTitle span.titleWrap {
width: 100%;
white-space: normal;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

10
js/Headlines.js
View File

@ -556,6 +556,9 @@ define(["dojo/_base/declare"], function (declare) {
if (!append) {
// TODO: the below needs to be applied again when switching expanded/expandable on the fly
// via hotkeys, not just on feed load
$("headlines-frame").removeClassName("cdm");
$("headlines-frame").removeClassName("normal");
@ -564,6 +567,13 @@ define(["dojo/_base/declare"], function (declare) {
$("headlines-frame").setAttribute("is-vfeed",
reply['headlines']['is_vfeed'] ? 1 : 0);
// for floating title because it's placed outside of headlines-frame
$("main").removeClassName("expandable");
$("main").removeClassName("expanded");
if (App.isCombinedMode())
$("main").addClassName(App.getInitParam("cdm_expanded") ? " expanded" : " expandable");
Article.setActive(0);
try {

14
themes/night.css
View File

@ -1240,6 +1240,9 @@ div.cdm.vgrlf .feed {
display: inline-block;
padding: 1px 4px 1px 4px;
}
#main:not(.expandable) div#floatingTitle .collapse {
display: none;
}
div#floatingTitle {
position: absolute;
z-index: 5;
@ -1283,6 +1286,13 @@ div#floatingTitle .right i.icon-anchor {
color: #ccc;
cursor: pointer;
}
div#floatingTitle .excerpt {
display: none;
}
div#floatingTitle .collapse i {
color: #b87d2c;
cursor: pointer;
}
div#floatingTitle span.author {
color: #ccc;
font-size: 11px;
@ -1318,10 +1328,6 @@ div#floatingTitle span.updated {
div#floatingTitle div.feed a {
color: #ccc;
}
div#floatingTitle .collapse,
div#floatingTitle .excerpt {
display: none;
}
div#floatingTitle span.titleWrap {
width: 100%;
white-space: normal;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long

14
themes/night_blue.css
View File

@ -1240,6 +1240,9 @@ div.cdm.vgrlf .feed {
display: inline-block;
padding: 1px 4px 1px 4px;
}
#main:not(.expandable) div#floatingTitle .collapse {
display: none;
}
div#floatingTitle {
position: absolute;
z-index: 5;
@ -1283,6 +1286,13 @@ div#floatingTitle .right i.icon-anchor {
color: #ccc;
cursor: pointer;
}
div#floatingTitle .excerpt {
display: none;
}
div#floatingTitle .collapse i {
color: #257aa7;
cursor: pointer;
}
div#floatingTitle span.author {
color: #ccc;
font-size: 11px;
@ -1318,10 +1328,6 @@ div#floatingTitle span.updated {
div#floatingTitle div.feed a {
color: #ccc;
}
div#floatingTitle .collapse,
div#floatingTitle .excerpt {
display: none;
}
div#floatingTitle span.titleWrap {
width: 100%;
white-space: normal;

2
themes/night_blue.css.map
View File

File diff suppressed because one or more lines are too long