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 | |
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')
-rw-r--r-- | demos/autocomplete/custom-data.html | 2 | ||||
-rw-r--r-- | demos/demos.css | 2 | ||||
-rw-r--r-- | demos/draggable/snap-to.html | 4 | ||||
-rw-r--r-- | demos/index.html | 2 | ||||
-rw-r--r-- | demos/menu/default.html | 4 | ||||
-rw-r--r-- | demos/menu/navigationmenu.html | 2 | ||||
-rw-r--r-- | demos/menu/topalignmenu.html | 17 | ||||
-rw-r--r-- | demos/position/cycler.html | 6 | ||||
-rw-r--r-- | demos/sortable/empty-lists.html | 2 | ||||
-rw-r--r-- | demos/tooltip/custom-content.html | 4 |
10 files changed, 24 insertions, 21 deletions
diff --git a/demos/autocomplete/custom-data.html b/demos/autocomplete/custom-data.html index c04c6905a..8f6eaa633 100644 --- a/demos/autocomplete/custom-data.html +++ b/demos/autocomplete/custom-data.html @@ -79,7 +79,7 @@ <div class="demo"> <div id="project-label">Select a project (type "j" for a start):</div> - <img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default"> + <img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default" alt=""> <input id="project"> <input type="hidden" id="project-id"> <p id="project-description"></p> diff --git a/demos/demos.css b/demos/demos.css index cf6da8bd1..807d025b5 100644 --- a/demos/demos.css +++ b/demos/demos.css @@ -18,6 +18,8 @@ body { .layout-grid { width: 960px; + border-spacing: 0; + border-collapse: collapse; } .layout-grid td { diff --git a/demos/draggable/snap-to.html b/demos/draggable/snap-to.html index 320cb7947..a0f38f866 100644 --- a/demos/draggable/snap-to.html +++ b/demos/draggable/snap-to.html @@ -28,12 +28,12 @@ <body> <div class="demo"> - + <div id="snaptarget" class="ui-widget-header"> <p>I'm a snap target</p> </div> -<br clear="both" /> +<br style="clear:both" /> <div id="draggable" class="draggable ui-widget-content"> <p>Default (snap: true), snaps to all other draggable elements</p> diff --git a/demos/index.html b/demos/index.html index f96753d37..678c9961f 100644 --- a/demos/index.html +++ b/demos/index.html @@ -269,7 +269,7 @@ </head> <body> -<table class="layout-grid" cellspacing="0" cellpadding="0"> +<table class="layout-grid"> <tr> <td class="left-nav"> <dl class="demos-nav"> diff --git a/demos/menu/default.html b/demos/menu/default.html index 9f2e21622..b1c0b9fbb 100644 --- a/demos/menu/default.html +++ b/demos/menu/default.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en"> <head> - <meta charset="UTF-8" /> + <meta charset="utf-8"> <title>jQuery UI Menu - Default demo</title> <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" /> <script src="../../jquery-1.7.2.js"></script> @@ -15,7 +15,7 @@ }); </script> <style> - + </style> </head> <body> diff --git a/demos/menu/navigationmenu.html b/demos/menu/navigationmenu.html index 970b20890..8c7b2b993 100644 --- a/demos/menu/navigationmenu.html +++ b/demos/menu/navigationmenu.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en"> <head> - <meta charset="UTF-8" /> + <meta charset="utf-8"> <title>jQuery UI Menu - Navigation Menu demo</title> <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" /> <script src="../../jquery-1.7.2.js"></script> diff --git a/demos/menu/topalignmenu.html b/demos/menu/topalignmenu.html index deb8fbb6f..7b7e052e4 100644 --- a/demos/menu/topalignmenu.html +++ b/demos/menu/topalignmenu.html @@ -1,15 +1,16 @@ <!doctype html> <html> <head> + <meta charset="utf-8"> <title>Menu Demo: Top-aligned Menu</title> - <link rel="stylesheet" href="../demos.css" type="text/css" /> - <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" /> - <script type="text/javascript" src="../../jquery-1.7.2.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script> - <script type="text/javascript"> + <link type="text/css" href="../demos.css" rel="stylesheet" /> + <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" /> + <script src="../../jquery-1.7.2.js"></script> + <script src="../../ui/jquery.ui.core.js"></script> + <script src="../../ui/jquery.ui.widget.js"></script> + <script src="../../ui/jquery.ui.position.js"></script> + <script src="../../ui/jquery.ui.menu.js"></script> + <script> $(function() { $("#topMenu").menu({ position: { of: "ul:has(a.ui-state-focus):last" } diff --git a/demos/position/cycler.html b/demos/position/cycler.html index 084b10fc1..490d88fcb 100644 --- a/demos/position/cycler.html +++ b/demos/position/cycler.html @@ -101,9 +101,9 @@ <div class="demo"> -<img src="images/earth.jpg" width="458" height="308" /> -<img src="images/flight.jpg" width="512" height="307" /> -<img src="images/rocket.jpg" width="300" height="353" /> +<img src="images/earth.jpg" width="458" height="308" alt="earth" /> +<img src="images/flight.jpg" width="512" height="307" alt="flight" /> +<img src="images/rocket.jpg" width="300" height="353" alt="rocket" /> <a id="previous" href="#">Previous</a> <a id="next" href="#">Next</a> diff --git a/demos/sortable/empty-lists.html b/demos/sortable/empty-lists.html index f49b1072f..87b581844 100644 --- a/demos/sortable/empty-lists.html +++ b/demos/sortable/empty-lists.html @@ -51,7 +51,7 @@ <ul id="sortable3" class='droptrue'> </ul> -<br clear="both" /> +<br style="clear:both" /> </div><!-- End demo --> 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"> |