blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

further stylesheet simplification related fixes

Browse source
This commit is contained in:
Andrew Dolgov 2017-12-03 13:25:34 +03:00
parent 3f2a871421
commit 09bc54c690
11 changed files with 56 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom-to-html.xsl
View file

@ -9,11 +9,11 @@
<html> <html>
<head> <head>
<title><xsl:value-of select="atom:title"/></title> <title><xsl:value-of select="atom:title"/></title>
<link rel="stylesheet" type="text/css" href="css/utility.css"/> <link rel="stylesheet" type="text/css" href="css/default.css"/>
<script language="javascript" src="lib/xsl_mop-up.js"></script> <script language="javascript" src="lib/xsl_mop-up.js"></script>
</head> </head>
<body onload="go_decoding()"> <body onload="go_decoding()" class="ttrss_utility">
<div id="cometestme" style="display:none;"> <div id="cometestme" style="display:none;">
<xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text> <xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text>

4
classes/feeds.php
View file

@ -1201,10 +1201,10 @@ class Feeds extends Handler_Protected {
?> ?>
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="css/utility.css"> <?php echo stylesheet_tag("css/default.css") ?>
<title>Feed Debugger</title> <title>Feed Debugger</title>
</head> </head>
<body class="small_margins"> <body class="small_margins ttrss_utility claro">
<h1>Feed Debugger: <?php echo "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1> <h1>Feed Debugger: <?php echo "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
<form method="GET" action=""> <form method="GET" action="">
<input type="hidden" name="op" value="feeds"> <input type="hidden" name="op" value="feeds">

18
classes/handler/public.php
View file

@ -353,12 +353,11 @@ class Handler_Public extends Handler {
<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\">";
echo stylesheet_tag("css/utility.css");
echo stylesheet_tag("css/default.css"); echo stylesheet_tag("css/default.css");
echo javascript_tag("lib/prototype.js"); echo javascript_tag("lib/prototype.js");
echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls"); echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls");
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 id='sharepopup'>"; </head><body id='sharepopup' class='ttrss_utility'>";
$action = $_REQUEST["action"]; $action = $_REQUEST["action"];
@ -647,11 +646,12 @@ class Handler_Public extends Handler {
<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\">";
echo stylesheet_tag("css/utility.css"); echo stylesheet_tag("lib/dijit/themes/claro/claro.css");
echo stylesheet_tag("css/default.css");
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 id='forgotpass'>"; </head><body class='claro ttrss_utility'>";
print '<div class="floatingLogo"><img src="images/logo_small.png"></div>'; print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
print "<h1>".__("Password recovery")."</h1>"; print "<h1>".__("Password recovery")."</h1>";
@ -707,17 +707,17 @@ class Handler_Public extends Handler {
print "<fieldset>"; print "<fieldset>";
print "<label>".__("Login:")."</label>"; print "<label>".__("Login:")."</label>";
print "<input type='text' name='login' value='' required>"; print "<input class='input input-text' type='text' name='login' value='' required>";
print "</fieldset>"; print "</fieldset>";
print "<fieldset>"; print "<fieldset>";
print "<label>".__("Email:")."</label>"; print "<label>".__("Email:")."</label>";
print "<input type='email' name='email' value='' required>"; print "<input class='input input-text' type='email' name='email' value='' required>";
print "</fieldset>"; print "</fieldset>";
print "<fieldset>"; print "<fieldset>";
print "<label>".__("How much is two plus two:")."</label>"; print "<label>".__("How much is two plus two:")."</label>";
print "<input 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 "<p/>";
@ -831,7 +831,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/utility.css"/> <link rel="stylesheet" type="text/css" href="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>
@ -839,7 +839,7 @@ class Handler_Public extends Handler {
span.ok { color : #009000; font-weight : bold; } span.ok { color : #009000; font-weight : bold; }
span.err { color : #ff0000; font-weight : bold; } span.err { color : #ff0000; font-weight : bold; }
</style> </style>
<body> <body class="claro ttrss_utility">
<script type='text/javascript'> <script type='text/javascript'>
function confirmOP() { function confirmOP() {
return confirm("Update the database?"); return confirm("Update the database?");

4
classes/opml.php
View file

@ -27,11 +27,11 @@ class Opml extends Handler_Protected {
print "<html> print "<html>
<head> <head>
<link rel=\"stylesheet\" href=\"css/utility.css\" type=\"text/css\"> ".stylesheet_tag("css/default.css")."
<title>".__("OPML Utility")."</title> <title>".__("OPML Utility")."</title>
<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> <body class='claro ttrss_utility'>
<div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div> <div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div>
<h1>".__('OPML Utility')."</h1><div class='content'>"; <h1>".__('OPML Utility')."</h1><div class='content'>";

56
css/utility.less
View file

@ -177,35 +177,6 @@ body.ttrss_utility {
border-color : #e0e0e0; border-color : #e0e0e0;
} }
body#sharepopup {
background-color : white;
background-image : url("../images/toolbar.png");
background-repeat : repeat-x;
background-position : bottom;
margin : 10px;
padding : 0px;
}
body#sharepopup h1 {
font-size : 14px;
margin : 0px;
color : rgb(82, 168, 236);
}
body#sharepopup table {
background : white;
border : 1px solid rgb(82, 168, 236);
padding : 5px;
}
body#sharepopup form {
height : 100%;
}
body#sharepopup input {
width : 100%;
}
div.autocomplete { div.autocomplete {
position : absolute; position : absolute;
width : 250px; width : 250px;
@ -288,3 +259,30 @@ body.small_margins {
margin : 1em; margin : 1em;
max-width : none; max-width : none;
} }
body#sharepopup {
background: white url("../images/toolbar.png") repeat-x bottom;
margin : 10px;
padding : 0px;
h1 {
font-size : 14px;
margin : 0px;
color : rgb(82, 168, 236);
}
table {
background : white;
border : 1px solid rgb(82, 168, 236);
padding : 5px;
}
form {
height : 100%;
}
input {
width : 100%;
}
}

26
include/login_form.php
View file

@ -24,7 +24,7 @@
}); });
</script> </script>
<style type="text/css"> <style type="text/css">
body#ttrssLogin { body.ttrss_login {
padding : 2em; padding : 2em;
font-size : 14px; font-size : 14px;
} }
@ -37,14 +37,6 @@
border-width : 0px; border-width : 0px;
} }
/*input.input {
font-family : sans-serif;
font-size : medium;
border-spacing : 2px;
border : 1px solid #b5bcc7;
padding : 2px;
}*/
label { label {
width : 120px; width : 120px;
margin-right : 20px; margin-right : 20px;
@ -54,9 +46,8 @@
} }
div.header { div.header {
border-width : 0px 0px 1px 0px; border: 0px solid #0088cc;
border-style : solid; border-bottom-width: 1px;
border-color : #0088cc;
margin-bottom : 1em; margin-bottom : 1em;
padding-bottom : 5px; padding-bottom : 5px;
} }
@ -64,9 +55,8 @@
div.footer { div.footer {
margin-top : 1em; margin-top : 1em;
padding-top : 5px; padding-top : 5px;
border-width : 1px 0px 0px 0px; border: 0px solid #0088cc;
border-style : solid; border-top-width: 1px;
border-color : #0088cc;
text-align : center; text-align : center;
color : gray; color : gray;
font-size : 12px; font-size : 12px;
@ -78,10 +68,6 @@
display : inline-block; display : inline-block;
} }
a {
color : #0088cc;
}
a { a {
color: #0088cc; color: #0088cc;
text-decoration: none; text-decoration: none;
@ -114,7 +100,7 @@
</style> </style>
</head> </head>
<body id="ttrssLogin" class="claro"> <body class="claro ttrss_main ttrss_login">
<script type="text/javascript"> <script type="text/javascript">
function init() { function init() {

4
include/sanity_check.php
View file

@ -188,9 +188,9 @@
<head> <head>
<title>Startup failed</title> <title>Startup failed</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/utility.css"> <link rel="stylesheet" type="text/css" href="css/default.css">
</head> </head>
<body class='sanity_failed'> <body class='sanity_failed claro ttrss_utility'>
<div class="floatingLogo"><img src="images/logo_small.png"></div> <div class="floatingLogo"><img src="images/logo_small.png"></div>
<div class="content"> <div class="content">

3
install/index.php
View file

@ -2,13 +2,12 @@
<head> <head>
<title>Tiny Tiny RSS - Installer</title> <title>Tiny Tiny RSS - Installer</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/utility.css">
<link rel="stylesheet" type="text/css" href="../css/default.css"> <link rel="stylesheet" type="text/css" href="../css/default.css">
<style type="text/css"> <style type="text/css">
textarea { font-size : 12px; } textarea { font-size : 12px; }
</style> </style>
</head> </head>
<body class="claro"> <body class="claro ttrss_utility">
<?php <?php

4
plugins/auth_internal/init.php
View file

@ -54,8 +54,8 @@ class Auth_Internal extends Plugin implements IAuthModule {
$return = urlencode($_REQUEST["return"]); $return = urlencode($_REQUEST["return"]);
?><html> ?><html>
<head><title>Tiny Tiny RSS</title></head> <head><title>Tiny Tiny RSS</title></head>
<?php echo stylesheet_tag("css/utility.css") ?> <?php echo stylesheet_tag("css/default.css") ?>
<body class="otp"><div class="content"> <body class="ttrss_utility otp"><div class="content">
<form action="public.php?return=<?php echo $return ?>" <form action="public.php?return=<?php echo $return ?>"
method="POST" class="otpform"> method="POST" class="otpform">
<input type="hidden" name="op" value="login"> <input type="hidden" name="op" value="login">

3
register.php
View file

@ -95,7 +95,6 @@
<head> <head>
<title>Create new account</title> <title>Create new account</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?php echo stylesheet_tag("css/utility.css") ?>
<?php echo stylesheet_tag("css/default.css") ?> <?php echo stylesheet_tag("css/default.css") ?>
<?php echo javascript_tag("js/functions.js") ?> <?php echo javascript_tag("js/functions.js") ?>
<?php echo javascript_tag("lib/prototype.js") ?> <?php echo javascript_tag("lib/prototype.js") ?>
@ -180,7 +179,7 @@
</script> </script>
<body> <body class="claro ttrss_utility">
<div class="floatingLogo"><img src="images/logo_small.png"></div> <div class="floatingLogo"><img src="images/logo_small.png"></div>

1
update.php
View file

@ -60,7 +60,6 @@
<head> <head>
<title>Tiny Tiny RSS data update script.</title> <title>Tiny Tiny RSS data update script.</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/utility.css">
</head> </head>
<body> <body>