From 159992a5fa3456e036888c9e9d8a06409f272db6 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 02:46:45 -0600 Subject: Added champion points to leaderboard page --- css/stats.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'css') diff --git a/css/stats.css b/css/stats.css index ab4cb96..23a6003 100644 --- a/css/stats.css +++ b/css/stats.css @@ -112,3 +112,13 @@ td, th { white-space:nowrap; } +.wrapper .col1 #myPoints +{ + text-align: center; + color: #00DDFF; +} + +.wrapper .col1 #myPoints #myPointsValue +{ + font-weight: bold; +} \ No newline at end of file -- cgit v1.2.3 From 03c60352dfc39d1272bd1a7136025e5fac17f556 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 02:59:20 -0600 Subject: Minor change to make the challenge_incomplete color less intense --- css/challenge.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'css') diff --git a/css/challenge.css b/css/challenge.css index 1f51a9e..0380f4f 100644 --- a/css/challenge.css +++ b/css/challenge.css @@ -6,12 +6,12 @@ } #challenge_wrapper #challenges_listing { } .challenge_complete { - color:green; + color:#008000; font-weight: normal; } .challenge_incomplete { font-weight: bold; - color:red; + color:#DD1111; } .challenge_complete a { -- cgit v1.2.3 From 062d17b2721757801bee90764d36384d18f1e4b1 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 03:36:18 -0600 Subject: Moved the social-buttons next to the copyright to make the footer a bit more compact --- css/page.css | 30 +++++++++++++++++++++--------- includes/header.php | 24 +++++++++++------------- 2 files changed, 32 insertions(+), 22 deletions(-) (limited to 'css') diff --git a/css/page.css b/css/page.css index 40027ca..13884dd 100644 --- a/css/page.css +++ b/css/page.css @@ -51,10 +51,9 @@ form { float:left; display:inline; } + .divide { - font-weight:bold; - padding: 15px 15px; - margin: 12px auto; + padding: 15px 0px; text-align: center; position: relative; min-width: 900px; @@ -70,6 +69,25 @@ form { } +.copyAndButtons +{ + margin: 0 auto; + width: 900px; +} + +.copyAndButtons #copy +{ + clear: both; + float: left; + margin-left: 240px; +} + +.copyAndButtons #socialButtons +{ + float: left; + margin: 0 auto; +} + #countdown { text-align: center; margin-top: 5px; @@ -107,12 +125,6 @@ a:hover { -moz-transition:color 0s ease-out; } -.socialButtons { - text-align:right; - margin: 0px auto; - width:890px; -} - .buttons a { margin: 1px; opacity: 0.7; diff --git a/includes/header.php b/includes/header.php index 2a6e940..d0a54bd 100644 --- a/includes/header.php +++ b/includes/header.php @@ -62,16 +62,7 @@ function htmlFooter() { global $footerLinks; - echo "
- - - -
"; + echo "
"; echo "
    "; foreach ($footerLinks as $key => $value) { echo "
  • $value
    • "; @@ -79,9 +70,16 @@ function htmlFooter() { echo "
"; ?> - -
- Copyright © 2011-2012 pathery.com +
+
+ Copyright © 2011-2012 pathery.com +
+
+ Facebook + Reddit + Twitter + Google Plus +

