Using a div container to format heading is ridiculous. Use "<h2></h2>" instead. The new style of these headings is identical to the style definition in "archweb.css". Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- web/html/account.php | 2 +- web/html/addvote.php | 2 +- web/html/css/arch.css | 10 ---------- web/html/css/fonts.css | 7 ++++++- web/html/index.php | 4 +--- web/html/passreset.php | 4 +--- web/html/pkgsubmit.php | 4 +--- web/template/pkg_details.php | 2 +- web/template/pkg_search_form.php | 4 ++-- web/template/pkg_search_results.php | 4 +--- web/template/tu_details.php | 6 ++---- web/template/tu_list.php | 4 +--- 12 files changed, 18 insertions(+), 35 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index d94d711..0f2ae2c 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -13,7 +13,7 @@ html_header(__('Accounts')); # Main page processing here # echo "<div class=\"pgbox\">\n"; -echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Accounts")."</span></div>\n"; +echo " <h2>".__("Accounts")."</h2>\n"; echo " <div class=\"pgboxbody\">\n"; $action = in_request("Action"); diff --git a/web/html/addvote.php b/web/html/addvote.php index f0e7d31..c264249 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -82,7 +82,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <?php endif; ?> <div class="pgbox"> -<div class="pgboxtitle"><?php print __("Submit a proposal to vote on.") ?></div> +<h2><?php print __("Submit a proposal to vote on.") ?></h2> <div class="pgboxbody"> <form action='addvote.php' method='post'> <p> diff --git a/web/html/css/arch.css b/web/html/css/arch.css index a7cb74d..0ad7765 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -155,9 +155,6 @@ body { font-size: x-small; } /* Headers */ -h2 { - margin: 20px 0px 10px 0px; -} h2.title { border-bottom: 1px solid #46494d; } @@ -308,13 +305,6 @@ blockquote.code { .frontpgboxbody > table { width: 100%; } -.pgboxtitle { - border: 2px solid #ddd; - border-top: 1px solid #fff; - border-left: 1px solid #fff; - background-color: #f1f2f4; - padding: 2px 10px 2px 10px; -} .pgboxbody, .pgboxbody-comment { padding: 10px; diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index 9dea935..c77ee9b 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -104,9 +104,14 @@ a:hover { text-decoration: none; font-weight: bold; } -h1, h2, h3, h4 { +h1, h3, h4 { font-size: 16pt; } +h2 { + font-size: 1.5em; + margin-bottom: 0.5em; + border-bottom: 1px solid #888; +} .important { font-weight: bold; diff --git a/web/html/index.php b/web/html/index.php index 0d513d3..e9715c6 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -17,9 +17,7 @@ $dbh = db_connect(); ?> <div class="pgbox"> -<div class="pgboxtitle"> -<span class="f3">AUR <?php print __("Home"); ?></span> -</div> +<h2>AUR <?php print __("Home"); ?></h2> <div class="frontpgboxbody"> <p> diff --git a/web/html/passreset.php b/web/html/passreset.php index 82be3ef..a65a47b 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -85,9 +85,7 @@ html_header(__("Password Reset")); ?> <div class="pgbox"> - <div class="pgboxtitle"> - <span class="f3"><?php print __("Password Reset"); ?></span> - </div> + <h2><?php print __("Password Reset"); ?></h2> <div class="pgboxbody"> <?php if ($error) { diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 75a4b69..8df2847 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -432,9 +432,7 @@ html_header("Submit"); <?php endif; ?> <div class="pgbox"> - <div class="pgboxtitle"> - <span class="f3"><?php print __("Submit"); ?></span> - </div> + <h2><?php print __("Submit"); ?></h2> <div class="pgboxbody"> <p><?php echo __("Upload your source packages here. Create source packages with `makepkg --source`.") ?></p> diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index d8d1e4b..8fbee81 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -70,7 +70,7 @@ $sources = package_sources($row["ID"]); ?> <div class="pgbox"> - <div class="pgboxtitle"><span class="f3"><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></span></div> + <h2><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2> <div class="pgboxbody"> <div id="detailslinks" class="listing"> diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 53d34fe..3e291e1 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -2,8 +2,8 @@ <div class='pgbox'> <form action='packages.php' method='get'> -<div class='pgboxtitle'> - <span class='f3'><?php print __("Search Criteria"); ?></span> +<h2><?php print __("Search Criteria"); ?></h2> +<div> <input type='hidden' name='O' value='0' /> <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' /> <input type='submit' style='min-width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 8ef352b..209a80d 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -5,9 +5,7 @@ <?php } else { ?> <form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'> <div class="pgbox"> - <div class="pgboxtitle"> - <span class='f3'><?php print __("Package Listing") ?></span> - </div> + <h2><?php print __("Package Listing") ?></h2> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index c48f603..4b79a98 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -1,5 +1,5 @@ <div class="pgbox"> -<div class="pgboxtitle"><span class="f3"><?php print __("Proposal Details") ?></span></div> +<h2><?php print __("Proposal Details") ?></h2> <div class="pgboxbody"> <?php if ($isrunning == 1) { ?> @@ -51,9 +51,7 @@ N/A <?php if (!$isrunning) { ?> <div class="pgbox"> - <div class="pgboxtitle"> - <span class="f3"><?php echo __('Voters'); ?></span> - </div> + <h2><?php echo __('Voters'); ?></h2> <div class="pgboxbody"> <?php echo $whovoted; ?> </div> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index 0966a4c..006e65c 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -1,7 +1,5 @@ <div class="pgbox"> - <div class="pgboxtitle" style="text-align:right;"> - <span class='f3'><?php print $type ?></span> - </div> + <h2><?php print $type ?></h2> <table class='results'> <tr> <th class='header'><span class='f2'><?php print __("Proposal") ?></span></th> -- 1.7.7.2