From f5b9dfa824ee0343403c717528fde1f0dd846fe0 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 11:21:11 +1030 Subject: [PATCH 1/9] Added in temp resonator levels --- code/portal_detail_display_tools.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index a894e3a4..099ba90f 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -117,10 +117,15 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick) { + 'owner:\t\t' + nick + '\n' + 'cardinal:\t' + SLOT_TO_CARDINAL[slot]; + var style = 'width:'+fillGrade+'%; background:'+COLORS_LVL[level]+'; color:'+COLORS_LVL[level]; + + var lbar = '
' + level + '
'; + var fill = ''; - var meter = '' - + fill + ''; + + var meter = '' + + fill + lbar + ''; } var cls = slot <= 3 ? 'left' : 'right'; var text = ''+(nick||'')+''; From 246fb1650966bd301e36e8a9b8d58ac4e0a83aa5 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 12:03:09 +1030 Subject: [PATCH 2/9] Updated stylesheet --- style.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/style.css b/style.css index 35e9ee8c..e18b9e26 100644 --- a/style.css +++ b/style.css @@ -438,6 +438,17 @@ aside:nth-child(odd) span { height: 14px; } +.meter-rel { + position: relative; + left: 0; + top: 0; +} + +.meter-level { + position: absolute; + top: -2px; + left: 25px; +} /* links below resos */ .linkdetails { From 64ccf2928da86c940b1c376e40da81e8a2b053b0 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 12:23:39 +1030 Subject: [PATCH 3/9] Added resonator level to portal info panel --- code/portal_detail_display_tools.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index 099ba90f..3840a2f7 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -120,11 +120,15 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick) { var style = 'width:'+fillGrade+'%; background:'+COLORS_LVL[level]+'; color:'+COLORS_LVL[level]; - var lbar = '
' + level + '
'; + var colour = "#FFFFFF"; + if (level < 3) { + colour = "#9900FF"; + } + var lbar = '
' + level + '
'; var fill = ''; - var meter = '' + var meter = '' + fill + lbar + ''; } var cls = slot <= 3 ? 'left' : 'right'; From aef5465529f7a87ba20a19e96cc12dc8236fe5f5 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 12:30:51 +1030 Subject: [PATCH 4/9] Added contributors to README.md, included names from closed pull requests --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index d6261127..07f434b9 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,15 @@ Please do! (Obviously, Resistance folks must send in complete patches while Enlightenment gals and guys may just open feature request ☺) +Contributors +------------ + +[integ3r](https://github.com/integ3r) +[Bananeweizen](https://github.com/Bananeweizen) +[epf](https://github.com/epf) +[JasonMillward](https://github.com/JasonMillward) + + Hacking ------- From acfc378af8c7ff34122e451b20425635f9b8e2d2 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 12:31:37 +1030 Subject: [PATCH 5/9] Added linebreaks to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 07f434b9..727ced21 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,11 @@ Contributors ------------ [integ3r](https://github.com/integ3r) + [Bananeweizen](https://github.com/Bananeweizen) + [epf](https://github.com/epf) + [JasonMillward](https://github.com/JasonMillward) From 3e3f9f9a9f0411a17b3f74ebaa0fabaa76210793 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 15:15:22 +1030 Subject: [PATCH 6/9] Added text shadow to style.css --- style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/style.css b/style.css index e18b9e26..27f3e208 100644 --- a/style.css +++ b/style.css @@ -448,6 +448,7 @@ aside:nth-child(odd) span { position: absolute; top: -2px; left: 25px; + text-shadow: 2px 2px #FFFFFF; } /* links below resos */ From f59d88a0e693ae23f719885535093508e4b3e7f5 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 15:26:02 +1030 Subject: [PATCH 7/9] Changing textshadow again --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 27f3e208..f6bbbb1a 100644 --- a/style.css +++ b/style.css @@ -448,7 +448,7 @@ aside:nth-child(odd) span { position: absolute; top: -2px; left: 25px; - text-shadow: 2px 2px #FFFFFF; + text-shadow: black 0.0em 0.0em 0.2em; } /* links below resos */ From 9ba9273230aef7048024c9f129187df1098f0e54 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 15:33:11 +1030 Subject: [PATCH 8/9] 0.3em seems to work a lot better then 0.2 --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index f6bbbb1a..9a6031e1 100644 --- a/style.css +++ b/style.css @@ -448,7 +448,7 @@ aside:nth-child(odd) span { position: absolute; top: -2px; left: 25px; - text-shadow: black 0.0em 0.0em 0.2em; + text-shadow: black 0.0em 0.0em 0.3em; } /* links below resos */ From ecb383158b1114a3b8437d2d7fde0fd7474be5f1 Mon Sep 17 00:00:00 2001 From: JasonMillward Date: Fri, 8 Feb 2013 16:04:41 +1030 Subject: [PATCH 9/9] Changed colour to color, remove color from old span tag --- code/portal_detail_display_tools.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index 3840a2f7..244121e7 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -117,14 +117,11 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick) { + 'owner:\t\t' + nick + '\n' + 'cardinal:\t' + SLOT_TO_CARDINAL[slot]; + var style = 'width:'+fillGrade+'%; background:'+COLORS_LVL[level]+';'; - var style = 'width:'+fillGrade+'%; background:'+COLORS_LVL[level]+'; color:'+COLORS_LVL[level]; + var color = (level < 3 ? "#9900FF" : "#FFFFFF"); - var colour = "#FFFFFF"; - if (level < 3) { - colour = "#9900FF"; - } - var lbar = '
' + level + '
'; + var lbar = ' ' + level + ' '; var fill = '';