-- cgit v1.2.3 From dd06f9f378dcae2bd12109f644c614721bf60bd4 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 03:36:44 -0600 Subject: Added a fix for IE to remove the border around the social-buttons. --- css/page.css | 1 + 1 file changed, 1 insertion(+) (limited to 'css') diff --git a/css/page.css b/css/page.css index 13884dd..db32892 100644 --- a/css/page.css +++ b/css/page.css @@ -124,6 +124,7 @@ a:hover { -o-transition:color 0s ease-out; -moz-transition:color 0s ease-out; } +a img {border: none;} /* IE specific: remove outline around image links */ .buttons a { margin: 1px; -- cgit v1.2.3 From 3917765f10b0a3024634bef1ff0c49d700abdfa1 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 14:41:12 -0600 Subject: Fixed minor CSS issue with leaderboard page --- css/stats.css | 4 ++-- pages/leaderboard.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'css') diff --git a/css/stats.css b/css/stats.css index 23a6003..d262a75 100644 --- a/css/stats.css +++ b/css/stats.css @@ -112,13 +112,13 @@ td, th { white-space:nowrap; } -.wrapper .col1 #myPoints +.wrapper .col1 .myPoints { text-align: center; color: #00DDFF; } -.wrapper .col1 #myPoints #myPointsValue +.wrapper .col1 .myPoints .myPointsValue { font-weight: bold; } \ No newline at end of file diff --git a/pages/leaderboard.php b/pages/leaderboard.php index 62cc54d..4636429 100644 --- a/pages/leaderboard.php +++ b/pages/leaderboard.php @@ -307,7 +307,7 @@ function displaystats($result, $caption = NULL) { $r = ''; if($championPoints != null) { - $r .= "
Points earned: $championPoints
"; + $r .= "
Points earned: $championPoints
"; } $r .= ""; $r .= ""; -- cgit v1.2.3 From 994998fcca96e69bfbd7eed09e3c0023aadc2ce1 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 15:57:36 -0600 Subject: Updated CSS of leaderboard page to not get ridiculously large with long names, and not make the points-string off-center --- css/stats.css | 26 +++++++++++++++++++++++--- pages/leaderboard.php | 12 ++++++------ 2 files changed, 29 insertions(+), 9 deletions(-) (limited to 'css') diff --git a/css/stats.css b/css/stats.css index d262a75..28d6842 100644 --- a/css/stats.css +++ b/css/stats.css @@ -9,7 +9,7 @@ margin-right: 0px; margin-left: 12px; float: left; - width: 300px; + max-width: 340px; height: auto; } .col { @@ -37,6 +37,26 @@ table { td, th { padding: 3px; } + +.leaderboardHeaders .leaderboardHeadersRank, +.leaderboardHeaders .leaderboardHeadersName, +.leaderboardHeaders .leaderboardHeadersMoves, +.leaderboardHeaders .leaderboardHeadersTime +{ + border:1px solid #ccc; +} + +.leaderboardHeaders .leaderboardHeadersRank { width: 40px; } +.leaderboardHeaders .leaderboardHeadersName, +.leaderboardName +{ + max-width: 140px; + text-overflow: ellipsis; + overflow: hidden; +} +.leaderboardHeaders .leaderboardHeadersMoves { width: 45px; } +.leaderboardHeaders .leaderboardHeadersTime { width: 85px; } + .lbrow { /* Temporary adjust for font changes */ font-size:105%; @@ -112,13 +132,13 @@ td, th { white-space:nowrap; } -.wrapper .col1 .myPoints +.myPoints { text-align: center; color: #00DDFF; } -.wrapper .col1 .myPoints .myPointsValue +.myPoints .myPointsValue { font-weight: bold; } \ No newline at end of file diff --git a/pages/leaderboard.php b/pages/leaderboard.php index 4636429..1c6ef89 100644 --- a/pages/leaderboard.php +++ b/pages/leaderboard.php @@ -256,11 +256,11 @@ function displayPastMaze($mapType, $name, $daysAgo = 1) { function displaystats($result, $caption = NULL) { //Get names. - $headers = ""; - $headers .= ""; - $headers .= ""; - $headers .= ""; - $headers .= ""; + $headers = ""; + $headers .= ""; + $headers .= ""; + $headers .= ""; + $headers .= ""; $headers .= ""; //Start table //$r .= "
$caption
RankNameMovesTime taken
RankNameMovesTime taken
"; @@ -288,7 +288,7 @@ function displaystats($result, $caption = NULL) { $x = "\n"; $x .= ""; - $x .= ""; + $x .= ""; //$x .= "'; $x .= ''; $x .= ''; -- cgit v1.2.3 From 532faa4d5cc5b20fba8422c87b0aac846874af43 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sun, 13 Jan 2013 20:36:11 -0600 Subject: Replaced bullet-points with challenge images on challenge page --- css/challenge.css | 48 +++++++++++++++++++++++++++++++++--------------- pages/challenge.php | 8 +++----- 2 files changed, 36 insertions(+), 20 deletions(-) (limited to 'css') diff --git a/css/challenge.css b/css/challenge.css index 0380f4f..787679f 100644 --- a/css/challenge.css +++ b/css/challenge.css @@ -5,11 +5,30 @@ font-weight: bold; } #challenge_wrapper #challenges_listing { } -.challenge_complete { - color:#008000; +.challenge_ulist +{ + list-style-type:none; + padding-left:0px; + margin-left:0px; +} +.challenge_ulist li +{ + /* Replace the bullet-points with challenge complete/incomplete images */ + background-position: 0 5px; + background-repeat: no-repeat; + background-size: 28px 28px; + padding-left: 30px; + padding-top: 6px; +} +.challenge_ulist .challenge_complete +{ + background-image:url('../images/challenge_complete.png'); font-weight: normal; + color:#008000; } -.challenge_incomplete { +.challenge_ulist .challenge_incomplete +{ + background-image:url('../images/challenge_incomplete.png'); font-weight: bold; color:#DD1111; } @@ -21,18 +40,6 @@ display: none; } -.challengelist_map { - float:left; - padding: 15px; - background-color:#333; - margin: 20px; - border-radius:10px; - cursor:pointer; -} -.challengelist_map:hover { - background-color:#444; -} - /** Challenge listing page **/ #challengelist_wrapper #challengelist {} #challengelist_wrapper #challengelist .challengelist_tier { @@ -54,4 +61,15 @@ height: 32px; background-image: url("../images/challenge_incomplete.png"); float: right; +} +.challengelist_map { + float:left; + padding: 15px; + background-color:#333; + margin: 20px; + border-radius:10px; + cursor:pointer; +} +.challengelist_map:hover { + background-color:#444; } \ No newline at end of file diff --git a/pages/challenge.php b/pages/challenge.php index 35c9525..ceefebe 100644 --- a/pages/challenge.php +++ b/pages/challenge.php @@ -131,21 +131,19 @@ function displayChallenges($challengeResultset) { echo '
'; echo '
Challenges
'; - echo '
    '; + echo '
      '; while($challenge = mysql_fetch_array($challengeResultset)) { $mapID = $_GET["mapID"]; $challengeId = $challenge["challengeID"]; - echo "
    • "; if($challenge["dateSolved"] !== NULL) $cssClass = "challenge_complete"; else $cssClass = "challenge_incomplete"; $loadSolutionString = " Load this solution"; - echo "" . getChallengeDisplayString($challenge) . " $loadSolutionString "; - echo "
      • "; + echo "
    • " . getChallengeDisplayString($challenge) . " $loadSolutionString
      • "; } - echo "
"; + echo ""; } /** -- cgit v1.2.3
$i$displayName$displayName" . $row['Name'] . '' . $row['Moves'] . '' . $row['Timetaken'] . '