diff options
author | Richard Worth <rdworth@gmail.com> | 2008-12-31 06:29:31 +0000 |
---|---|---|
committer | Richard Worth <rdworth@gmail.com> | 2008-12-31 06:29:31 +0000 |
commit | 016eb2487a0c781d35a75131134db97453f8ace7 (patch) | |
tree | 58bf4c827f7f946bd8730462e64cd10dae6fce2f /demos/droppable | |
parent | ac1866a7b09c6356d2ab25215f6de2bf0ee12803 (diff) | |
download | jquery-ui-016eb2487a0c781d35a75131134db97453f8ace7.tar.gz jquery-ui-016eb2487a0c781d35a75131134db97453f8ace7.zip |
demos: moved the demos.css link down so it can override default theme styles. other minor updates.
Diffstat (limited to 'demos/droppable')
-rw-r--r-- | demos/droppable/accept.html | 10 | ||||
-rw-r--r-- | demos/droppable/activeclass.html | 6 | ||||
-rw-r--r-- | demos/droppable/default.html | 6 | ||||
-rw-r--r-- | demos/droppable/greedy.html | 10 | ||||
-rw-r--r-- | demos/droppable/hoverclass.html | 6 | ||||
-rw-r--r-- | demos/droppable/revert.html | 6 | ||||
-rw-r--r-- | demos/droppable/tolerance.html | 6 |
7 files changed, 23 insertions, 27 deletions
diff --git a/demos/droppable/accept.html b/demos/droppable/accept.html index e49a250ff..1ef776dc6 100644 --- a/demos/droppable/accept.html +++ b/demos/droppable/accept.html @@ -2,20 +2,20 @@ <html lang="en"> <head> <title>jQuery UI Droppable - accept</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - .ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } + #draggable, #draggable-nonvalid { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { - $("#draggable,#draggable-nonvalid").draggable(); + $("#draggable, #draggable-nonvalid").draggable(); $("#droppable").droppable({ accept: '#draggable', @@ -39,8 +39,6 @@ <p>Drag me to my target</p> </div> - - <div id="droppable" class="ui-widget-header"> <p>accept: '#draggable'</p> </div> diff --git a/demos/droppable/activeclass.html b/demos/droppable/activeclass.html index 9c97d3ea3..08b7afa85 100644 --- a/demos/droppable/activeclass.html +++ b/demos/droppable/activeclass.html @@ -2,15 +2,15 @@ <html lang="en"> <head> <title>jQuery UI Droppable - activeClass</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - .ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { diff --git a/demos/droppable/default.html b/demos/droppable/default.html index 051636a1c..375a45871 100644 --- a/demos/droppable/default.html +++ b/demos/droppable/default.html @@ -2,15 +2,15 @@ <html lang="en"> <head> <title>jQuery UI Droppable - Default Demo</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - .ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { diff --git a/demos/droppable/greedy.html b/demos/droppable/greedy.html index d4bdb3fb9..7bb7144e9 100644 --- a/demos/droppable/greedy.html +++ b/demos/droppable/greedy.html @@ -2,16 +2,16 @@ <html lang="en"> <head> <title>jQuery UI Droppable - greedy</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - #droppable,#droppable2 { width: 200px; height: 160px; padding: 0.5em; float: left; margin: 10px; } - #droppable-inner,#droppable2-inner { width: 140px; height: 100px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #droppable, #droppable2 { width: 200px; height: 160px; padding: 0.5em; float: left; margin: 10px; } + #droppable-inner, #droppable2-inner { width: 140px; height: 100px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { @@ -44,8 +44,6 @@ <p>Drag me to my target</p> </div> - - <div id="droppable" class="ui-widget-header"> <p>Outer droppable (greedy deactivated)</p> <div id="droppable-inner" class="ui-widget-header"> diff --git a/demos/droppable/hoverclass.html b/demos/droppable/hoverclass.html index be6e9f9b8..eef118ac5 100644 --- a/demos/droppable/hoverclass.html +++ b/demos/droppable/hoverclass.html @@ -2,15 +2,15 @@ <html lang="en"> <head> <title>jQuery UI Droppable - hoverClass</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - .ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { diff --git a/demos/droppable/revert.html b/demos/droppable/revert.html index 56a3ea369..089fb14a6 100644 --- a/demos/droppable/revert.html +++ b/demos/droppable/revert.html @@ -2,15 +2,15 @@ <html lang="en"> <head> <title>jQuery UI Droppable - revert</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - .ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { diff --git a/demos/droppable/tolerance.html b/demos/droppable/tolerance.html index b0278c6ef..9cbd2d1fb 100644 --- a/demos/droppable/tolerance.html +++ b/demos/droppable/tolerance.html @@ -2,15 +2,15 @@ <html lang="en"> <head> <title>jQuery UI Droppable - tolerance</title> - <link type="text/css" href="../demos.css" rel="stylesheet" /> <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../ui/ui.core.js"></script> <script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - .ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - .ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #dropppable, #dropppable-fit, #dropppable-pointer, #dropppable-touch { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { |