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

update hotkey help dialog a bit

This commit is contained in:
Andrew Dolgov 2018-12-10 08:37:24 +03:00
parent ad6ae725d8
commit 96fccefa62
6 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classes/backend.php
View File

@ -31,12 +31,13 @@ class Backend extends Handler {
__("Other interface tips are available in the Tiny Tiny RSS wiki.") . __("Other interface tips are available in the Tiny Tiny RSS wiki.") .
"</a>"); "</a>");
print "<ul class='helpKbList' id='helpKbList'>"; print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
print "<h2>" . __("Keyboard Shortcuts") . "</h2>"; print "<h2>" . __("Keyboard Shortcuts") . "</h2>";
foreach ($info as $section => $hotkeys) { foreach ($info as $section => $hotkeys) {
print "<li><hr></li>";
print "<li><h3>" . $section . "</h3></li>"; print "<li><h3>" . $section . "</h3></li>";
foreach ($hotkeys as $action => $description) { foreach ($hotkeys as $action => $description) {
@ -72,8 +73,8 @@ class Backend extends Handler {
} }
print "<li>"; print "<li>";
print "<span class='hksequence'>$sequence</span>"; print "<div class='hk'><code>$sequence</code></div>";
print $description; print "<div class='desc'>$description</div>";
print "</li>"; print "</li>";
} }
} }

23
css/default.css
View File

@ -865,23 +865,18 @@ body.ttrss_main ul#filterDlg_Matches li .dijitCheckBox,
body.ttrss_main ul#filterDlg_Actions li .dijitCheckBox { body.ttrss_main ul#filterDlg_Actions li .dijitCheckBox {
margin-right: 4px; margin-right: 4px;
} }
body.ttrss_main ul.helpKbList { body.ttrss_main ul.hotkeys-help li {
max-height: 300px; display: flex;
overflow: auto;
list-style-type: none;
border: 1px solid #dddddd;
margin: 0px 0px 5px 0px;
padding: 5px;
} }
body.ttrss_main ul.helpKbList span.hksequence { body.ttrss_main ul.hotkeys-help li.desc {
width: 6em; flex-grow: 2;
margin-left: 20px; }
body.ttrss_main ul.hotkeys-help .hk {
color: #257aa7; color: #257aa7;
font-weight: bold; width: 100px;
display: inline-block;
} }
body.ttrss_main ul.helpKbList h2 { body.ttrss_main ul.hotkeys-help h3 {
margin-top: 0px; margin: 8px 0px;
} }
body.ttrss_main select.attachments { body.ttrss_main select.attachments {
display: block; display: block;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

30
css/tt-rss.less
View File

@ -1013,24 +1013,22 @@ body.ttrss_main {
margin-right: 4px; margin-right: 4px;
} }
ul.helpKbList { ul.hotkeys-help {
max-height : 300px; li {
overflow : auto; display : flex;
list-style-type : none;
border : 1px solid @border-default;
margin : 0px 0px 5px 0px;
padding : 5px;
span.hksequence {
width : 6em;
margin-left : 20px;
color : @color-accent;
font-weight : bold;
display : inline-block;
} }
h2 { li.desc {
margin-top : 0px; flex-grow : 2;
}
.hk {
color : @color-accent;
width : 100px;
}
h3 {
margin : 8px 0px;
} }
} }

23
themes/night.css
View File

@ -865,23 +865,18 @@ body.ttrss_main ul#filterDlg_Matches li .dijitCheckBox,
body.ttrss_main ul#filterDlg_Actions li .dijitCheckBox { body.ttrss_main ul#filterDlg_Actions li .dijitCheckBox {
margin-right: 4px; margin-right: 4px;
} }
body.ttrss_main ul.helpKbList { body.ttrss_main ul.hotkeys-help li {
max-height: 300px; display: flex;
overflow: auto;
list-style-type: none;
border: 1px solid #222222;
margin: 0px 0px 5px 0px;
padding: 5px;
} }
body.ttrss_main ul.helpKbList span.hksequence { body.ttrss_main ul.hotkeys-help li.desc {
width: 6em; flex-grow: 2;
margin-left: 20px; }
body.ttrss_main ul.hotkeys-help .hk {
color: #b87d2c; color: #b87d2c;
font-weight: bold; width: 100px;
display: inline-block;
} }
body.ttrss_main ul.helpKbList h2 { body.ttrss_main ul.hotkeys-help h3 {
margin-top: 0px; margin: 8px 0px;
} }
body.ttrss_main select.attachments { body.ttrss_main select.attachments {
display: block; display: block;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long