Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into dev

  • Loading branch information...
commit 3f41b77c3bc9cd95ba5cbe51d45f20a17997364e 2 parents 0ad4240 + ec1d904
@rfunduk authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 examples/interacting.html
View
4 examples/interacting.html
@@ -11,9 +11,9 @@
</head><body>
<h1>Flot Examples</h1>
- <div id="placeholder" style="width: 600px; height: 300px; position: relative;"><canvas width="600" height="300"></canvas><canvas style="position: absolute; left: 0px; top: 0px;" width="600" height="300"></canvas><div class="tickLabels" style="font-size: smaller; color: rgb(84, 84, 84);"><div style="position: absolute; top: 282px; left: -18.25px; width: 94.5px; text-align: center;" class="tickLabel">0</div><div style="position: absolute; top: 282px; left: 65.75px; width: 94.5px; text-align: center;" class="tickLabel">2</div><div style="position: absolute; top: 282px; left: 149.75px; width: 94.5px; text-align: center;" class="tickLabel">4</div><div style="position: absolute; top: 282px; left: 233.75px; width: 94.5px; text-align: center;" class="tickLabel">6</div><div style="position: absolute; top: 282px; left: 317.75px; width: 94.5px; text-align: center;" class="tickLabel">8</div><div style="position: absolute; top: 282px; left: 401.75px; width: 94.5px; text-align: center;" class="tickLabel">10</div><div style="position: absolute; top: 282px; left: 485.75px; width: 94.5px; text-align: center;" class="tickLabel">12</div><div style="position: absolute; top: 272px; left: 0pt; width: 22px; text-align: right;" class="tickLabel">-1.5</div><div style="position: absolute; top: 217.883px; left: 0pt; width: 22px; text-align: right;" class="tickLabel">-1.0</div><div style="position: absolute; top: 163.766px; left: 0pt; width: 22px; text-align: right;" class="tickLabel">-0.5</div><div style="position: absolute; top: 109.65px; left: 0pt; width: 22px; text-align: right;" class="tickLabel">0.0</div><div style="position: absolute; top: 55.5327px; left: 0pt; width: 22px; text-align: right;" class="tickLabel">0.5</div><div style="position: absolute; top: 1.41591px; left: 0pt; width: 22px; text-align: right;" class="tickLabel">1.0</div></div></div>
+ <div id="placeholder" style="width: 600px; height: 300px;"></div>
- <p>Try clicking on the plot above. <span id="result"></span></p>
+ <p>Try hovering or clicking on the plot above. <span id="result"></span></p>
<script id="source" language="javascript" type="text/javascript">
$(function () {
Please sign in to comment.
Something went wrong with that request. Please try again.