diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
| commit | 0f575e03bb9af0b09d18a9207d9f589e05f44d50 (patch) | |
| tree | 18251a2d3e7c51adb8f265158ca0361f5cca73d1 /demos/tooltip | |
| parent | af1576280a807dcc166ddf619abab1fc24cac664 (diff) | |
| parent | 9df981d268b4029065247cf230a4e988946b7799 (diff) | |
| download | jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.tar.gz jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.zip | |
Merge branch 'master' into position-notification
Conflicts:
tests/unit/position/position_core_within.js
Diffstat (limited to 'demos/tooltip')
| -rw-r--r-- | demos/tooltip/custom-content.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/tooltip/custom-content.html b/demos/tooltip/custom-content.html index 41739cfa7..d6ce27f69 100644 --- a/demos/tooltip/custom-content.html +++ b/demos/tooltip/custom-content.html @@ -52,7 +52,7 @@ <div class="ui-widget photo"> <div class="ui-widget-header ui-corner-all"> <h2>St. Stephen's Cathedral</h2> - <h3><a href="http://maps.google.com/maps?q=vienna,+austria&z=11" data-geo>Vienna, Austria</a></h3> + <h3><a href="http://maps.google.com/maps?q=vienna,+austria&z=11" data-geo>Vienna, Austria</a></h3> </div> <a href="http://en.wikipedia.org/wiki/File:Wien_Stefansdom_DSC02656.JPG"> <img src="images/st-stephens.jpg" alt="St. Stephen's Cathedral" class="ui-corner-all"> @@ -62,7 +62,7 @@ <div class="ui-widget photo"> <div class="ui-widget-header ui-corner-all"> <h2>Tower Bridge</h2> - <h3><a href="http://maps.google.com/maps?q=london,+england&z=11" data-geo>London, England</a></h3> + <h3><a href="http://maps.google.com/maps?q=london,+england&z=11" data-geo>London, England</a></h3> </div> <a href="http://en.wikipedia.org/wiki/File:Tower_bridge_London_Twilight_-_November_2006.jpg"> <img src="images/tower-bridge.jpg" alt="Tower Bridge" class="ui-corner-all"> |