Skip to content

Commit 02733fd

Browse files
jdarwood007jdarwood007
authored
Merge pull request #39 from jdarwood007/master
Some theme changes
2 parents 0b61cae + abc61aa commit 02733fd

File tree

2 files changed

+83
-42
lines changed

2 files changed

+83
-42
lines changed

‎repair_settings.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
*
66
* @package SMF
77
* @author Simple Machines
8-
* @copyright 2019 Simple Machines
9-
* @license http://www.simplemachines.org/about/smf/license.php BSD
8+
* @copyright 2020 Simple Machines
9+
* @license http2://www.simplemachines.org/about/smf/license.php BSD
1010
*
11-
* @version 2.1
12-
* @updated 2019-12-02
11+
* @version 2.1.1
12+
* @updated 2020-02-02
1313
*/
1414

1515
// We need the Settings.php info for database stuff.

‎smfinfo.php‎

Lines changed: 79 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
require_once(dirname(__FILE__) . '/SSI.php');
1919
error_reporting($old_error_reporting);
2020
}
21-
2221
// Hmm... no SSI.php and no SMF?
2322
elseif(!defined('SMF'))
2423
die('<b>Error:</b> Cannot start - please verify you put this in the same place as SMF\'s SSI.php.');
2524

26-
$smfinfo_version = '1.1';
25+
$smfinfo_version = '1.2';
2726

2827
initialize();
2928

@@ -237,41 +236,79 @@ function show_header()
237236
else
238237
$smflogo = './Themes/default/images/smflogo.gif';
239238

240-
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
241-
<html xmlns="http://www.w3.org/1999/xhtml">
242-
<head>
239+
echo '<!DOCTYPE html>
240+
<html', $txt['lang_rtl'] == true ? ' dir="rtl"' : '', '>
241+
<head>
242+
<meta charset="', isset($txt['lang_character_set']) ? $txt['lang_character_set'] : 'UTF-8', '">
243+
<meta name="robots" content="noindex">
244+
<title>', $txt['title'], '</title>
243245
244-
<meta http-equiv="Content-Type" content="text/html; charset=', $context['character_set'], '" />
245-
<title>', $txt['title'], '</title>
246246
<style type="text/css">
247247
body
248248
{
249-
background-color: #E5E5E8;
250-
margin: 0px;
251-
padding: 0px;
249+
background: #e9eef2;
250+
font: 83.33%/150% "Segoe UI", "Helvetica Neue", "Nimbus Sans L", Arial, "Liberation Sans", sans-serif;
251+
color: #4d4d4d;
252+
display: flex;
253+
flex-direction: column;
254+
min-height: 100vh;
252255
}
253256
body, td
254257
{
255-
color: #000000;
256258
font-size: 11px;
257-
font-family: verdana, sans-serif;
258259
}
259260
div#header
260261
{
261-
background-image: url(Themes/default/images/catbg.jpg);
262-
background-repeat: repeat-x;
263-
background-color: #88A6C0;
264-
padding: 22px 4% 12px 4%;
265-
color: white;
266-
font-family: Georgia, serif;
267-
font-size: xx-large;
268-
border-bottom: 1px solid black;
269-
height: 40px;
262+
padding: 2px 2px 12px 2px;
263+
width: 90%;
264+
display: flex;
265+
align-items: flex-end;
266+
max-width: 1200px;
267+
margin: 0 auto;
270268
}
271-
div#content
269+
h1.forumtitle
270+
{
271+
color: #a85400;
272+
text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.5), 1px 1px 0 #fff;
273+
font-size: 1.8em;
274+
font-family: "Tahoma", sans-serif;
275+
padding: 22px 12px 6px 10px;
276+
font-weight: normal;
277+
flex: 1 1 auto;
278+
}
279+
a#logo
280+
{
281+
float: right;
282+
margin: 16px 0 0 0;
283+
padding-right: 2px;
284+
font-size: 1.4em;
285+
}
286+
div#wrapper
272287
{
273-
padding: 20px 30px;
288+
max-width: 1200px;
289+
margin: 0 auto;
290+
width: 90%;
291+
clear: both;
292+
background: #fff;
293+
border: 1px solid #b8b8b8;
294+
border-radius: 8px;
295+
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.14);
274296
}
297+
div#footer
298+
{
299+
margin: 4em 0 0 0;
300+
padding: 10px 5%;
301+
background: #3e5a78;
302+
border-top: 3px solid #b2b6bd;
303+
flex: none;
304+
display: block;
305+
font-family: Verdana, sans-serif;
306+
}
307+
div#footer a
308+
{
309+
font-size: 0.9em;
310+
color: #fff;
311+
}
275312
div.panel
276313
{
277314
position: relative;
@@ -305,16 +342,12 @@ function show_header()
305342
}
306343
307344
.dynamic-tab-pane-control .tab-page{
308-
border:1px solid #919b9c;
309-
background:#f6f6f6;
310345
z-index:2;
311-
position:relative;
312346
top:-2px;
313347
font:11px Tahoma;
314348
color:#333;
315349
padding:5px;
316350
width:97%;
317-
float:left;
318351
}
319352
320353
/* This is for phpinfo */
@@ -381,7 +414,10 @@ function show_header()
381414
background-color:#fff;
382415
font-size:8px;
383416
}
384-
417+
ul
418+
{
419+
list-style: none;
420+
}
385421
</style>
386422
<script language="JavaScript" type="text/javascript"><!-- // --><![CDATA[
387423
var sections = new Array();
@@ -443,13 +479,14 @@ function addLoadEvent(func)
443479
}
444480
addLoadEvent(function() {swapSection(0);});
445481
// ]]></script>
446-
</head>
447-
<body>
482+
</head>
483+
<body>
484+
<div id="footerfix">
448485
<div id="header">
449-
<a href="https://www.simplemachines.org/" target="_blank"><img src="' . $smflogo . '" style="width: 258px; float: right;" alt="Simple Machines" border="0" /></a>
450-
<div>', $txt['title'], '</div>
486+
<h1 class="forumtitle">', $txt['title'], '</h1>
487+
<a id="logo" href="https://www.simplemachines.org/" target="_blank"><img src="' . $smflogo . '" alt="Simple Machines" border="0" /></a>
451488
</div>
452-
<div id="content">';
489+
<div id="wrapper">';
453490

454491
if (allowedTo('admin_forum'))
455492
echo '
@@ -1271,11 +1308,15 @@ function show_footer()
12711308

12721309
$t = sprintf($forum_copyright, $forum_version);
12731310
echo '
1274-
</div>
1275-
<div style="clear: left">
1276-
', sprintf($forum_copyright, $forum_version),' | <a href="https://validator.w3.org/check?uri=referer">XHTML</a> | <a href="https://jigsaw.w3.org/css-validator/">CSS</a>
1277-
</div>
1278-
</div>';
1311+
</div><!-- #smfinfo -->
1312+
</div><!-- #wrapper -->
1313+
</div><!-- #footerfix -->
1314+
1315+
<div id="footer">
1316+
<ul>
1317+
<li class="copyright"><a href="https://www.simplemachines.org/" title="Simple Machines Forum" target="_blank" rel="noopener">', $t, '</a></li>
1318+
</ul>
1319+
</div>';
12791320

12801321
/* Below is the hefty javascript for this. Upon opening the page it checks the current file versions with ones
12811322
held at simplemachines.org and works out if they are up to date. If they aren't it colors that files number

0 commit comments

Comments
 (0)