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

normalize various font sizes and families between prefs & main UI 

change some dialogs layout a bit to maybe become more readable
This commit is contained in:
Andrew Dolgov 2018-12-04 15:22:22 +03:00
parent 7d3b5f2abd
commit 31e79317b3
8 changed files with 77 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/pref/feeds.php
View File

@ -1270,8 +1270,10 @@ class Pref_Feeds extends Handler_Protected {
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">"; print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">";
print_notice(__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . print __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") .
__("Only main settings profile can be migrated using OPML.")); __("Only main settings profile can be migrated using OPML.");
print "<p/>";
print "<iframe id=\"upload_iframe\" print "<iframe id=\"upload_iframe\"
name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\" name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\"
@ -1290,7 +1292,7 @@ class Pref_Feeds extends Handler_Protected {
print "</form>"; print "</form>";
print "<p/>"; print "<hr>";
print "<form dojoType=\"dijit.form.Form\" id=\"opmlExportForm\">"; print "<form dojoType=\"dijit.form.Form\" id=\"opmlExportForm\">";
@ -1305,11 +1307,13 @@ class Pref_Feeds extends Handler_Protected {
print "</form>"; print "</form>";
print "<hr>"; print "<p/>";
print_notice(__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.')); print "<h2>" . __("Published OPML") . "</h2>";
print_warning("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."); print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
" " .
__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">". print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
__('Display published OPML URL')."</button> "; __('Display published OPML URL')."</button> ";
@ -1321,7 +1325,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">"; print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">";
print "<p>" . __('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.') . "</p>"; print __('Published articles can be subscribed by anyone who knows the following URL:');
$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
"/public.php?op=rss&id=-2&view-mode=all_articles");; "/public.php?op=rss&id=-2&view-mode=all_articles");;

12
classes/pref/filters.php
View File

@ -374,13 +374,13 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "editSave"); print_hidden("method", "editSave");
print_hidden("csrf_token", $_SESSION['csrf_token']); print_hidden("csrf_token", $_SESSION['csrf_token']);
print "<div class=\"dlgSec\">".__("Caption")."</div>"; print "<div class=\"dlgSecHoriz\">".__("Caption")."</div>";
print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">"; print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">";
print "</div>"; print "</div>";
print "<div class=\"dlgSec\">".__("Match")."</div>"; print "<div class=\"dlgSecHoriz\">".__("Match")."</div>";
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"dijit.Toolbar\">";
@ -438,7 +438,7 @@ class Pref_Filters extends Handler_Protected {
print "</div>"; print "</div>";
print "<div class=\"dlgSec\">".__("Apply actions")."</div>"; print "<div class=\"dlgSecHoriz\">".__("Apply actions")."</div>";
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"dijit.Toolbar\">";
@ -863,11 +863,11 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "add"); print_hidden("method", "add");
print_hidden("csrf_token", $_SESSION['csrf_token']); print_hidden("csrf_token", $_SESSION['csrf_token']);
print "<div class=\"dlgSec\">".__("Caption")."</div>"; print "<div class=\"dlgSecHoriz\">".__("Caption")."</div>";
print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">"; print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">";
print "<div class=\"dlgSec\">".__("Match")."</div>"; print "<div class=\"dlgSecHoriz\">".__("Match")."</div>";
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"dijit.Toolbar\">";
@ -894,7 +894,7 @@ class Pref_Filters extends Handler_Protected {
print "</div>"; print "</div>";
print "<div class=\"dlgSec\">".__("Apply actions")."</div>"; print "<div class=\"dlgSecHoriz\">".__("Apply actions")."</div>";
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"dijit.Toolbar\">";

12
classes/pref/prefs.php
View File

@ -351,7 +351,7 @@ class Pref_Prefs extends Handler_Protected {
} else if (function_exists("imagecreatefromstring")) { } else if (function_exists("imagecreatefromstring")) {
print_warning(__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.")); print "<p>" . __("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>";
print "<p>".__("Scan the following code by the Authenticator application:")."</p>"; print "<p>".__("Scan the following code by the Authenticator application:")."</p>";
@ -515,7 +515,7 @@ class Pref_Prefs extends Handler_Protected {
$active_section = $line["section_id"]; $active_section = $line["section_id"];
print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>"; print "<tr><td colspan=\"3\"><h2>".$section_name."</h2></td></tr>";
$lnum = 0; $lnum = 0;
} }
@ -681,8 +681,6 @@ class Pref_Prefs extends Handler_Protected {
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">"; print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
print_notice(__("You will need to reload Tiny Tiny RSS for plugin changes to take effect."));
if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) { if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) {
print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly."); print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
} }
@ -711,7 +709,7 @@ class Pref_Prefs extends Handler_Protected {
print "<table width='100%' class='prefPluginsList'>"; print "<table width='100%' class='prefPluginsList'>";
print "<tr><td colspan='5'><h3>".__("System plugins")."</h3>". print "<tr><td colspan='5'><h2>".__("System plugins")."</h2>".
format_notice(__("System plugins are enabled in <strong>config.php</strong> for all users.")). format_notice(__("System plugins are enabled in <strong>config.php</strong> for all users.")).
"</td></tr>"; "</td></tr>";
@ -769,7 +767,7 @@ class Pref_Prefs extends Handler_Protected {
} }
} }
print "<tr><td colspan='4'><h3>".__("User plugins")."</h3></td></tr>"; print "<tr><td colspan='4'><h2>".__("User plugins")."</h2></td></tr>";
print "<tr class=\"title\"> print "<tr class=\"title\">
<td width=\"5%\">&nbsp;</td> <td width=\"5%\">&nbsp;</td>
@ -833,6 +831,8 @@ class Pref_Prefs extends Handler_Protected {
print "</table>"; print "</table>";
//print "<p>" . __("You will need to reload Tiny Tiny RSS for plugin changes to take effect.") . "</p>";
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">". print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
__("Enable selected plugins")."</button></p>"; __("Enable selected plugins")."</button></p>";

2
css/default.css
View File

File diff suppressed because one or more lines are too long

19
css/prefs.less
View File

@ -17,17 +17,22 @@ body.ttrss_prefs {
} }
div#pref-tabs .dijitContentPane { /* div#pref-tabs .dijitContentPane {
font-size : 13px; font-size : 14px;
} } */
div#pref-tabs { div#pref-tabs {
box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1); box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1);
margin : 0px 5px 0px 5px; margin : 0px 5px 0px 5px;
} }
div#pref-tabs .dijitContentPane h3 { div#pref-tabs .dijitContentPane {
font-size : 14px; h1:first-of-type,
h2:first-of-type,
h3:first-of-type,
h4:first-of-type {
margin-top: 0px;
}
} }
#pref-filter-wrap, #pref-filter-header, #pref-filter-content, #pref-filter-wrap, #pref-filter-header, #pref-filter-content,
@ -45,10 +50,10 @@ body.ttrss_prefs {
/* preferences */ /* preferences */
table.prefPrefsList h3 { /* table.prefPrefsList h3 {
margin-top : 0.5em; margin-top : 0.5em;
margin-bottom : 0px; margin-bottom : 0px;
} } */
tr.title td { tr.title td {
border: 0px solid #ecf4ff; border: 0px solid #ecf4ff;

52
css/tt-rss.less
View File

@ -100,24 +100,31 @@ body.ttrss_main {
} }
h1 { h1 {
font-size : 20px;
font-weight : 600;
text-rendering: optimizelegibility;
font-family : @fonts-ui;
}
h2 {
font-size : 18px; font-size : 18px;
font-weight : 600; font-weight : 600;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
font-family : @fonts-ui; //font-family : @fonts-ui;
} }
h3, h4 { h2 {
font-size : 16px; font-size : 16px;
font-weight : 600; font-weight : 600;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
font-family : @fonts-ui; //font-family : @fonts-ui;
}
h3 {
font-size : 16px;
font-weight : 600;
text-rendering: optimizelegibility;
//font-family : @fonts-ui;
}
h4 {
font-size : 14px;
font-weight : 600;
text-rendering: optimizelegibility;
//font-family : @fonts-ui;
} }
hr { hr {
@ -699,11 +706,20 @@ body.ttrss_main {
} }
div.dlgSec { div.dlgSec {
font-size : 12px; font-size : 14px;
color : @default-text;
font-weight : bold; font-weight : bold;
clear : both; clear : both;
height : 20px; margin : 8px;
position : relative;
top : 8px;
}
div.dlgSecHoriz {
font-size : 14px;
font-weight : bold;
clear : both;
margin-bottom : 8px;
margin-top : 8px;
} }
div.dlgSecCont { div.dlgSecCont {
@ -711,7 +727,6 @@ body.ttrss_main {
left : 150px; left : 150px;
top : -20px; top : -20px;
float : left; float : left;
font-size : 12px;
font-weight : normal; font-weight : normal;
> * { > * {
@ -1196,6 +1211,15 @@ body.ttrss_login {
} }
} }
body.ttrss_main .dijitDialog {
h1:first-of-type,
h2:first-of-type,
h3:first-of-type,
h4:first-of-type {
margin-top: 0px;
}
}
::selection { ::selection {
background : @color-accent; background : @color-accent;
color : white; color : white;

2
plugins/bookmarklets/init.php
View File

@ -19,7 +19,7 @@ class Bookmarklets extends Plugin {
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Bookmarklets')."\">"; print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Bookmarklets')."\">";
print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>"; print __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.");
$bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url()); $bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());

2
plugins/share/init.php
View File

@ -38,6 +38,8 @@ class Share extends Plugin {
function hook_prefs_tab_section($id) { function hook_prefs_tab_section($id) {
if ($id == "prefFeedsPublishedGenerated") { if ($id == "prefFeedsPublishedGenerated") {
print "<hr/>";
print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>"; print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Plugins.Share.clearKeys()\">". print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Plugins.Share.clearKeys()\">".