From 32b7622791e21ad6a069d5b9b208ca53df478987 Mon Sep 17 00:00:00 2001 From: flashwave Date: Sun, 18 Oct 2015 21:06:30 +0200 Subject: [PATCH] r20151018.2 Signed-off-by: Flashwave --- _sakura/components/Bans.php | 4 + _sakura/components/Comments.php | 4 + _sakura/components/Configuration.php | 8 +- _sakura/components/Database.php | 4 + _sakura/components/Forum.php | 4 + _sakura/components/Hashing.php | 8 +- _sakura/components/Main.php | 24 +-- _sakura/components/Manage.php | 4 + _sakura/components/News.php | 4 + _sakura/components/Payments.php | 10 +- _sakura/components/Permissions.php | 4 + _sakura/components/Rank.php | 4 + _sakura/components/Session.php | 9 +- _sakura/components/Templates.php | 4 + _sakura/components/Upload.php | 4 + _sakura/components/Urls.php | 4 + _sakura/components/User.php | 6 +- _sakura/components/Users.php | 20 ++- _sakura/components/Whois.php | 6 +- _sakura/components/database/mysql.php | 4 + _sakura/sakura.php | 2 +- _sakura/templates/misaki/global/master.tpl | 15 +- _sakura/templates/misaki/global/notfound.tpl | 2 +- _sakura/templates/yuuno/elements/captcha.tpl | 4 +- _sakura/templates/yuuno/forum/posting.tpl | 2 +- _sakura/templates/yuuno/forum/viewtopic.tpl | 2 +- _sakura/templates/yuuno/global/master.tpl | 8 +- _sakura/templates/yuuno/global/notfound.tpl | 2 +- _sakura/templates/yuuno/main/memberlist.tpl | 4 +- _sakura/templates/yuuno/main/profile.tpl | 2 +- .../yuuno/settings/appearance.userpage.tpl | 2 +- .../data/broomcloset_old/css/manage.css | 2 +- public/content/data/mio/css/feedback.css | 22 +-- public/content/data/mio/css/mio.css | 166 ++++++++---------- public/content/data/mio/css/mionetics.css | 148 +++++++--------- public/content/data/misaki/css/error.css | 2 +- public/content/data/misaki/css/misaki.css | 6 +- public/content/data/yuuno/css/error.css | 4 +- public/content/data/yuuno/css/yuuno.css | 26 ++- public/content/data/yuuno/js/ybabstat.js | 2 +- public/content/data/yuuno/js/yuuno.js | 8 +- public/members.php | 2 +- public/settings.php | 2 +- 43 files changed, 311 insertions(+), 263 deletions(-) diff --git a/_sakura/components/Bans.php b/_sakura/components/Bans.php index 231a0ed..53329c7 100755 --- a/_sakura/components/Bans.php +++ b/_sakura/components/Bans.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Bans + * @package Sakura + */ class Bans { // Check if a user is banned diff --git a/_sakura/components/Comments.php b/_sakura/components/Comments.php index 195c735..66ce880 100755 --- a/_sakura/components/Comments.php +++ b/_sakura/components/Comments.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Comments + * @package Sakura + */ class Comments { public $comments = []; // Array containing comments diff --git a/_sakura/components/Configuration.php b/_sakura/components/Configuration.php index 89d1294..0db5898 100755 --- a/_sakura/components/Configuration.php +++ b/_sakura/components/Configuration.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Configuration + * @package Sakura + */ class Configuration { // Configuration data @@ -49,7 +53,7 @@ class Configuration $_DATA = Database::fetch('config', true); // Create variable to temporarily store values in - $_DBCN = array(); + $_DBCN = []; // Properly sort the values foreach ($_DATA as $_CONF) { @@ -92,7 +96,7 @@ class Configuration if ($subkey) { // If we do we make sure that the parent key is an array if (!isset(self::$local[$key])) { - self::$local[$key] = array(); + self::$local[$key] = []; } // And then assign the value diff --git a/_sakura/components/Database.php b/_sakura/components/Database.php index 768d84e..a514921 100755 --- a/_sakura/components/Database.php +++ b/_sakura/components/Database.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Database + * @package Sakura + */ class Database { // Database container diff --git a/_sakura/components/Forum.php b/_sakura/components/Forum.php index 25142fc..c443817 100755 --- a/_sakura/components/Forum.php +++ b/_sakura/components/Forum.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Forum + * @package Sakura + */ class Forum { // Empty forum template diff --git a/_sakura/components/Hashing.php b/_sakura/components/Hashing.php index 49238d0..ae96b78 100755 --- a/_sakura/components/Hashing.php +++ b/_sakura/components/Hashing.php @@ -31,6 +31,10 @@ namespace Sakura; +/** + * Class Hashing + * @package Sakura + */ class Hashing { // These variables can be changed without break the existing hashes @@ -61,12 +65,12 @@ class Hashing ) ); - $passwordData = array( + $passwordData = [ self::$hashAlgorithm, self::$iterations, $salt, $hash, - ); + ]; return $passwordData; diff --git a/_sakura/components/Main.php b/_sakura/components/Main.php index 39cf952..b6e31d2 100755 --- a/_sakura/components/Main.php +++ b/_sakura/components/Main.php @@ -8,6 +8,10 @@ namespace Sakura; use Parsedown; use PHPMailer; +/** + * Class Main + * @package Sakura + */ class Main { // Constructor @@ -210,11 +214,11 @@ class Main h2 { margin: 0 -10px; } .container { border: 1px solid #CAA; margin: 10px auto; background: #FFF; box-shadow: 2px 2px 1em #888; max-width: 1024px; border-radius: 10px; } - .container .inner { padding: 0px 10px; } + .container .inner { padding: 0 10px; } .container .inner .error { background: #555; color: #EEE; border-left: 5px solid #C22; - padding: 4px 6px; text-shadow: 0px 1px 1px #888; white-space: pre-wrap; + padding: 4px 6px; text-shadow: 0 1px 1px #888; white-space: pre-wrap; word-wrap: break-word; margin: 12px 0; border-radius: 5px; box-shadow: inset 0 0 1em #333; } - .container .footer { border-top: 1px solid #CAA; font-size: x-small; padding: 0px 5px 1px; } + .container .footer { border-top: 1px solid #CAA; font-size: x-small; padding: 0 5px 1px; } a { color: #77E; text-decoration: none; } a:hover { text-decoration: underline; } a:active { color: #E77; } @@ -283,7 +287,7 @@ class Main $mail = new PHPMailer(); // Set to SMTP - $mail->IsSMTP(); + $mail->isSMTP(); // Set the SMTP server host $mail->Host = Configuration::getConfig('smtp_server'); @@ -304,14 +308,14 @@ class Main } // Add a reply-to header - $mail->AddReplyTo(Configuration::getConfig('smtp_replyto_mail'), Configuration::getConfig('smtp_replyto_name')); + $mail->addReplyTo(Configuration::getConfig('smtp_replyto_mail'), Configuration::getConfig('smtp_replyto_name')); // Set a from address as well - $mail->SetFrom(Configuration::getConfig('smtp_from_email'), Configuration::getConfig('smtp_from_name')); + $mail->setFrom(Configuration::getConfig('smtp_from_email'), Configuration::getConfig('smtp_from_name')); // Set the addressee foreach ($to as $email => $name) { - $mail->AddBCC($email, $name); + $mail->addBCC($email, $name); } // Subject line @@ -335,10 +339,10 @@ class Main $mail->AltBody = $body; // Send the message - $send = $mail->Send(); + $send = $mail->send(); // Clear the addressee list - $mail->ClearAddresses(); + $mail->clearAddresses(); // If we got an error return the error if (!$send) { @@ -695,7 +699,7 @@ class Main $logsDB = Database::fetch('logs', true, $conditions, ['id', true]); // Storage array - $logs = array(); + $logs = []; // Iterate over entries foreach ($logsDB as $log) { diff --git a/_sakura/components/Manage.php b/_sakura/components/Manage.php index 385978a..de3ccbb 100755 --- a/_sakura/components/Manage.php +++ b/_sakura/components/Manage.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Manage + * @package Sakura + */ class Manage { diff --git a/_sakura/components/News.php b/_sakura/components/News.php index 7fbae6c..0d17f19 100755 --- a/_sakura/components/News.php +++ b/_sakura/components/News.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class News + * @package Sakura + */ class News { private $posts = []; // Posts array diff --git a/_sakura/components/Payments.php b/_sakura/components/Payments.php index 0769dc7..efd8c26 100755 --- a/_sakura/components/Payments.php +++ b/_sakura/components/Payments.php @@ -15,6 +15,10 @@ use \PayPal\Api\PaymentExecution; use \PayPal\Api\RedirectUrls; use \PayPal\Api\Transaction; +/** + * Class Payments + * @package Sakura + */ class Payments { // Container for PayPal API @@ -32,7 +36,7 @@ class Payments Configuration::getConfig('paypal_secret') ) ); - } catch (Exception $e) { + } catch (\Exception $e) { return false; } @@ -107,7 +111,7 @@ class Payments // Try to create payment try { $payment->create(self::$paypal); - } catch (Exception $ex) { + } catch (\Exception $ex) { return false; } @@ -132,7 +136,7 @@ class Payments // Attempt to charge the fucker try { $payment->execute($execute, self::$paypal); - } catch (Exception $ex) { + } catch (\Exception $ex) { return false; } diff --git a/_sakura/components/Permissions.php b/_sakura/components/Permissions.php index 8b2d05b..cd0ca36 100755 --- a/_sakura/components/Permissions.php +++ b/_sakura/components/Permissions.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Permissions + * @package Sakura + */ class Permissions { // Fallback permission data diff --git a/_sakura/components/Rank.php b/_sakura/components/Rank.php index dcc3e13..e94795e 100755 --- a/_sakura/components/Rank.php +++ b/_sakura/components/Rank.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Rank + * @package Sakura + */ class Rank { // Rank data diff --git a/_sakura/components/Session.php b/_sakura/components/Session.php index 79786d7..f670ab4 100755 --- a/_sakura/components/Session.php +++ b/_sakura/components/Session.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Session + * @package Sakura + */ class Session { // Current user data @@ -91,8 +95,11 @@ class Session return 0; } + // IP Check + $ipCheck = Configuration::getConfig('session_check'); + // Origin checking - if ($ipCheck = Configuration::getConfig('session_check')) { + if ($ipCheck) { // Split both IPs up $sessionIP = explode('.', $session['user_ip']); $userIP = explode('.', Main::getRemoteIP()); diff --git a/_sakura/components/Templates.php b/_sakura/components/Templates.php index 422ecc4..89e6d89 100755 --- a/_sakura/components/Templates.php +++ b/_sakura/components/Templates.php @@ -9,6 +9,10 @@ use Twig_Environment; use Twig_Extension_StringLoader; use Twig_Loader_Filesystem; +/** + * Class Templates + * @package Sakura + */ class Templates { // Engine container, template folder name and options diff --git a/_sakura/components/Upload.php b/_sakura/components/Upload.php index 955f7f6..20a1302 100755 --- a/_sakura/components/Upload.php +++ b/_sakura/components/Upload.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Upload + * @package Sakura + */ class Upload { diff --git a/_sakura/components/Urls.php b/_sakura/components/Urls.php index 84c4789..938ce5b 100755 --- a/_sakura/components/Urls.php +++ b/_sakura/components/Urls.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Urls + * @package Sakura + */ class Urls { // Unformatted links [0] = no mod_rewrite, [1] = mod_rewrite diff --git a/_sakura/components/User.php b/_sakura/components/User.php index d52475c..2b01d77 100755 --- a/_sakura/components/User.php +++ b/_sakura/components/User.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class User + * @package Sakura + */ class User { // User data @@ -296,7 +300,7 @@ class User } // Assign field to output with value - $profile[$fieldName] = array(); + $profile[$fieldName] = []; $profile[$fieldName]['name'] = $field['field_name']; $profile[$fieldName]['value'] = $this->data['user_data']['profileFields'][$fieldName]; $profile[$fieldName]['islink'] = $field['field_link']; diff --git a/_sakura/components/Users.php b/_sakura/components/Users.php index 9ffc4d0..1100b83 100755 --- a/_sakura/components/Users.php +++ b/_sakura/components/Users.php @@ -5,6 +5,10 @@ namespace Sakura; +/** + * Class Users + * @package Sakura + */ class Users { @@ -202,14 +206,12 @@ class Users { // Check if user is logged in - if (!self::checkLogin()) { + if (!$check = self::checkLogin()) { return false; } - // Remove the active session from the database - if (!(new Session)->destroy()) { - return false; - } + // Destroy the active session + (new Session($check[0], $check[1]))->destroy(); // Unset User ID setcookie( @@ -922,7 +924,7 @@ class Users } // Assign field to output with value - $profile[$fieldName] = array(); + $profile[$fieldName] = []; $profile[$fieldName]['name'] = $field['name']; $profile[$fieldName]['value'] = $profileData[$fieldName]; $profile[$fieldName]['islink'] = $field['islink']; @@ -1161,7 +1163,7 @@ class Users } // Make output array - $rank = array(); + $rank = []; // Go over all users and check if they have the rank id foreach ($users as $user) { @@ -1246,7 +1248,7 @@ class Users { // Prepare conditions - $conditions = array(); + $conditions = []; $conditions['user_id'] = [($uid ? $uid : self::checkLogin()[0]), '=']; if ($timediff) { @@ -1327,7 +1329,7 @@ class Users ]); // Prepare a storage array - $store = array(); + $store = []; // Go over each message and check if they are for the current user foreach ($messages as $message) { diff --git a/_sakura/components/Whois.php b/_sakura/components/Whois.php index 3d3d355..66a0735 100755 --- a/_sakura/components/Whois.php +++ b/_sakura/components/Whois.php @@ -29,6 +29,10 @@ namespace Sakura; +/** + * Class Whois + * @package Sakura + */ class Whois { // Variables @@ -161,7 +165,7 @@ class Whois $servers = self::$servers['ip']; // Set variable to keep results in - $results = array(); + $results = []; // Query servers foreach ($servers as $server) { diff --git a/_sakura/components/database/mysql.php b/_sakura/components/database/mysql.php index a21cc8e..e2ebe4b 100755 --- a/_sakura/components/database/mysql.php +++ b/_sakura/components/database/mysql.php @@ -9,6 +9,10 @@ use PDO; use PDOException; use \Sakura\Configuration; +/** + * Class MySQL + * @package Sakura\DBWrapper + */ class MySQL { // Variable that will contain the SQL connection diff --git a/_sakura/sakura.php b/_sakura/sakura.php index 5a80c16..557b4b3 100755 --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -54,7 +54,7 @@ foreach (glob(ROOT . '_sakura/components/database/*.php') as $driver) { } // Set Error handler -set_error_handler(array('Sakura\Main', 'errorHandler')); +set_error_handler(['Sakura\Main', 'errorHandler']); // Initialise Main Class Main::init(ROOT . '_sakura/config/config.ini'); diff --git a/_sakura/templates/misaki/global/master.tpl b/_sakura/templates/misaki/global/master.tpl index dc2470e..ffb5176 100755 --- a/_sakura/templates/misaki/global/master.tpl +++ b/_sakura/templates/misaki/global/master.tpl @@ -128,14 +128,15 @@ {% block content %}

{{ php.self }} is now printing!

{% endblock %} + - - diff --git a/_sakura/templates/yuuno/forum/viewtopic.tpl b/_sakura/templates/yuuno/forum/viewtopic.tpl index bf53f34..1c5ab24 100755 --- a/_sakura/templates/yuuno/forum/viewtopic.tpl +++ b/_sakura/templates/yuuno/forum/viewtopic.tpl @@ -12,7 +12,7 @@ {% if not post.user.checkPermission('SITE', 'DEACTIVATED') or post.user.checkPermission('SITE', 'RESTRICTED') %}{{ post.user.data.username }} - {{ post.user.data.username }} + {{ post.user.data.username }} {% else %} [deleted user] {% endif %} diff --git a/_sakura/templates/yuuno/global/master.tpl b/_sakura/templates/yuuno/global/master.tpl index 263ac51..5f3e493 100755 --- a/_sakura/templates/yuuno/global/master.tpl +++ b/_sakura/templates/yuuno/global/master.tpl @@ -213,15 +213,15 @@ {% endif %} {% if user.checkPermission('SITE', 'RESTRICTED') %} -
-

Your account is current in restricted mode!

+
+

Your account is currently in restricted mode!

A staff member has set your account to restricted mode most likely due to violation of the rules. While restricted you won't be able to use most public features of the site. If you think this is a mistake please get in touch with one of our staff members.
{% endif %} @@ -272,7 +272,7 @@ '#2AA', // Updated '#2AA', // Fixed '#A22', // Removed - '#62C', // Exported + '#62C' // Exported ]; window.addEventListener("load", function() { diff --git a/_sakura/templates/yuuno/global/notfound.tpl b/_sakura/templates/yuuno/global/notfound.tpl index 25dc144..3f0f46b 100755 --- a/_sakura/templates/yuuno/global/notfound.tpl +++ b/_sakura/templates/yuuno/global/notfound.tpl @@ -29,7 +29,7 @@ home page, and then look for links to the information you want.
  • - Click the Back + Click the Back button to try another link.
  • diff --git a/_sakura/templates/yuuno/main/memberlist.tpl b/_sakura/templates/yuuno/main/memberlist.tpl index d549b50..d3e2432 100755 --- a/_sakura/templates/yuuno/main/memberlist.tpl +++ b/_sakura/templates/yuuno/main/memberlist.tpl @@ -12,11 +12,11 @@ {% block content %}
    -

    {{ rankTitle }}

    +

    {{ rankTitle }}

    {{ rankDescription }}

    -
    +
    Rank: All members diff --git a/_sakura/templates/yuuno/main/profile.tpl b/_sakura/templates/yuuno/main/profile.tpl index caabfa6..f40a692 100755 --- a/_sakura/templates/yuuno/main/profile.tpl +++ b/_sakura/templates/yuuno/main/profile.tpl @@ -35,7 +35,7 @@ {% else %} {% if user.checkFriends(profile.data.user_id) != 0 %}{% endif %} - + {% endif %}
    diff --git a/_sakura/templates/yuuno/settings/appearance.userpage.tpl b/_sakura/templates/yuuno/settings/appearance.userpage.tpl index 8e23e21..1e2606a 100755 --- a/_sakura/templates/yuuno/settings/appearance.userpage.tpl +++ b/_sakura/templates/yuuno/settings/appearance.userpage.tpl @@ -12,7 +12,7 @@ -
    +
    diff --git a/public/content/data/broomcloset_old/css/manage.css b/public/content/data/broomcloset_old/css/manage.css index b7c961c..a3ea813 100755 --- a/public/content/data/broomcloset_old/css/manage.css +++ b/public/content/data/broomcloset_old/css/manage.css @@ -85,7 +85,7 @@ a:active { .header > .nav > div > a { color: #DDD; text-decoration: none !important; - padding: 0px 5px 2px; + padding: 0 5px 2px; transition: .2s; } .header > .nav > div > a:hover { diff --git a/public/content/data/mio/css/feedback.css b/public/content/data/mio/css/feedback.css index fc823fe..de95adc 100755 --- a/public/content/data/mio/css/feedback.css +++ b/public/content/data/mio/css/feedback.css @@ -3,15 +3,15 @@ hr { color: #9475B2; background: #9475B2; height: 1px; - border: 0px; + border: 0; } .hidden { display: none; - visibility: none; + visibility: hidden; } h1,h2,h3,h4,h5,h6 { margin: 2px; - padding: 0px; + padding: 0; } h1 { display: inline-block; @@ -52,7 +52,7 @@ input[type="text"]:focus, input[type="password"]:focus, table.postForm > tbody t border: 1px solid #746677; } #recaptcha_response_field { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; padding: 2px 4px 3px; border: 1px solid #AAA; outline: medium none; @@ -64,7 +64,7 @@ input[type="text"]:focus, input[type="password"]:focus, table.postForm > tbody t cursor: pointer; } div#recaptcha_image { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; border: 1px solid #AAA; outline: medium none; } @@ -78,8 +78,8 @@ table.postForm{ border-spacing: 1px; } table.postForm > tbody > tr > td { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; font-size: 10pt; } table.postForm > tbody > tr > td:first-child { @@ -87,7 +87,7 @@ table.postForm > tbody > tr > td:first-child { border: 1px #746677 solid; color: #400070; font-weight: bold; - padding: 0px 5px 0px 10px; + padding: 0 5px 0 10px; font-size: 10pt; text-align: right; } @@ -130,11 +130,11 @@ table.postForm > tbody > tr > td:first-child { text-align: center; } .boardposting { - margin: 0px auto; + margin: 0 auto; text-align: center; } .boardposting table { - margin: 0px auto; + margin: 0 auto; text-align: left; } .copyright { @@ -149,7 +149,7 @@ fieldset .replylink { background: #9475B2; color: #306; padding: 1px 5px; - margin: -9px 0px; + margin: -9px 0; font-weight: bold; overflow: hidden; } diff --git a/public/content/data/mio/css/mio.css b/public/content/data/mio/css/mio.css index ff1c4a8..31c0850 100755 --- a/public/content/data/mio/css/mio.css +++ b/public/content/data/mio/css/mio.css @@ -11,8 +11,8 @@ html { } body { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; font-family: Verdana, Arial, Helvetica, sans-serif; background: linear-gradient(180deg, #C2AFFE, #FBEEFF) repeat-x scroll center top #FBEEFF; background-size: auto 200px; @@ -22,7 +22,7 @@ body { img.logo { height: 150px; width: 450px; - border: 0px; + border: 0; background: url('../images/logo.png') no-repeat scroll left top transparent; background-size: cover; } @@ -50,15 +50,14 @@ hr { color: #9475B2; background: #9475B2; height: 1px; - border: 0px; + border: 0; } div.navbar ul { display: table; - margin: 0px auto; clear: both; text-align: center; - margin-top: 5px; + margin: 5px auto 0; border-top: 1px solid; min-width: 880px; max-width: 1024px; @@ -70,29 +69,25 @@ div.navbar li { text-align: center; margin-top: -1px; position: relative; - left: 217.5px; + left: 217px; z-index: 1; } li.notcurrent { - background: none repeat scroll 0% 0% #C9BBCC; - border-width: 1px 1px 1px medium; - border-style: solid solid solid none; - border-color: inherit; + background: none repeat scroll 0 0 #C9BBCC; + border: 1px solid inherit; + border-left: medium none; border-image: none; padding: 2px 1em; } li.current { - background: none repeat scroll 0% 0% #FBEEFF; - border-width: 1px 1px 1px 1px; - border-style: solid solid solid solid; - border-color: inherit; + background: none repeat scroll 0 0 #FBEEFF; border-image: none; - padding: 2px 1em; - padding-bottom: 4px; - margin-left:-1px; - border-top: medium none; + padding: 2px 1em 4px; + margin-left: -1px; + border: 1px solid inherit; + border-top: medium none; } li.first { @@ -106,8 +101,7 @@ li.fill { } div.pagecontent, div.profile { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 880px; max-width: 1024px; border: solid 1px #9475B2; @@ -120,11 +114,11 @@ div.profile { div.profile_cont { text-align: left; - padding: 0px 20px; + padding: 0 20px; } div.profile_cont hr { - border: 0px solid #000; + border: 0 solid #000; height: 1px; color: #000; background: #000; @@ -132,16 +126,14 @@ div.profile_cont hr { } div.mioboards, div.mioblog, div.miowhois { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 660px; max-width: 924px; border: solid 1px #9475B2; } div.miochatquote { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; border: solid 1px #9475B2; display: inline-block; } @@ -164,30 +156,28 @@ div.miochatquote .chatquote div:nth-child(even) { } div.miodonate { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 660px; max-width: 924px; border: solid 1px #9475B2; } div.miodonate h3 { - margin: 0px; + margin: 0; } div.miodonate hr { - margin-bottom: 0px; + margin-bottom: 0; } div.miodonate h2 { - margin: 0px; background: #9475B2; border: solid 1px #9475B2; text-align: right; float: right; border-bottom-left-radius: 12px; display: inline-block; - margin-top: -1px; + margin: -1px 0 0; padding: 5px; } @@ -198,7 +188,6 @@ div.miodonate ul { div.miodonate li { list-style: none outside none; background: #9475B2; - margin: 0px; width: 815px; margin: 8px; height: 20px; @@ -215,7 +204,7 @@ div.mioucpbar { } div.miobottom{ - margin: 0px auto; + margin: 0 auto; overflow: auto; height: auto !important; } @@ -231,7 +220,7 @@ div.miobinner { h3.miotitle { background-color: #9475B2; color: #330066; - margin-top: 0px; + margin-top: 0; text-align: left; padding: 3px; } @@ -239,14 +228,14 @@ h3.miotitle { h2.miotitle { background-color: #9475B2; color: #330066; - margin: 0px; + margin: 0; text-align: center; padding: 3px; } h1.miotitle { color: #330066; - margin: 0px; + margin: 0; text-align: center; } @@ -267,7 +256,7 @@ h1.miomessage { div.mioboxcontent { text-align: left; - margin: 0px; + margin: 0; line-height: 130%; overflow: auto; width: 100%; @@ -279,8 +268,7 @@ div.mioboxcontent h4 { } div.mioboards div.mioboxcontent { - padding: 0.25em 0.5em 0px; - padding-left: 20px; + padding: .25em .5em 0 20px; } div.miocolumn { @@ -300,18 +288,18 @@ a.boardlink:hover,a.boardlink:active { div.postcontent { text-align: left; - padding: 0px 10px 0px 10px; + padding: 0 10px 0 10px; } h3.title { - margin-top: 0px; + margin-top: 0; background-color: #9475B2; text-align: left; padding: 3px; } h1.title{ - margin-top: 0px; + margin-top: 0; background-color: #9475B2; text-align: left; padding: 5px; @@ -349,7 +337,7 @@ span.permalink a:hover { } input[type="text"],input[type="password"],input[type="date"],textarea { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; padding: 2px 4px 3px; border: 1px solid #AAA; outline: medium none; @@ -413,53 +401,50 @@ div.ucp_avatar_cont { .windowbutton-container { float: right; - margin-top: -2px; - margin-right: -2px; - margin-left: -2px; - margin-bottom: -2px; + margin: -2px; } .closebutton { cursor: pointer; height: 23px; width: 23px; - border: 0px; - background: url('../images/window-sprite.png') no-repeat scroll 0px 0px transparent; + border: 0; + background: url('../images/window-sprite.png') no-repeat scroll 0 0 transparent; } .maxbutton { cursor: pointer; height: 23px; width: 23px; - border: 0px; - background: url('../images/window-sprite.png') no-repeat scroll 0px -23px transparent; + border: 0; + background: url('../images/window-sprite.png') no-repeat scroll 0 -23px transparent; } .minbutton { cursor: pointer; height: 23px; width: 23px; - border: 0px; - background: url('../images/window-sprite.png') no-repeat scroll 0px -46px transparent; + border: 0; + background: url('../images/window-sprite.png') no-repeat scroll 0 -46px transparent; } .donate-btn { cursor: pointer; height: 26px; width: 90px; - border: 0px; - background: url('../images/donate-btn.png') no-repeat scroll 0px 0px transparent; + border: 0; + background: url('../images/donate-btn.png') no-repeat scroll 0 0 transparent; } div.topLeftBar { color: #000000; position: absolute; - left: 0px; + left: 0; background: #FBEEFF; padding: 1px 9px; border: 1px #9475B2 solid; - border-top: 0px; - border-left: 0px; + border-top: 0; + border-left: 0; box-shadow: 0 0 1.5em #808080; z-index: 997; } @@ -500,8 +485,7 @@ table.miotable { } table.miotablestandalone { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 880px; max-width: 1024px; border: solid 1px #9475B2; @@ -578,7 +562,7 @@ table.miotablestandalone { } .registerbutton:hover, .loginbutton:hover { - text-shadow: 0px 0px 8px #F1F1F1; + text-shadow: 0 0 8px #F1F1F1; } /* Flashii Bar */ @@ -591,13 +575,13 @@ div.flashii-bar .barAvatar { div.flashii-bar { color: #000000; position: absolute; - right: 0px; + right: 0; background: #FBEEFF; padding: 1px 9px; /*border-radius: 0px 0px 0px 8px;*/ border: 1px #9475B2 solid; - border-top: 0px; - border-right: 0px; + border-top: 0; + border-right: 0; /*box-shadow: 0 0 1px grey;*/ box-shadow: 0 0 1.5em #808080; z-index: 997; @@ -606,10 +590,10 @@ div.flashii-bar { div.flashii-black { background: rgba(0,0,0,0.5); position: fixed; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; + top: 0; + left: 0; + right: 0; + bottom: 0; height: 100%; width: 100%; z-index: 998; @@ -629,7 +613,7 @@ div.flashii-horizon { text-align: center; position: absolute; top: 30%; - left: 0px; + left: 0; width: 100%; height: 1px; overflow: visible; @@ -644,13 +628,13 @@ div#flashii-login,div#flashii-register { border: solid 1px #9475B2; z-index: 999; background: #FBEEFF; - margin: 0px auto; + margin: 0 auto; } div#flashii-login h3,div#flashii-register h3 { background-color: #9475B2; color: rgb(51,0,102); - margin-top: 0px; + margin-top: 0; text-align: left; padding: 3px; } @@ -662,7 +646,7 @@ div#flashii-login h3 a,div#flashii-register h3 a { } div#flashii-login table,div#flashii-register table { - margin: 0px auto; + margin: 0 auto; text-align: left; } @@ -671,7 +655,7 @@ div#flashii-login tr td:first-child,div#flashii-register tr td:first-child{ border: 1px #746677 solid; color: #400070; font-weight: bold; - padding: 0px 5px; + padding: 0 5px; font-size: 10pt; width: 35% !important; } @@ -687,7 +671,7 @@ div#flashii-login table tr:last-child td, div#flashii-register table tr:last-chi } div#flashii-login #recaptcha_response_field,div#flashii-login input[type="text"],div#flashii-login input[type="password"],div#flashii-register #recaptcha_response_field,div#flashii-register input[type="text"],div#flashii-register input[type="password"] { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; padding: 2px 4px 3px; border: 1px solid #AAA; outline: medium none; @@ -701,7 +685,7 @@ div#flashii-login #recaptcha_response_field,div#flashii-login input[type="text"] } div#recaptcha_image { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; border: 1px solid #AAA; outline: medium none; } @@ -717,7 +701,7 @@ div#recaptcha_image { /* some more shit */ .group-select { - margin: 0px auto; + margin: 0 auto; text-align: center; min-width: 330px !important; max-width: 945px; @@ -736,13 +720,13 @@ div#recaptcha_image { height: 175px; padding: 10px; transition: background 0.5s, box-shadow 0.2s; - box-shadow: inset 0px 0px 1.5em #000; + box-shadow: inset 0 0 1.5em #000; } .group-select-user:hover { background: #8364A1; cursor: pointer; - box-shadow: inset 0px 0px 2em #000; + box-shadow: inset 0 0 2em #000; } .group-select-user-avatar { @@ -754,15 +738,15 @@ div#recaptcha_image { .group-select-user-avatar img { max-height: 150px; max-width: 150px; - border: 0px; - padding: 0px; - margin: 0px; + border: 0; + padding: 0; + margin: 0; } .membersPage { width: 100%; - padding: 10px 0px; + padding: 10px 0; overflow: hidden; text-align: center; } @@ -784,7 +768,7 @@ div#recaptcha_image { padding: 7px; font-size: 15px; min-width: 150px; - box-shadow: inset 0px 0px 1em #000; + box-shadow: inset 0 0 1em #000; } .membersPage .userBox { @@ -792,7 +776,7 @@ div#recaptcha_image { line-height: 330%; width: 200px; height: 230px; - box-shadow: inset 0px 0px 1.5em #000; + box-shadow: inset 0 0 1.5em #000; } .membersPage .groupBox:hover, .membersPage .userBox:hover { @@ -801,18 +785,18 @@ div#recaptcha_image { } .membersPage .groupBox:hover { - box-shadow: inset 0px 0px 1em #000; + box-shadow: inset 0 0 1em #000; } .membersPage .userBox:hover { - box-shadow: inset 0px 0px 1.5em #000; + box-shadow: inset 0 0 1.5em #000; } .membersPage .userBox img { width: 200px; height: 200px; display: block; - margin: 0px auto; + margin: 0 auto; } .membersPage .userBox .userBoxUserName { @@ -838,7 +822,7 @@ div#recaptcha_image { } .news-poster h2 { line-height: 11px; - margin: -5px 0px 0px; + margin: -5px 0 0; font-weight: 100; background: #9475B2; border-bottom-left-radius: 10px; @@ -847,5 +831,5 @@ div#recaptcha_image { height: 15px; } .news-comments-container { - margin: 5px auto 0px; + margin: 5px auto 0; } \ No newline at end of file diff --git a/public/content/data/mio/css/mionetics.css b/public/content/data/mio/css/mionetics.css index 85a2dbb..09c16f3 100755 --- a/public/content/data/mio/css/mionetics.css +++ b/public/content/data/mio/css/mionetics.css @@ -7,8 +7,8 @@ html { } body { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; background: url('//cdn.flashii.net/img/mionetics/body.png') #242424; text-align: center; @@ -33,7 +33,7 @@ a:hover { img.logo { height: 125px; width: 400px; - border: 0px; + border: 0; background: url('//cdn.flashii.net/img/mionetics/cyberneticlogo.png') no-repeat scroll left top transparent; background-size: cover; } @@ -48,7 +48,7 @@ div.navbar { border-width: 1px; border-style: solid; border-color: #3C3C3C transparent #131313 transparent; - margin: 5px auto 0px; + margin: 5px auto 0; } div.navbar a { @@ -59,12 +59,12 @@ hr { color: #404040; background: #404040; height: 1px; - border: 0px; + border: 0; } div.navbar ul { display: block; - margin: 0px auto; + margin: 0 auto; clear: both; text-align: center; } @@ -78,14 +78,12 @@ li.notcurrent { } li.current { - padding: 2px 1em; - padding-bottom: 4px; + padding: 2px 1em 4px; margin-left: -1px; } div.pagecontent, div.profile { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 880px; max-width: 1024px; border-width: 1px; @@ -100,11 +98,11 @@ div.profile { div.profile_cont { text-align: left; - padding: 0px 20px; + padding: 0 20px; } div.profile_cont hr { - border: 0px solid #000; + border: 0 solid #000; height: 1px; color: #000; background: #000; @@ -112,8 +110,7 @@ div.profile_cont hr { } div.mioboards, div.mioblog, div.miowhois { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 660px; max-width: 924px; border-width: 1px; @@ -123,8 +120,7 @@ div.mioboards, div.mioblog, div.miowhois { } div.miodonate { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 660px; max-width: 924px; border-width: 1px; @@ -133,15 +129,14 @@ div.miodonate { } div.miodonate h3 { - margin: 0px; + margin: 0; } div.miodonate hr { - margin-bottom: 0px; + margin-bottom: 0; } div.miodonate h2 { - margin: 0px; background: url('//cdn.flashii.net/img/mionetics/cell.png') repeat-x scroll left top #313131; border-width: 1px; border-style: solid; @@ -150,7 +145,7 @@ div.miodonate h2 { float: right; border-bottom-left-radius: 12px; display: inline-block; - margin-top: -1px; + margin: -1px 0 0; padding: 5px; } @@ -161,7 +156,6 @@ div.miodonate ul { div.miodonate li { list-style: none outside none; background: url("//cdn.flashii.net/img/mionetics/buttons.png") transparent; - margin: 0px; width: 815px; margin: 8px; height: 20px; @@ -178,7 +172,7 @@ div.mioucpbar { } div.miobottom{ - margin: 0px auto; + margin: 0 auto; overflow: auto; height: auto !important; } @@ -193,7 +187,7 @@ div.miobinner { h3.miotitle { background: url('//cdn.flashii.net/img/mionetics/buttons.png'); - margin-top: 0px; + margin-top: 0; text-align: left; padding: 3px; text-shadow: 1px 1px 2px #000; @@ -201,15 +195,15 @@ h3.miotitle { h2.miotitle { background: url('//cdn.flashii.net/img/mionetics/buttons.png'); - margin: 0px; + margin: 0; text-align: center; padding: 3px; - text-shadow: 0px 0px 2px #444; + text-shadow: 0 0 2px #444; } h1.miotitle { color: #330066; - margin: 0px; + margin: 0; text-align: center; } @@ -234,7 +228,7 @@ div.content { div.mioboxcontent { text-align: left; - margin: 0px; + margin: 0; line-height: 130%; overflow: auto; width: 100%; @@ -246,8 +240,7 @@ div.mioboxcontent h4 { } div.mioboards div.mioboxcontent { - padding: 0.25em 0.5em 0px; - padding-left: 20px; + padding: .25em .5em 0 20px; } div.miocolumn { @@ -267,18 +260,18 @@ a.boardlink:hover,a.boardlink:active { div.postcontent { text-align: left; - padding: 0px 10px 0px 10px; + padding: 0 10px 0 10px; } h3.title { - margin-top: 0px; + margin-top: 0; background: url("//cdn.flashii.net/img/mionetics/buttons.png") transparent; text-align: left; padding: 3px; } h1.title{ - margin-top: 0px; + margin-top: 0; background-color: #9475B2; text-align: left; padding: 5px; @@ -316,7 +309,7 @@ span.permalink a:hover { } input[type="text"],input[type="password"],input[type="date"],textarea{ - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; padding: 2px 4px 3px; border: 1px solid #AAA; outline: medium none; @@ -383,53 +376,50 @@ div.ucp_avatar_cont { .windowbutton-container { float: right; - margin-top: -2px; - margin-right: -2px; - margin-left: -2px; - margin-bottom: -2px; + margin: -2px; } .closebutton { cursor: pointer; height: 23px; width: 23px; - border: 0px; - background: url('//cdn.flashii.net/img/mionetics/window-sprite.png') no-repeat scroll 0px 0px transparent; + border: 0; + background: url('//cdn.flashii.net/img/mionetics/window-sprite.png') no-repeat scroll 0 0 transparent; } .maxbutton { cursor: pointer; height: 23px; width: 23px; - border: 0px; - background: url('//cdn.flashii.net/img/mionetics/window-sprite.png') no-repeat scroll 0px -23px transparent; + border: 0; + background: url('//cdn.flashii.net/img/mionetics/window-sprite.png') no-repeat scroll 0 -23px transparent; } .minbutton { cursor: pointer; height: 23px; width: 23px; - border: 0px; - background: url('//cdn.flashii.net/img/mionetics/window-sprite.png') no-repeat scroll 0px -46px transparent; + border: 0; + background: url('//cdn.flashii.net/img/mionetics/window-sprite.png') no-repeat scroll 0 -46px transparent; } .donate-btn { cursor: pointer; height: 26px; width: 90px; - border: 0px; - background: url('//cdn.flashii.net/img/mionetics/donate-btn.png') no-repeat scroll 0px 0px transparent; + border: 0; + background: url('//cdn.flashii.net/img/mionetics/donate-btn.png') no-repeat scroll 0 0 transparent; } div.topLeftBar { color: #000000; position: absolute; - left: 0px; + left: 0; background: #FBEEFF; padding: 1px 9px; border: 1px #9475B2 solid; - border-top: 0px; - border-left: 0px; + border-top: 0; + border-left: 0; box-shadow: 0 0 1.5em #808080; z-index: 997; } @@ -470,8 +460,7 @@ table.miotable { } table.miotablestandalone { - margin: 0px auto; - margin-top: 5px; + margin: 5px auto 0; min-width: 880px; max-width: 1024px; border: solid 1px #9475B2; @@ -548,7 +537,7 @@ table.miotablestandalone { } .registerbutton:hover, .loginbutton:hover { - text-shadow: 0px 0px 8px #F1F1F1; + text-shadow: 0 0 8px #F1F1F1; } /* Flashii Bar */ @@ -561,25 +550,24 @@ div.flashii-bar .barAvatar { div.flashii-bar { color: #FFF; position: absolute; - right: 0px; + right: 0; background: url('//cdn.flashii.net/img/mionetics/cathead.png') repeat-x scroll left top #2C2C2C; padding: 1px 9px; box-shadow: 0 0 .5em #808080; z-index: 997; - border-width: 1px; - border-style: solid; - border-color: #3C3C3C #121212 #131313 #404040; - border-top: 0px; - border-right: 0px; + border: 0 solid #3C3C3C; + border-right-color: #121212; + border-bottom: 1px #131313; + border-left: 1px #404040; } div.flashii-black { background: rgba(0,0,0,0.5); position: fixed; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; + top: 0; + left: 0; + right: 0; + bottom: 0; height: 100%; width: 100%; z-index: 998; @@ -599,7 +587,7 @@ div.flashii-horizon { text-align: center; position: absolute; top: 30%; - left: 0px; + left: 0; width: 100%; height: 1px; overflow: visible; @@ -614,13 +602,13 @@ div#flashii-login,div#flashii-register { border: solid 1px #9475B2; z-index: 999; background: #FBEEFF; - margin: 0px auto; + margin: 0 auto; } div#flashii-login h3,div#flashii-register h3 { background-color: #9475B2; color: rgb(51,0,102); - margin-top: 0px; + margin-top: 0; text-align: left; padding: 3px; } @@ -632,7 +620,7 @@ div#flashii-login h3 a,div#flashii-register h3 a { } div#flashii-login table,div#flashii-register table { - margin: 0px auto; + margin: 0 auto; text-align: left; } @@ -641,7 +629,7 @@ div#flashii-login tr td:first-child,div#flashii-register tr td:first-child{ border: 1px #746677 solid; color: #400070; font-weight: bold; - padding: 0px 5px; + padding: 0 5px; font-size: 10pt; width: 35% !important; } @@ -657,7 +645,7 @@ div#flashii-login table tr:last-child td, div#flashii-register table tr:last-chi } div#flashii-login #recaptcha_response_field,div#flashii-login input[type="text"],div#flashii-login input[type="password"],div#flashii-register #recaptcha_response_field,div#flashii-register input[type="text"],div#flashii-register input[type="password"] { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; padding: 2px 4px 3px; border: 1px solid #AAA; outline: medium none; @@ -671,7 +659,7 @@ div#flashii-login #recaptcha_response_field,div#flashii-login input[type="text"] } div#recaptcha_image { - margin: 0px 2px 0px 0px; + margin: 0 2px 0 0; border: 1px solid #AAA; outline: medium none; } @@ -687,7 +675,7 @@ div#recaptcha_image { /* some more shit */ .group-select { - margin: 0px auto; + margin: 0 auto; text-align: center; min-width: 330px !important; max-width: 945px; @@ -706,13 +694,13 @@ div#recaptcha_image { height: 175px; padding: 10px; transition: background 0.5s, box-shadow 0.2s; - box-shadow: inset 0px 0px 1.5em #000; + box-shadow: inset 0 0 1.5em #000; } .group-select-user:hover { background: #8364A1; cursor: pointer; - box-shadow: inset 0px 0px 2em #000; + box-shadow: inset 0 0 2em #000; } .group-select-user-avatar { @@ -724,15 +712,15 @@ div#recaptcha_image { .group-select-user-avatar img { max-height: 150px; max-width: 150px; - border: 0px; - padding: 0px; - margin: 0px; + border: 0; + padding: 0; + margin: 0; } .membersPage { width: 100%; - padding: 10px 0px; + padding: 10px 0; overflow: hidden; text-align: center; } @@ -753,7 +741,7 @@ div#recaptcha_image { padding: 7px; font-size: 15px; min-width: 150px; - box-shadow: inset 0px 0px 1em #000; + box-shadow: inset 0 0 1em #000; } .membersPage .userBox { @@ -761,7 +749,7 @@ div#recaptcha_image { line-height: 330%; width: 200px; height: 230px; - box-shadow: inset 0px 0px 1.5em #000; + box-shadow: inset 0 0 1.5em #000; } .membersPage .groupBox:hover, .membersPage .userBox:hover { @@ -769,18 +757,18 @@ div#recaptcha_image { } .membersPage .groupBox:hover { - box-shadow: inset 0px 0px 1em #000; + box-shadow: inset 0 0 1em #000; } .membersPage .userBox:hover { - box-shadow: inset 0px 0px 1.5em #000; + box-shadow: inset 0 0 1.5em #000; } .membersPage .userBox img { width: 200px; height: 200px; display: block; - margin: 0px auto; + margin: 0 auto; } .membersPage .userBox .userBoxUserName { diff --git a/public/content/data/misaki/css/error.css b/public/content/data/misaki/css/error.css index f975638..284eddb 100755 --- a/public/content/data/misaki/css/error.css +++ b/public/content/data/misaki/css/error.css @@ -54,7 +54,7 @@ ul { } li { - margin: 0px 0px 0.8em 3.46em; + margin: 0 0 .8em 3.46em; line-height: 1.32em; } diff --git a/public/content/data/misaki/css/misaki.css b/public/content/data/misaki/css/misaki.css index 14f2d73..3249b63 100755 --- a/public/content/data/misaki/css/misaki.css +++ b/public/content/data/misaki/css/misaki.css @@ -286,7 +286,7 @@ a:active { font-family: "Exo2-0-LightItalic", sans-serif; font-size: 2em; line-height: 30px; - letter-spacing: 0px; + letter-spacing: 0; text-shadow: 1px 1px 3px #111; margin-bottom: 5px; position: relative; @@ -353,8 +353,8 @@ a:active { z-index: 900; background: rgba(69, 56, 81, .5); position: absolute; - top: 0px; - right: 0px; + top: 0; + right: 0; list-style: none; padding: 35px 4px 5px; } diff --git a/public/content/data/yuuno/css/error.css b/public/content/data/yuuno/css/error.css index f975638..a97e8bb 100755 --- a/public/content/data/yuuno/css/error.css +++ b/public/content/data/yuuno/css/error.css @@ -5,7 +5,7 @@ body { } html { - background: url('/images/satori-error.png') top right no-repeat #FFF; + background: url('/content/images/satori-error.png') top right no-repeat #FFF; font-family: 'verdana', sans-serif; font-size: .8em; } @@ -54,7 +54,7 @@ ul { } li { - margin: 0px 0px 0.8em 3.46em; + margin: 0 0 .8em 3.46em; line-height: 1.32em; } diff --git a/public/content/data/yuuno/css/yuuno.css b/public/content/data/yuuno/css/yuuno.css index d90e9b2..c91c023 100755 --- a/public/content/data/yuuno/css/yuuno.css +++ b/public/content/data/yuuno/css/yuuno.css @@ -66,7 +66,7 @@ } 100% { - right: 0%; + right: 0; } } @@ -75,7 +75,7 @@ @keyframes slideOutToBottom { /* Read comment above */ 0% { - bottom: 0%; + bottom: 0; } 100% { @@ -181,7 +181,6 @@ img { img.homepage-menu-avatar { float: right; max-width: 100px; - max-width: 100px; margin-top: -25px; margin-right: 0; } @@ -322,8 +321,7 @@ a.default:active { } .homepage .content-right ul { - margin: 10px 0; - margin-left: 30px; + margin: 10px 0 10px 30px; } .dropDown { @@ -556,7 +554,6 @@ a.default:active { margin: 0 7px -2px 6px; display: inline-block; border-bottom: 2px solid #8364A1; - color: inherit; text-decoration: none; text-align: center; transition: background .3s, border-color .3s; @@ -714,7 +711,6 @@ a.default:active { .loginPage > .registerCont > *, .loginPage > .loginCont > * { text-align: center; - border: 1px solid #9475B2; margin: 10px auto; padding: 2px 3px; width: 400px; @@ -1001,9 +997,9 @@ a.default:active { @media (max-width: 600px) { #notifications { - top: 0px; - right: 0px; - left: 0px; + top: 0; + right: 0; + left: 0; bottom: none; max-width: 100%; height: auto; @@ -1727,14 +1723,14 @@ input[type="text"].inputStyling.red, input[type="password"].inputStyling.red, input[type="date"].inputStyling.red, input[type="url"].inputStyling.red { - box-shadow: inset 0px 0px 7px #EB5959; + box-shadow: inset 0 0 7px #EB5959; } input[type="text"].inputStyling.green, input[type="password"].inputStyling.green, input[type="date"].inputStyling.green, input[type="url"].inputStyling.green { - box-shadow: inset 0px 0px 7px #A9EC8B; + box-shadow: inset 0 0 7px #A9EC8B; } input[type="range"].inputStyling { @@ -2119,10 +2115,10 @@ textarea.inputStyling { } #comments .comment > .comment-pointer { - width: 0px; - height: 0px; + width: 0; + height: 0; border-style: solid; - border-width: 0px 15px 15px 0px; + border-width: 0 15px 15px 0; border-color: transparent #F6F6F6 transparent transparent; margin-top: 10px; } diff --git a/public/content/data/yuuno/js/ybabstat.js b/public/content/data/yuuno/js/ybabstat.js index d54295c..eca73ff 100755 --- a/public/content/data/yuuno/js/ybabstat.js +++ b/public/content/data/yuuno/js/ybabstat.js @@ -66,7 +66,7 @@ function hideYourMind(conflictions) { function twoThousandSixteenIsTheYearWePhysicallyMergeWithCats() { var diff = (new Date()).getTime() - startTime; - var vals = [-7 * 1 / Math.cos((diff / 500) * (.85 * Math.PI)), -7 * Math.tan((diff / 250) * (.85 * Math.PI))]; + var vals = [-7 / Math.cos((diff / 500) * (.85 * Math.PI)), -7 * Math.tan((diff / 250) * (.85 * Math.PI))]; document.body.style.position = 'absolute'; document.body.style.left = vals[0] + 'px'; diff --git a/public/content/data/yuuno/js/yuuno.js b/public/content/data/yuuno/js/yuuno.js index 2a6c74b..a36e40b 100755 --- a/public/content/data/yuuno/js/yuuno.js +++ b/public/content/data/yuuno/js/yuuno.js @@ -422,7 +422,7 @@ function ajaxPost(url, data, callback) { } - } + }; // Set headers request.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); @@ -504,7 +504,7 @@ function formToObject(formId) { var form = document.getElementById(formId); // Make an object for the request parts - var requestParts = new Object(); + var requestParts = {}; // Get all children with a name attribute var children = form.querySelectorAll('[name]'); @@ -622,8 +622,6 @@ function submitPostHandler(result, busyView, resetCaptchaOnFailure) { }, 2000); - return; - } // Encode UTF-8 @@ -644,7 +642,7 @@ function utf8_decode(str) { function uniqueChars(str) { // Create storage array and count var - var usedChars = new Array(); + var usedChars = []; var count = 0; // Count the amount of unique characters diff --git a/public/members.php b/public/members.php index 3c0baac..fcf3878 100755 --- a/public/members.php +++ b/public/members.php @@ -30,7 +30,7 @@ if (Users::checkLogin()) { $_MEMBERLIST_SORTS[0], 'page' => isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0, 'users' => array_chunk($_MEMBERLIST_ACTIVE && !$_MEMBERLIST_NFOUND ? - Users::getUsersInRank($_MEMBERLIST_ACTIVE, null, true, true) : + Users::getUsersInRank($_MEMBERLIST_ACTIVE, null, true) : Users::getAllUsers(), Configuration::getConfig('members_per_page'), true), ]; diff --git a/public/settings.php b/public/settings.php index cf6395f..c356d21 100755 --- a/public/settings.php +++ b/public/settings.php @@ -17,7 +17,7 @@ require_once str_replace(basename(__DIR__), '', dirname(__FILE__)) . '_sakura/sa // Notifications if (isset($_REQUEST['request-notifications']) && $_REQUEST['request-notifications']) { // Create the notification container array - $notifications = array(); + $notifications = []; // Check if the user is logged in if (Users::checkLogin()