diff options
author | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:49:44 +0200 |
---|---|---|
committer | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:49:44 +0200 |
commit | 41dfb09aeb5df7d53089b58959d21207de63edbe (patch) | |
tree | 22053c8f7ddff61f3dfdaed028ef2e2d1a6b68c6 /tests/visual/position | |
parent | ec5f2ae34ada562903b919d86221d03c9b193a0e (diff) | |
parent | 037db084f20d952558e4529a8b7394d562241a97 (diff) | |
download | jquery-ui-41dfb09aeb5df7d53089b58959d21207de63edbe.tar.gz jquery-ui-41dfb09aeb5df7d53089b58959d21207de63edbe.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/visual/position')
-rw-r--r-- | tests/visual/position/position.html | 22 | ||||
-rw-r--r-- | tests/visual/position/position_fit.html | 2 | ||||
-rw-r--r-- | tests/visual/position/position_flip.html | 2 | ||||
-rw-r--r-- | tests/visual/position/position_flipfit.html | 2 | ||||
-rw-r--r-- | tests/visual/position/position_margin.html | 2 | ||||
-rw-r--r-- | tests/visual/position/position_within.html | 2 |
6 files changed, 24 insertions, 8 deletions
diff --git a/tests/visual/position/position.html b/tests/visual/position/position.html index 9d29abe28..b9b769d9b 100644 --- a/tests/visual/position/position.html +++ b/tests/visual/position/position.html @@ -5,7 +5,7 @@ <title>Position Visual Test: Default</title> <link rel="stylesheet" href="../visual.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.1.js"></script> + <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> @@ -24,9 +24,9 @@ collision: "none" }); $(this).next().menu().position({ - my: "left top", + my: "left top+20", at: "left bottom", - of: this + of: this, }); }); }).resize(); @@ -37,6 +37,22 @@ .ui-menu { width: 200px; } html, body { width: 99%; height: 99%; min-height:700px; min-width:700px; } #container { width: 95%; height: 95%; border: 1px solid black; margin: auto; } + .ui-menu:before { + font-size: 12pt; + content: "↑"; + position: absolute; + top: -22px; + left: 5px; + } + .ui-flipped-left:before { + left: auto; + right: 5px; + } + .ui-flipped-top:before { + content: "↓"; + top: auto; + bottom: -19px; + } </style> </head> <body> diff --git a/tests/visual/position/position_fit.html b/tests/visual/position/position_fit.html index 78751d3ef..9c60b78f6 100644 --- a/tests/visual/position/position_fit.html +++ b/tests/visual/position/position_fit.html @@ -5,7 +5,7 @@ <title>Position Visual Test: Fit</title> <link rel="stylesheet" href="../visual.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.1.js"></script> + <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> diff --git a/tests/visual/position/position_flip.html b/tests/visual/position/position_flip.html index 7b26f6a9a..bae3c649b 100644 --- a/tests/visual/position/position_flip.html +++ b/tests/visual/position/position_flip.html @@ -5,7 +5,7 @@ <title>Position Visual Test: Flip</title> <link rel="stylesheet" href="../visual.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.1.js"></script> + <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> diff --git a/tests/visual/position/position_flipfit.html b/tests/visual/position/position_flipfit.html index b5cf82946..fcfb75b6b 100644 --- a/tests/visual/position/position_flipfit.html +++ b/tests/visual/position/position_flipfit.html @@ -5,7 +5,7 @@ <title>Position Visual Test: FlipFit</title> <link rel="stylesheet" href="../visual.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.1.js"></script> + <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> diff --git a/tests/visual/position/position_margin.html b/tests/visual/position/position_margin.html index 52b800837..71d8f0a3c 100644 --- a/tests/visual/position/position_margin.html +++ b/tests/visual/position/position_margin.html @@ -5,7 +5,7 @@ <title>Position Visual Test: Default</title> <link rel="stylesheet" href="../visual.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.1.js"></script> + <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> diff --git a/tests/visual/position/position_within.html b/tests/visual/position/position_within.html index 156c82e5d..7d8813582 100644 --- a/tests/visual/position/position_within.html +++ b/tests/visual/position/position_within.html @@ -7,7 +7,7 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" /> - <script src="../../../jquery-1.7.1.js"></script> + <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.mouse.js"></script> |