diff options
author | Felix Nagel <info@felixnagel.com> | 2012-10-03 22:37:03 +0200 |
---|---|---|
committer | Felix Nagel <info@felixnagel.com> | 2012-10-03 22:37:03 +0200 |
commit | cca4e77a95eb7024c204f4d0719baa2ef6195ed2 (patch) | |
tree | 732a8e171647d9b25b1b2988f09dccc5d182bad7 /demos/selectable | |
parent | 5e12c54be1813e1f627d3214c11d7520fb46c647 (diff) | |
parent | e8bdf468614e59309b4a02ad4f6c29c1d06083c1 (diff) | |
download | jquery-ui-cca4e77a95eb7024c204f4d0719baa2ef6195ed2.tar.gz jquery-ui-cca4e77a95eb7024c204f4d0719baa2ef6195ed2.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos/selectable')
-rw-r--r-- | demos/selectable/default.html | 15 | ||||
-rw-r--r-- | demos/selectable/display-grid.html | 17 | ||||
-rw-r--r-- | demos/selectable/index.html | 16 | ||||
-rw-r--r-- | demos/selectable/serialize.html | 15 |
4 files changed, 19 insertions, 44 deletions
diff --git a/demos/selectable/default.html b/demos/selectable/default.html index 594a64e19..da39ffe84 100644 --- a/demos/selectable/default.html +++ b/demos/selectable/default.html @@ -1,16 +1,16 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <title>jQuery UI Selectable - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.8.0.js"></script> + <script src="../../jquery-1.8.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> <script src="../../ui/jquery.ui.selectable.js"></script> <link rel="stylesheet" href="../demos.css"> - + <style> #feedback { font-size: 1.4em; } #selectable .ui-selecting { background: #FECA40; } @@ -26,8 +26,6 @@ </head> <body> -<div class="demo"> - <ol id="selectable"> <li class="ui-widget-content">Item 1</li> <li class="ui-widget-content">Item 2</li> @@ -38,13 +36,8 @@ <li class="ui-widget-content">Item 7</li> </ol> -</div><!-- End demo --> - - - <div class="demo-description"> <p>Enable a DOM element (or group of elements) to be selectable. Draw a box with your cursor to select items. Hold down the Ctrl key to make multiple non-adjacent selections. </p> -</div><!-- End demo-description --> - +</div> </body> </html> diff --git a/demos/selectable/display-grid.html b/demos/selectable/display-grid.html index ced55196f..221490f88 100644 --- a/demos/selectable/display-grid.html +++ b/demos/selectable/display-grid.html @@ -1,21 +1,21 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <title>jQuery UI Selectable - Display as grid</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.8.0.js"></script> + <script src="../../jquery-1.8.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> <script src="../../ui/jquery.ui.selectable.js"></script> <link rel="stylesheet" href="../demos.css"> - + <style> #feedback { font-size: 1.4em; } #selectable .ui-selecting { background: #FECA40; } #selectable .ui-selected { background: #F39814; color: white; } - #selectable { list-style-type: none; margin: 0; padding: 0; } + #selectable { list-style-type: none; margin: 0; padding: 0; width: 450px; } #selectable li { margin: 3px; padding: 1px; float: left; width: 100px; height: 80px; font-size: 4em; text-align: center; } </style> <script> @@ -26,8 +26,6 @@ </head> <body> -<div class="demo"> - <ol id="selectable"> <li class="ui-state-default">1</li> <li class="ui-state-default">2</li> @@ -43,13 +41,8 @@ <li class="ui-state-default">12</li> </ol> -</div><!-- End demo --> - - - <div class="demo-description"> <p>To arrange selectable items as a grid, give them identical dimensions and float them using CSS.</p> -</div><!-- End demo-description --> - +</div> </body> </html> diff --git a/demos/selectable/index.html b/demos/selectable/index.html index 21fa4d5a7..a82830c60 100644 --- a/demos/selectable/index.html +++ b/demos/selectable/index.html @@ -1,20 +1,16 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <title>jQuery UI Selectable Demos</title> - <link rel="stylesheet" href="../demos.css"> </head> <body> -<div class="demos-nav"> - <h4>Examples</h4> - <ul> - <li class="demo-config-on"><a href="default.html">Default functionality</a></li> - <li><a href="serialize.html">Serialize</a></li> - <li><a href="display-grid.html">Display as grid</a></li> - </ul> -</div> +<ul> + <li><a href="default.html">Default functionality</a></li> + <li><a href="serialize.html">Serialize</a></li> + <li><a href="display-grid.html">Display as grid</a></li> +</ul> </body> </html> diff --git a/demos/selectable/serialize.html b/demos/selectable/serialize.html index 0c7e15f23..09935b130 100644 --- a/demos/selectable/serialize.html +++ b/demos/selectable/serialize.html @@ -1,16 +1,16 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <title>jQuery UI Selectable - Serialize</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.8.0.js"></script> + <script src="../../jquery-1.8.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> <script src="../../ui/jquery.ui.selectable.js"></script> <link rel="stylesheet" href="../demos.css"> - + <style> #feedback { font-size: 1.4em; } #selectable .ui-selecting { background: #FECA40; } @@ -34,8 +34,6 @@ </head> <body> -<div class="demo"> - <p id="feedback"> <span>You've selected:</span> <span id="select-result">none</span>. </p> @@ -49,13 +47,8 @@ <li class="ui-widget-content">Item 6</li> </ol> -</div><!-- End demo --> - - - <div class="demo-description"> <p>Write a function that fires on the <code>stop</code> event to collect the index values of selected items. Present values as feedback, or pass as a data string.</p> -</div><!-- End demo-description --> - +</div> </body> </html> |