From 8d01f98767b0518d14f0dd72e47aa5266d41bc7a Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Thu, 7 Mar 2013 02:54:49 -0600 Subject: Adding db.inc.php --- includes/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 includes/.gitignore diff --git a/includes/.gitignore b/includes/.gitignore new file mode 100644 index 0000000..4f36fe0 --- /dev/null +++ b/includes/.gitignore @@ -0,0 +1 @@ +/db.inc.php -- cgit v1.2.3 From ef912adeeac6be3d623d602ce17f69b15ce65aa8 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Thu, 7 Mar 2013 02:58:52 -0600 Subject: Supposedly this is supposed to delete it from the cache but not locally..... --- includes/db.inc.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 includes/db.inc.php diff --git a/includes/db.inc.php b/includes/db.inc.php deleted file mode 100644 index 6cd3f01..0000000 --- a/includes/db.inc.php +++ /dev/null @@ -1,11 +0,0 @@ - -- cgit v1.2.3 From 7e47f4fbf42cb4f99eb68a1e6310785f7972bde8 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Thu, 7 Mar 2013 03:22:08 -0600 Subject: Improved colors for currently running maps --- css/stats.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/css/stats.css b/css/stats.css index 3028d91..1a96475 100644 --- a/css/stats.css +++ b/css/stats.css @@ -115,10 +115,11 @@ } .mapThumbnail.current { - background-color:#557; + background-color: #373737; + color: #CCCCCC; } .mapThumbnail.current:hover { - background-color:#668; + background-color:#474747; } -- cgit v1.2.3 From ba050a8f540232b84fffc48e56bbe018caff9e49 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Thu, 7 Mar 2013 03:55:05 -0600 Subject: Added a "solution not available" message to currently-running maps --- css/stats.css | 14 ++++++++++++++ pages/scores.php | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/css/stats.css b/css/stats.css index 1a96475..7539644 100644 --- a/css/stats.css +++ b/css/stats.css @@ -121,6 +121,20 @@ .mapThumbnail.current:hover { background-color:#474747; } +#currentMapMessage +{ + color: #FF2818; + display: none; + text-align: center; + padding-bottom: 12px; +} + +#currentMapMessage span +{ + background-color: #1A1A1A; + border-radius: 8px 8px 8px 8px; + padding: 3px 10px; +} table { diff --git a/pages/scores.php b/pages/scores.php index 37ef45c..ee7c88b 100644 --- a/pages/scores.php +++ b/pages/scores.php @@ -90,6 +90,13 @@ function displayMapScores(mapID) { $('#scoreDisplay').empty(); newDiv.prependTo('#scoreDisplay'); } + + //Hack: display the "current map" div for currently running maps + //Relies on the fact that the #thumb_ div has a single child with the 'current' class.. + var showCurrentMapMessage = $('#thumb_'+mapID).children().hasClass('current'); + $('#currentMapMessage').toggle(showCurrentMapMessage); + + $("#mapDisplay").fadeOut('fast'); displayMap(mapID, "mapDisplay", 682); scoresShowPage(pointerPage, mapID); @@ -282,7 +289,7 @@ topbar($Links);
- +
This map is currently running, so points/solutions are not available
-- cgit v1.2.3 From f7b36706f5a63958e2fdc4ca637297e93a580be4 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Thu, 7 Mar 2013 03:57:32 -0600 Subject: Moved #displayDate to CSS, fixed padding --- css/stats.css | 6 ++++++ pages/scores.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/css/stats.css b/css/stats.css index 7539644..1009476 100644 --- a/css/stats.css +++ b/css/stats.css @@ -1,3 +1,9 @@ +#displayDate +{ + font-size: 105%; + text-align: center; + padding: 7px 0px; +} .col1 { float: left; margin-right: 8px; diff --git a/pages/scores.php b/pages/scores.php index ee7c88b..9819b01 100644 --- a/pages/scores.php +++ b/pages/scores.php @@ -278,7 +278,7 @@ topbar($Links);
-
+
Loading...
-- cgit v1.2.3 From d4fce99f8149f352f5bba9deced0c98198d5c4d9 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Thu, 7 Mar 2013 04:26:49 -0600 Subject: Changed pointer on left/right arrows in score page, and made them unselectable (via new global '.unselectable' class, which you can use elsewhere if you want) --- css/page.css | 9 +++++++++ css/stats.css | 2 +- includes/header.php | 3 +-- js/globe.js | 12 ++++++++---- js/scores.js | 25 +++++++++++++------------ pages/scores.php | 4 ++-- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/css/page.css b/css/page.css index 46563d2..ec0f1c9 100644 --- a/css/page.css +++ b/css/page.css @@ -507,5 +507,14 @@ table.score th { background-color:#356; cursor:default; } +.unselectable +{ + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} diff --git a/css/stats.css b/css/stats.css index 1009476..282f58a 100644 --- a/css/stats.css +++ b/css/stats.css @@ -63,7 +63,7 @@ cursor: auto; } .mapNavActive { - cursor: auto; + cursor: pointer; } .mapNavActive:hover { background-color: #343c57; diff --git a/includes/header.php b/includes/header.php index 44d028e..cf427e4 100644 --- a/includes/header.php +++ b/includes/header.php @@ -20,11 +20,10 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a foreach ($scripts as $s) echo ""; ?> + - -