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

center and rework some utility screens

This commit is contained in:
Andrew Dolgov 2019-02-19 14:59:29 +03:00
parent 4f720f906e
commit c11f32ac38
18 changed files with 390 additions and 592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
classes/handler/public.php
View File

@ -781,9 +781,8 @@ class Handler_Public extends Handler {
</head> </head>
<body class='claro ttrss_utility'> <body class='claro ttrss_utility'>
<img class=\"floatingLogo\" src=\"images/logo_small.png\" <div class=\"container\">
alt=\"Tiny Tiny RSS\"/> <h1>".__("Subscribe to feed...")."</h1><div class='content'>";
<h1>".__("Subscribe to feed...")."</h1><div class='content'>";
$rc = Feeds::subscribe_to_feed($feed_url); $rc = Feeds::subscribe_to_feed($feed_url);
@ -858,7 +857,7 @@ class Handler_Public extends Handler {
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form></p>"; </form></p>";
print "</div></body></html>"; print "</div></div></body></html>";
} else { } else {
render_login_form(); render_login_form();
@ -885,9 +884,8 @@ class Handler_Public extends Handler {
echo javascript_tag("lib/prototype.js"); echo javascript_tag("lib/prototype.js");
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head><body class='claro ttrss_utility'>"; </head><body class='claro ttrss_utility'><div class='container'>";
print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
print "<h1>".__("Password recovery")."</h1>"; print "<h1>".__("Password recovery")."</h1>";
print "<div class='content'>"; print "<div class='content'>";
@ -928,12 +926,14 @@ class Handler_Public extends Handler {
print_error("Some of the information provided is missing or incorrect."); print_error("Some of the information provided is missing or incorrect.");
} }
print "<hr/>";
print "<form method=\"GET\" action=\"index.php\"> print "<form method=\"GET\" action=\"index.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
} else if (!$method) { } else if (!$method) {
print_notice(__("You will need to provide valid account name and email. A password reset link will be sent to your email address.")); print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
print "<form method='POST' action='public.php'>"; print "<form method='POST' action='public.php'>";
print "<input type='hidden' name='method' value='do'>"; print "<input type='hidden' name='method' value='do'>";
@ -954,8 +954,10 @@ class Handler_Public extends Handler {
print "<input class='input input-text' type='text' name='test' value='' required>"; print "<input class='input input-text' type='text' name='test' value='' required>";
print "</fieldset>"; print "</fieldset>";
print "<p/>"; print "<hr/>";
print "<fieldset>";
print "<button type='submit'>".__("Reset password")."</button>"; print "<button type='submit'>".__("Reset password")."</button>";
print "</fieldset>";
print "</form>"; print "</form>";
} else if ($method == 'do') { } else if ($method == 'do') {
@ -974,13 +976,13 @@ class Handler_Public extends Handler {
} else { } else {
print_notice("Password reset instructions are being sent to your email address.");
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users $sth = $this->pdo->prepare("SELECT id FROM ttrss_users
WHERE login = ? AND email = ?"); WHERE login = ? AND email = ?");
$sth->execute([$login, $email]); $sth->execute([$login, $email]);
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
print_notice("Password reset instructions are being sent to your email address.");
$id = $row["id"]; $id = $row["id"];
if ($id) { if ($id) {
@ -1029,6 +1031,8 @@ class Handler_Public extends Handler {
print_error("User ID not found."); print_error("User ID not found.");
} }
print "<hr/>";
print "<form method=\"GET\" action=\"index.php\"> print "<form method=\"GET\" action=\"index.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
@ -1036,6 +1040,8 @@ class Handler_Public extends Handler {
} else { } else {
print_error(__("Sorry, login and email combination not found.")); print_error(__("Sorry, login and email combination not found."));
print "<hr/>";
print "<form method=\"GET\" action=\"public.php\"> print "<form method=\"GET\" action=\"public.php\">
<input type=\"hidden\" name=\"op\" value=\"forgotpass\"> <input type=\"hidden\" name=\"op\" value=\"forgotpass\">
<input type=\"submit\" value=\"".__("Go back")."\"> <input type=\"submit\" value=\"".__("Go back")."\">
@ -1046,6 +1052,7 @@ class Handler_Public extends Handler {
} }
print "</div>";
print "</div>"; print "</div>";
print "</body>"; print "</body>";
print "</html>"; print "</html>";
@ -1065,7 +1072,7 @@ class Handler_Public extends Handler {
<head> <head>
<title>Database Updater</title> <title>Database Updater</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="css/default.css"/> <?php echo stylesheet_tag("css/default.css") ?>
<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\"> <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\"> <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
</head> </head>
@ -1080,8 +1087,7 @@ class Handler_Public extends Handler {
} }
</script> </script>
<div class="floatingLogo"><img src="images/logo_small.png"></div> <div class="container">
<h1><?php echo __("Database Updater") ?></h1> <h1><?php echo __("Database Updater") ?></h1>
<div class="content"> <div class="content">
@ -1122,6 +1128,8 @@ class Handler_Public extends Handler {
print_notice("Your Tiny Tiny RSS database is now updated to the latest version."); print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
print "<hr/>";
print "<p><form method=\"GET\" action=\"index.php\"> print "<p><form method=\"GET\" action=\"index.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
@ -1129,6 +1137,8 @@ class Handler_Public extends Handler {
} else { } else {
print "<h2>Your database is up to date.</h2>"; print "<h2>Your database is up to date.</h2>";
print "<hr/>";
print "<p><form method=\"GET\" action=\"index.php\"> print "<p><form method=\"GET\" action=\"index.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
@ -1154,6 +1164,8 @@ class Handler_Public extends Handler {
print_notice("Tiny Tiny RSS database is up to date."); print_notice("Tiny Tiny RSS database is up to date.");
print "<hr/>";
print "<p><form method=\"GET\" action=\"index.php\"> print "<p><form method=\"GET\" action=\"index.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
@ -1162,6 +1174,7 @@ class Handler_Public extends Handler {
} }
?> ?>
</div>
</div> </div>
</body> </body>
</html> </html>

1
classes/opml.php
View File

@ -29,7 +29,6 @@ class Opml extends Handler_Protected {
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head> </head>
<body class='claro ttrss_utility'> <body class='claro ttrss_utility'>
<div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div>
<h1>".__('OPML Utility')."</h1><div class='content'>"; <h1>".__('OPML Utility')."</h1><div class='content'>";
add_feed_category("Imported feeds"); add_feed_category("Imported feeds");

34
classes/pref/users.php
View File

@ -283,35 +283,35 @@ class Pref_Users extends Handler_Protected {
$sth->execute([$pwd_hash, $new_salt, $uid]); $sth->execute([$pwd_hash, $new_salt, $uid]);
if ($show_password) { if ($show_password) {
print T_sprintf("Changed password of user %s to %s", $login, $tmp_user_pwd); print_notice(T_sprintf("Changed password of user %s to %s", $login, $tmp_user_pwd));
} else { } else {
print_notice(T_sprintf("Sending new password of user %s to %s", $login, $email)); print_notice(T_sprintf("Sending new password of user %s to %s", $login, $email));
}
if ($email) { if ($email) {
require_once "lib/MiniTemplator.class.php"; require_once "lib/MiniTemplator.class.php";
$tpl = new MiniTemplator; $tpl = new MiniTemplator;
$tpl->readTemplateFromFile("templates/resetpass_template.txt"); $tpl->readTemplateFromFile("templates/resetpass_template.txt");
$tpl->setVariable('LOGIN', $login); $tpl->setVariable('LOGIN', $login);
$tpl->setVariable('NEWPASS', $tmp_user_pwd); $tpl->setVariable('NEWPASS', $tmp_user_pwd);
$tpl->addBlock('message'); $tpl->addBlock('message');
$message = ""; $message = "";
$tpl->generateOutputToString($message); $tpl->generateOutputToString($message);
$mailer = new Mailer(); $mailer = new Mailer();
$rc = $mailer->mail(["to_name" => $login, $rc = $mailer->mail(["to_name" => $login,
"to_address" => $email, "to_address" => $email,
"subject" => __("[tt-rss] Password change notification"), "subject" => __("[tt-rss] Password change notification"),
"message" => $message]); "message" => $message]);
if (!$rc) print_error($mailer->error()); if (!$rc) print_error($mailer->error());
}
} }
} }

218
css/default.css
View File

@ -123,10 +123,6 @@ body.ttrss_main h4 {
font-weight: 600; font-weight: 600;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
} }
body.ttrss_main hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
body.ttrss_main a { body.ttrss_main a {
color: #257aa7; color: #257aa7;
text-decoration: none; text-decoration: none;
@ -337,54 +333,6 @@ body.ttrss_main .dijitContentPane pre {
max-width: 98%; max-width: 98%;
overflow: auto; overflow: auto;
} }
body.ttrss_main .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
}
body.ttrss_main .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_main .alert,
body.ttrss_main .alert h4 {
color: #c09853;
}
body.ttrss_main .alert h4 {
margin: 0;
}
body.ttrss_main .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_main .alert-success h4 {
color: #468847;
}
body.ttrss_main .alert-danger,
body.ttrss_main .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_main .alert-danger h4,
body.ttrss_main .alert-error h4 {
color: #b94a48;
}
body.ttrss_main .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_main .alert-info h4 {
color: #3a87ad;
}
body.ttrss_main div.prefHelp { body.ttrss_main div.prefHelp {
color: #555; color: #555;
padding: 5px; padding: 5px;
@ -1051,6 +999,72 @@ body.ttrss_main #prefFilterTestResultList .title {
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main #prefFilterTestResultList .feed {
color: #257aa7; color: #257aa7;
} }
body.ttrss_main .alert,
body.ttrss_utility .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
}
body.ttrss_main .alert .close,
body.ttrss_utility .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_main .alert,
body.ttrss_utility .alert,
body.ttrss_main .alert h4,
body.ttrss_utility .alert h4 {
color: #c09853;
}
body.ttrss_main .alert h4,
body.ttrss_utility .alert h4 {
margin: 0;
}
body.ttrss_main .alert-success,
body.ttrss_utility .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_main .alert-success h4,
body.ttrss_utility .alert-success h4 {
color: #468847;
}
body.ttrss_main .alert-danger,
body.ttrss_utility .alert-danger,
body.ttrss_main .alert-error,
body.ttrss_utility .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_main .alert-danger h4,
body.ttrss_utility .alert-danger h4,
body.ttrss_main .alert-error h4,
body.ttrss_utility .alert-error h4 {
color: #b94a48;
}
body.ttrss_main .alert-info,
body.ttrss_utility .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_main .alert-info h4,
body.ttrss_utility .alert-info h4 {
color: #3a87ad;
}
body.ttrss_main hr,
body.ttrss_utility hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
::selection { ::selection {
background: #257aa7; background: #257aa7;
color: white; color: white;
@ -1527,24 +1541,27 @@ body.ttrss_utility.sanity_failed {
body.ttrss_utility { body.ttrss_utility {
background: #f5f5f5; background: #f5f5f5;
color: black; color: black;
padding: 0px; padding: 0;
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
margin-left: auto; display: flex;
margin-right: auto; width: 100%;
max-width: 800px; height: 100%;
justify-content: center;
align-items: center;
} }
body.ttrss_utility form { body.ttrss_utility form {
margin: 10px 0px 0px 0px; margin: 10px 0px 0px 0px;
padding: 0px; padding: 0px;
} }
body.ttrss_utility div.content { body.ttrss_utility div.content {
overflow: hidden;
background: white; background: white;
overflow: hidden;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 10px; padding: 20px;
border-radius: 6px;
box-shadow: 0px 1px 1px -1px rgba(0, 0, 0, 0.1); box-shadow: 0px 1px 1px -1px rgba(0, 0, 0, 0.1);
min-width: 600px;
} }
body.ttrss_utility p.warning { body.ttrss_utility p.warning {
color: red; color: red;
@ -1560,9 +1577,6 @@ body.ttrss_utility div.insensitive-small {
color: gray; color: gray;
font-size: 10px; font-size: 10px;
} }
body.ttrss_utility .floatingLogo {
display: none;
}
body.ttrss_utility a { body.ttrss_utility a {
color: #257aa7; color: #257aa7;
text-decoration: none; text-decoration: none;
@ -1572,68 +1586,16 @@ body.ttrss_utility a:focus {
color: #133d54; color: #133d54;
text-decoration: underline; text-decoration: underline;
} }
body.ttrss_utility .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
body.ttrss_utility .alert,
body.ttrss_utility .alert h4 {
color: #c09853;
}
body.ttrss_utility .alert h4 {
margin: 0;
}
body.ttrss_utility .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_utility .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_utility .alert-success h4 {
color: #468847;
}
body.ttrss_utility .alert-danger,
body.ttrss_utility .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_utility .alert-danger h4,
body.ttrss_utility .alert-error h4 {
color: #b94a48;
}
body.ttrss_utility .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_utility .alert-info h4 {
color: #3a87ad;
}
body.ttrss_utility h1 { body.ttrss_utility h1 {
color: #257aa7; color: gray;
font-size: 32px; font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
margin: 20px 0px 5px 0px; font-size: 18px;
text-shadow: 0 0 6px #fff; margin: 10px 0 0 0;
} }
body.ttrss_utility h2 { body.ttrss_utility h2,
body.ttrss_utility h3,
body.ttrss_utility h4 {
color: #257aa7; color: #257aa7;
font-size: 14pt;
border-width: 0px 0px 1px 0px;
border-color: #f0f0f0;
border-style: solid;
} }
body.ttrss_utility div.content > h2 { body.ttrss_utility div.content > h2 {
margin-top: 0px; margin-top: 0px;
@ -1700,22 +1662,14 @@ body.ttrss_utility div.autocomplete ul li {
} }
body.ttrss_utility fieldset { body.ttrss_utility fieldset {
border-width: 0px; border-width: 0px;
padding: 0px 0px 5px 0px; padding: 5px 0px;
margin: 0px;
} }
body.ttrss_utility fieldset input { body.ttrss_utility fieldset > label:first-of-type {
font-family: sans-serif;
font-size: medium;
border-spacing: 2px;
border: 1px solid #b5bcc7;
padding: 2px;
}
body.ttrss_utility fieldset label {
width: 120px; width: 120px;
margin-right: 20px; margin-right: 20px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
color: gray; font-weight: bold;
} }
body.ttrss_utility body.otp { body.ttrss_utility body.otp {
margin: 1em; margin: 1em;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

130
css/tt-rss.less
View File

@ -138,11 +138,6 @@ body.ttrss_main {
//font-family : @fonts-ui; //font-family : @fonts-ui;
} }
hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
a { a {
color: @color-link; color: @color-link;
text-decoration: none; text-decoration: none;
@ -386,64 +381,6 @@ body.ttrss_main {
overflow: auto; overflow: auto;
} }
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
.close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor : pointer;
}
}
.alert,
.alert h4 {
color: #c09853;
}
.alert h4 {
margin: 0;
}
.alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
.alert-success h4 {
color: #468847;
}
.alert-danger,
.alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-danger h4,
.alert-error h4 {
color: #b94a48;
}
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
h4 {
color: #3a87ad;
}
}
div.prefHelp { div.prefHelp {
color : @default-text; color : @default-text;
padding : 5px; padding : 5px;
@ -1266,6 +1203,72 @@ body.ttrss_main {
} }
body.ttrss_main, body.ttrss_utility {
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
.close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor : pointer;
}
}
.alert,
.alert h4 {
color: #c09853;
}
.alert h4 {
margin: 0;
}
.alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
.alert-success h4 {
color: #468847;
}
.alert-danger,
.alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-danger h4,
.alert-error h4 {
color: #b94a48;
}
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
h4 {
color: #3a87ad;
}
}
hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
}
::selection { ::selection {
background : @color-accent; background : @color-accent;
color : @default-bg; color : @default-bg;
@ -1286,3 +1289,4 @@ body.ttrss_main {
video::-webkit-media-controls-overlay-play-button { video::-webkit-media-controls-overlay-play-button {
display: none; display: none;
} }

110
css/utility.less
View File

@ -5,12 +5,15 @@ body.ttrss_utility.sanity_failed {
body.ttrss_utility { body.ttrss_utility {
background : @color-panel-bg; background : @color-panel-bg;
color : @default-fg; color : @default-fg;
padding : 0px; padding : 0;
margin : 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
margin-left : auto; display : flex;
margin-right : auto; width : 100%;
max-width : 800px; height : 100%;
justify-content : center;
align-items : center;
form { form {
margin : 10px 0px 0px 0px; margin : 10px 0px 0px 0px;
@ -18,12 +21,12 @@ body.ttrss_utility {
} }
div.content { div.content {
overflow : hidden;
background : white; background : white;
overflow : hidden;
border : 1px solid #ddd; border : 1px solid #ddd;
padding : 10px; padding : 20px;
border-radius : 6px;
box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1); box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1);
min-width : 600px;
} }
p.warning { p.warning {
@ -43,10 +46,6 @@ body.ttrss_utility {
font-size : 10px; font-size : 10px;
} }
.floatingLogo {
display : none;
}
a { a {
color : @color-link; color : @color-link;
text-decoration : none; text-decoration : none;
@ -58,79 +57,15 @@ body.ttrss_utility {
text-decoration: underline; text-decoration: underline;
} }
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.alert,
.alert h4 {
color: #c09853;
}
.alert h4 {
margin: 0;
}
.alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor : pointer;
}
.alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
.alert-success h4 {
color: #468847;
}
.alert-danger,
.alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-danger h4,
.alert-error h4 {
color: #b94a48;
}
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
.alert-info h4 {
color: #3a87ad;
}
h1 { h1 {
color : @color-accent; color : gray;
font-size : 32px; font-family: @fonts-ui-bold;
margin : 20px 0px 5px 0px; font-size : 18px;
text-shadow : 0 0 6px #fff; margin : 10px 0 0 0;
} }
h2 { h2, h3, h4 {
color : @color-accent; color : @color-accent;
font-size : 14pt;
border-width : 0px 0px 1px 0px;
border-color : #f0f0f0;
border-style : solid;
} }
div.content > h2 { div.content > h2 {
@ -211,24 +146,15 @@ body.ttrss_utility {
fieldset { fieldset {
border-width : 0px; border-width : 0px;
padding : 0px 0px 5px 0px; padding : 5px 0px;
margin : 0px;
} }
fieldset input { fieldset > label:first-of-type {
font-family : sans-serif;
font-size : medium;
border-spacing : 2px;
border : 1px solid #b5bcc7;
padding : 2px;
}
fieldset label {
width : 120px; width : 120px;
margin-right : 20px; margin-right : 20px;
display : inline-block; display : inline-block;
text-align : right; text-align : right;
color : gray; font-weight : bold;
} }
body.otp { body.otp {

BIN
images/logo_wide.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
images/toolbar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 415 B

1
include/sanity_check.php
View File

@ -183,7 +183,6 @@
<link rel="stylesheet" type="text/css" href="css/default.css"> <link rel="stylesheet" type="text/css" href="css/default.css">
</head> </head>
<body class='sanity_failed claro ttrss_utility'> <body class='sanity_failed claro ttrss_utility'>
<div class="floatingLogo"><img src="images/logo_small.png"></div>
<div class="content"> <div class="content">
<h1>Startup failed</h1> <h1>Startup failed</h1>

2
install/index.php
View File

@ -150,8 +150,6 @@
?> ?>
<div class="floatingLogo"><img src="../images/logo_small.png"></div>
<h1>Tiny Tiny RSS Installer</h1> <h1>Tiny Tiny RSS Installer</h1>
<div class='content'> <div class='content'>

2
register.php
View File

@ -180,8 +180,6 @@
<body class="claro ttrss_utility"> <body class="claro ttrss_utility">
<div class="floatingLogo"><img src="images/logo_small.png"></div>
<h1><?php echo __("Create new account") ?></h1> <h1><?php echo __("Create new account") ?></h1>
<div class="content"> <div class="content">

218
themes/night.css
View File

@ -124,10 +124,6 @@ body.ttrss_main h4 {
font-weight: 600; font-weight: 600;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
} }
body.ttrss_main hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
body.ttrss_main a { body.ttrss_main a {
color: #b87d2c; color: #b87d2c;
text-decoration: none; text-decoration: none;
@ -338,54 +334,6 @@ body.ttrss_main .dijitContentPane pre {
max-width: 98%; max-width: 98%;
overflow: auto; overflow: auto;
} }
body.ttrss_main .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
}
body.ttrss_main .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_main .alert,
body.ttrss_main .alert h4 {
color: #c09853;
}
body.ttrss_main .alert h4 {
margin: 0;
}
body.ttrss_main .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_main .alert-success h4 {
color: #468847;
}
body.ttrss_main .alert-danger,
body.ttrss_main .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_main .alert-danger h4,
body.ttrss_main .alert-error h4 {
color: #b94a48;
}
body.ttrss_main .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_main .alert-info h4 {
color: #3a87ad;
}
body.ttrss_main div.prefHelp { body.ttrss_main div.prefHelp {
color: #ccc; color: #ccc;
padding: 5px; padding: 5px;
@ -1052,6 +1000,72 @@ body.ttrss_main #prefFilterTestResultList .title {
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main #prefFilterTestResultList .feed {
color: #b87d2c; color: #b87d2c;
} }
body.ttrss_main .alert,
body.ttrss_utility .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
}
body.ttrss_main .alert .close,
body.ttrss_utility .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_main .alert,
body.ttrss_utility .alert,
body.ttrss_main .alert h4,
body.ttrss_utility .alert h4 {
color: #c09853;
}
body.ttrss_main .alert h4,
body.ttrss_utility .alert h4 {
margin: 0;
}
body.ttrss_main .alert-success,
body.ttrss_utility .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_main .alert-success h4,
body.ttrss_utility .alert-success h4 {
color: #468847;
}
body.ttrss_main .alert-danger,
body.ttrss_utility .alert-danger,
body.ttrss_main .alert-error,
body.ttrss_utility .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_main .alert-danger h4,
body.ttrss_utility .alert-danger h4,
body.ttrss_main .alert-error h4,
body.ttrss_utility .alert-error h4 {
color: #b94a48;
}
body.ttrss_main .alert-info,
body.ttrss_utility .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_main .alert-info h4,
body.ttrss_utility .alert-info h4 {
color: #3a87ad;
}
body.ttrss_main hr,
body.ttrss_utility hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
::selection { ::selection {
background: #b87d2c; background: #b87d2c;
color: #333; color: #333;
@ -1528,24 +1542,27 @@ body.ttrss_utility.sanity_failed {
body.ttrss_utility { body.ttrss_utility {
background: #222; background: #222;
color: #ccc; color: #ccc;
padding: 0px; padding: 0;
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
margin-left: auto; display: flex;
margin-right: auto; width: 100%;
max-width: 800px; height: 100%;
justify-content: center;
align-items: center;
} }
body.ttrss_utility form { body.ttrss_utility form {
margin: 10px 0px 0px 0px; margin: 10px 0px 0px 0px;
padding: 0px; padding: 0px;
} }
body.ttrss_utility div.content { body.ttrss_utility div.content {
overflow: hidden;
background: white; background: white;
overflow: hidden;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 10px; padding: 20px;
border-radius: 6px;
box-shadow: 0px 1px 1px -1px rgba(0, 0, 0, 0.1); box-shadow: 0px 1px 1px -1px rgba(0, 0, 0, 0.1);
min-width: 600px;
} }
body.ttrss_utility p.warning { body.ttrss_utility p.warning {
color: red; color: red;
@ -1561,9 +1578,6 @@ body.ttrss_utility div.insensitive-small {
color: gray; color: gray;
font-size: 10px; font-size: 10px;
} }
body.ttrss_utility .floatingLogo {
display: none;
}
body.ttrss_utility a { body.ttrss_utility a {
color: #b87d2c; color: #b87d2c;
text-decoration: none; text-decoration: none;
@ -1573,68 +1587,16 @@ body.ttrss_utility a:focus {
color: #664518; color: #664518;
text-decoration: underline; text-decoration: underline;
} }
body.ttrss_utility .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
body.ttrss_utility .alert,
body.ttrss_utility .alert h4 {
color: #c09853;
}
body.ttrss_utility .alert h4 {
margin: 0;
}
body.ttrss_utility .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_utility .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_utility .alert-success h4 {
color: #468847;
}
body.ttrss_utility .alert-danger,
body.ttrss_utility .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_utility .alert-danger h4,
body.ttrss_utility .alert-error h4 {
color: #b94a48;
}
body.ttrss_utility .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_utility .alert-info h4 {
color: #3a87ad;
}
body.ttrss_utility h1 { body.ttrss_utility h1 {
color: #b87d2c; color: gray;
font-size: 32px; font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
margin: 20px 0px 5px 0px; font-size: 18px;
text-shadow: 0 0 6px #fff; margin: 10px 0 0 0;
} }
body.ttrss_utility h2 { body.ttrss_utility h2,
body.ttrss_utility h3,
body.ttrss_utility h4 {
color: #b87d2c; color: #b87d2c;
font-size: 14pt;
border-width: 0px 0px 1px 0px;
border-color: #f0f0f0;
border-style: solid;
} }
body.ttrss_utility div.content > h2 { body.ttrss_utility div.content > h2 {
margin-top: 0px; margin-top: 0px;
@ -1701,22 +1663,14 @@ body.ttrss_utility div.autocomplete ul li {
} }
body.ttrss_utility fieldset { body.ttrss_utility fieldset {
border-width: 0px; border-width: 0px;
padding: 0px 0px 5px 0px; padding: 5px 0px;
margin: 0px;
} }
body.ttrss_utility fieldset input { body.ttrss_utility fieldset > label:first-of-type {
font-family: sans-serif;
font-size: medium;
border-spacing: 2px;
border: 1px solid #b5bcc7;
padding: 2px;
}
body.ttrss_utility fieldset label {
width: 120px; width: 120px;
margin-right: 20px; margin-right: 20px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
color: gray; font-weight: bold;
} }
body.ttrss_utility body.otp { body.ttrss_utility body.otp {
margin: 1em; margin: 1em;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long

218
themes/night_blue.css
View File

@ -124,10 +124,6 @@ body.ttrss_main h4 {
font-weight: 600; font-weight: 600;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
} }
body.ttrss_main hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
body.ttrss_main a { body.ttrss_main a {
color: #257aa7; color: #257aa7;
text-decoration: none; text-decoration: none;
@ -338,54 +334,6 @@ body.ttrss_main .dijitContentPane pre {
max-width: 98%; max-width: 98%;
overflow: auto; overflow: auto;
} }
body.ttrss_main .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
}
body.ttrss_main .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_main .alert,
body.ttrss_main .alert h4 {
color: #c09853;
}
body.ttrss_main .alert h4 {
margin: 0;
}
body.ttrss_main .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_main .alert-success h4 {
color: #468847;
}
body.ttrss_main .alert-danger,
body.ttrss_main .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_main .alert-danger h4,
body.ttrss_main .alert-error h4 {
color: #b94a48;
}
body.ttrss_main .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_main .alert-info h4 {
color: #3a87ad;
}
body.ttrss_main div.prefHelp { body.ttrss_main div.prefHelp {
color: #ccc; color: #ccc;
padding: 5px; padding: 5px;
@ -1052,6 +1000,72 @@ body.ttrss_main #prefFilterTestResultList .title {
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main #prefFilterTestResultList .feed {
color: #257aa7; color: #257aa7;
} }
body.ttrss_main .alert,
body.ttrss_utility .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 10px;
/* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
}
body.ttrss_main .alert .close,
body.ttrss_utility .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_main .alert,
body.ttrss_utility .alert,
body.ttrss_main .alert h4,
body.ttrss_utility .alert h4 {
color: #c09853;
}
body.ttrss_main .alert h4,
body.ttrss_utility .alert h4 {
margin: 0;
}
body.ttrss_main .alert-success,
body.ttrss_utility .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_main .alert-success h4,
body.ttrss_utility .alert-success h4 {
color: #468847;
}
body.ttrss_main .alert-danger,
body.ttrss_utility .alert-danger,
body.ttrss_main .alert-error,
body.ttrss_utility .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_main .alert-danger h4,
body.ttrss_utility .alert-danger h4,
body.ttrss_main .alert-error h4,
body.ttrss_utility .alert-error h4 {
color: #b94a48;
}
body.ttrss_main .alert-info,
body.ttrss_utility .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_main .alert-info h4,
body.ttrss_utility .alert-info h4 {
color: #3a87ad;
}
body.ttrss_main hr,
body.ttrss_utility hr {
border: 0px solid #ccc;
border-bottom-width: 1px;
}
::selection { ::selection {
background: #257aa7; background: #257aa7;
color: #333; color: #333;
@ -1528,24 +1542,27 @@ body.ttrss_utility.sanity_failed {
body.ttrss_utility { body.ttrss_utility {
background: #222; background: #222;
color: #ccc; color: #ccc;
padding: 0px; padding: 0;
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
margin-left: auto; display: flex;
margin-right: auto; width: 100%;
max-width: 800px; height: 100%;
justify-content: center;
align-items: center;
} }
body.ttrss_utility form { body.ttrss_utility form {
margin: 10px 0px 0px 0px; margin: 10px 0px 0px 0px;
padding: 0px; padding: 0px;
} }
body.ttrss_utility div.content { body.ttrss_utility div.content {
overflow: hidden;
background: white; background: white;
overflow: hidden;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 10px; padding: 20px;
border-radius: 6px;
box-shadow: 0px 1px 1px -1px rgba(0, 0, 0, 0.1); box-shadow: 0px 1px 1px -1px rgba(0, 0, 0, 0.1);
min-width: 600px;
} }
body.ttrss_utility p.warning { body.ttrss_utility p.warning {
color: red; color: red;
@ -1561,9 +1578,6 @@ body.ttrss_utility div.insensitive-small {
color: gray; color: gray;
font-size: 10px; font-size: 10px;
} }
body.ttrss_utility .floatingLogo {
display: none;
}
body.ttrss_utility a { body.ttrss_utility a {
color: #257aa7; color: #257aa7;
text-decoration: none; text-decoration: none;
@ -1573,68 +1587,16 @@ body.ttrss_utility a:focus {
color: #133d54; color: #133d54;
text-decoration: underline; text-decoration: underline;
} }
body.ttrss_utility .alert {
padding: 8px 35px 8px 14px;
margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
body.ttrss_utility .alert,
body.ttrss_utility .alert h4 {
color: #c09853;
}
body.ttrss_utility .alert h4 {
margin: 0;
}
body.ttrss_utility .alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 20px;
cursor: pointer;
}
body.ttrss_utility .alert-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
}
body.ttrss_utility .alert-success h4 {
color: #468847;
}
body.ttrss_utility .alert-danger,
body.ttrss_utility .alert-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
body.ttrss_utility .alert-danger h4,
body.ttrss_utility .alert-error h4 {
color: #b94a48;
}
body.ttrss_utility .alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
body.ttrss_utility .alert-info h4 {
color: #3a87ad;
}
body.ttrss_utility h1 { body.ttrss_utility h1 {
color: #257aa7; color: gray;
font-size: 32px; font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
margin: 20px 0px 5px 0px; font-size: 18px;
text-shadow: 0 0 6px #fff; margin: 10px 0 0 0;
} }
body.ttrss_utility h2 { body.ttrss_utility h2,
body.ttrss_utility h3,
body.ttrss_utility h4 {
color: #257aa7; color: #257aa7;
font-size: 14pt;
border-width: 0px 0px 1px 0px;
border-color: #f0f0f0;
border-style: solid;
} }
body.ttrss_utility div.content > h2 { body.ttrss_utility div.content > h2 {
margin-top: 0px; margin-top: 0px;
@ -1701,22 +1663,14 @@ body.ttrss_utility div.autocomplete ul li {
} }
body.ttrss_utility fieldset { body.ttrss_utility fieldset {
border-width: 0px; border-width: 0px;
padding: 0px 0px 5px 0px; padding: 5px 0px;
margin: 0px;
} }
body.ttrss_utility fieldset input { body.ttrss_utility fieldset > label:first-of-type {
font-family: sans-serif;
font-size: medium;
border-spacing: 2px;
border: 1px solid #b5bcc7;
padding: 2px;
}
body.ttrss_utility fieldset label {
width: 120px; width: 120px;
margin-right: 20px; margin-right: 20px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
color: gray; font-weight: bold;
} }
body.ttrss_utility body.otp { body.ttrss_utility body.otp {
margin: 1em; margin: 1em;

2
themes/night_blue.css.map
View File

File diff suppressed because one or more lines are too long

1
update.php
View File

@ -63,7 +63,6 @@
</head> </head>
<body> <body>
<div class="floatingLogo"><img src="images/logo_small.png"></div>
<h1><?php echo __("Tiny Tiny RSS data update script.") ?></h1> <h1><?php echo __("Tiny Tiny RSS data update script.") ?></h1>
<?php print_error("Please run this script from the command line. Use option \"--help\" to display command help if this error is displayed erroneously."); ?> <?php print_error("Please run this script from the command line. Use option \"--help\" to display command help if this error is displayed erroneously."); ?>