diff options
| -rw-r--r-- | css/challenge.css | 18 | ||||
| -rw-r--r-- | includes/emails.php | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/css/challenge.css b/css/challenge.css index 787679f..a7f7465 100644 --- a/css/challenge.css +++ b/css/challenge.css @@ -40,6 +40,24 @@ display: none; } +<<<<<<< HEAD +.challengelist_map { + float:left; + padding: 15px; + background-color:#333; + margin: 20px; + border-radius:10px; + cursor:pointer; +} +.challengelist_map:hover { + background-color:#444; +} +.challengelist_tier { + border-width: 0px 0px 1px 1px; +} + +======= +>>>>>>> origin/HEAD /** Challenge listing page **/ #challengelist_wrapper #challengelist {} #challengelist_wrapper #challengelist .challengelist_tier { diff --git a/includes/emails.php b/includes/emails.php index 84f657c..c971f25 100644 --- a/includes/emails.php +++ b/includes/emails.php @@ -3,6 +3,10 @@ * Email methods; QueueEmail and SendQueuedEmail
*/
+//Email sending lock
+define('FILE_EMAIL_LOCK', './emailLockFile');
+
+
//Returns false if nothing is sent.
function SendQueuedEmail() {
//Delay by x seconds per email:
|