aaron/garchive-wp-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into deploy/prod

Browse source
This commit is contained in:
Aaron Yarborough 2019-01-15 19:49:26 +00:00
commit 811ae9c3bc
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
header.php
View file

@ -13,7 +13,6 @@
gtag('config', 'UA-75664743-2'); gtag('config', 'UA-75664743-2');
</script> </script>
<meta charset="<?php bloginfo('charset'); ?>"/> <meta charset="<?php bloginfo('charset'); ?>"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta name="description" content="A collection of scripts and other content made by Graal Online players"/> <meta name="description" content="A collection of scripts and other content made by Graal Online players"/>
@ -27,7 +26,7 @@
$curr_user = wp_get_current_user(); $curr_user = wp_get_current_user();
?> ?>
<?php /*
<div class="gar-userbox"> <div class="gar-userbox">
<?php if ($curr_user->ID !== 0) : ?> <?php if ($curr_user->ID !== 0) : ?>
<span class="gar-userbox-username"><?php echo $curr_user->user_login ?></span> <span class="gar-userbox-username"><?php echo $curr_user->user_login ?></span>
@ -36,6 +35,7 @@ $curr_user = wp_get_current_user();
<a href="<?php echo wp_login_url(esc_url(home_url('/'))) ?>">Login</a> <a href="<?php echo wp_login_url(esc_url(home_url('/'))) ?>">Login</a>
<?php endif; ?> <?php endif; ?>
</div> </div>
*/ ?>
<div id="search"> <div id="search">

2
scripts/main.js
View file

@ -9,7 +9,7 @@
searchbox = $('#searchBox') searchbox = $('#searchBox')
initPostGrid(postGrid, '.gar-post-box'); initPostGrid(postGrid, '.gar-post-box');
initSearch('a[data-toggle=search]', search, searchbox); initSearch('a[href="#search"]', search, searchbox);
initTinyMCE('.rte'); initTinyMCE('.rte');
}); });