aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2012-12-02 12:50:17 +0100
committerJörn Zaefferer <joern.zaefferer@gmail.com>2012-12-03 19:09:32 +0100
commitbdb0fbe993ab4c716f3cbc6f2c08072bf512115f (patch)
treedb41ed29f22686c22532b8a3d1573b6de687b3f4
parent5ba267e7c78f0bc257383c822d241c5369e8e49d (diff)
downloadjquery-ui-bdb0fbe993ab4c716f3cbc6f2c08072bf512115f.tar.gz
jquery-ui-bdb0fbe993ab4c716f3cbc6f2c08072bf512115f.zip
Dialog: Restrict title to a single line. Fixes #7773 - Dialog: If titlebar changes height during resize, button pane positioning changes.
-rw-r--r--tests/visual/dialog/complex-dialogs.html7
-rw-r--r--themes/base/jquery.ui.dialog.css4
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/visual/dialog/complex-dialogs.html b/tests/visual/dialog/complex-dialogs.html
index 5cd9271ae..9cc2d1416 100644
--- a/tests/visual/dialog/complex-dialogs.html
+++ b/tests/visual/dialog/complex-dialogs.html
@@ -20,6 +20,11 @@
<script src="../../../ui/jquery.ui.autocomplete.js"></script>
<script src="../../../ui/jquery.ui.tooltip.js"></script>
+ <style>
+ body {
+ font-size: 62.5%;
+ }
+ </style>
<script>
$(function() {
var dialog = $( "#dialog" ).dialog({
@@ -98,7 +103,7 @@
<button id="open-dialog">Reopen dialog</button>
-<div id="dialog" title="Basic dialog">
+<div id="dialog" title="Basic dialog, but with a really long title that doesn't quite fit.">
<p>This is the default dialog which is useful for displaying information. The dialog window can be moved, resized and closed with the 'x' icon.</p>
<p><button id="open-datepicker">Open another window with a datepicker.</button></p>
<p><button id="destroy-dialog">Self destruct</button></p>
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index 986ce8604..370c95da5 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -24,6 +24,10 @@
.ui-dialog .ui-dialog-title {
float: left;
margin: .1em 16px .1em 0;
+ white-space: nowrap;
+ width: 90%;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.ui-dialog .ui-dialog-titlebar-close {
position: absolute;