summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-26 21:55:00 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-26 21:55:00 +0000
commit56df6f29ef6e2e0c7a7a131067f9580b1148bc2a (patch)
tree5f712a86b3f55269dbc75378e0e436212387587a /chrome
parentebd884350e8699d8ac0d08f1bc1e60707ef37efc (diff)
downloadchromium_src-56df6f29ef6e2e0c7a7a131067f9580b1148bc2a.zip
chromium_src-56df6f29ef6e2e0c7a7a131067f9580b1148bc2a.tar.gz
chromium_src-56df6f29ef6e2e0c7a7a131067f9580b1148bc2a.tar.bz2
Bookmark manager: Make sure we do not collapse whitespace in bookmark names.
BUG=41911 TEST=Create a bookmark and a bookmark folder with the name " ". The item should still be shown in both the tree and the list. Review URL: http://codereview.chromium.org/1793002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/bookmark_manager/css/bmm.css9
-rw-r--r--chrome/browser/resources/bookmark_manager/css/list.css12
-rw-r--r--chrome/browser/resources/bookmark_manager/css/tree.css5
3 files changed, 14 insertions, 12 deletions
diff --git a/chrome/browser/resources/bookmark_manager/css/bmm.css b/chrome/browser/resources/bookmark_manager/css/bmm.css
index 0631a1b..5a491a3 100644
--- a/chrome/browser/resources/bookmark_manager/css/bmm.css
+++ b/chrome/browser/resources/bookmark_manager/css/bmm.css
@@ -24,12 +24,12 @@ list > * {
}
list > * > * {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-webkit-box-sizing: border-box;
- background: 0 50% no-repeat;
-webkit-padding-start: 20px;
+ background: 0 50% no-repeat;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: pre; /* Don't collapse whitespace */
}
list > * > .label {
@@ -272,3 +272,4 @@ html[dir=rtl] .summary button {
padding-right: 0;
padding-left: 11px;
}
+
diff --git a/chrome/browser/resources/bookmark_manager/css/list.css b/chrome/browser/resources/bookmark_manager/css/list.css
index 4b3e942..5f91834 100644
--- a/chrome/browser/resources/bookmark_manager/css/list.css
+++ b/chrome/browser/resources/bookmark_manager/css/list.css
@@ -6,17 +6,17 @@ list {
list > * {
-webkit-user-select: none;
- border: 1px solid rgba(255,255,255,0); /* transparent white */
background-color: rgba(255,255,255,0);
+ border: 1px solid rgba(255,255,255,0); /* transparent white */
border-radius: 2px;
- padding: 0px 3px;
+ cursor: default;
line-height: 20px;
+ margin: -1px 0;
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- cursor: default;
+ padding: 0px 3px;
position: relative; /* to allow overlap */
- margin: -1px 0;
+ text-overflow: ellipsis;
+ white-space: pre;
}
list > [lead] {
diff --git a/chrome/browser/resources/bookmark_manager/css/tree.css b/chrome/browser/resources/bookmark_manager/css/tree.css
index 60938dc..10bb708 100644
--- a/chrome/browser/resources/bookmark_manager/css/tree.css
+++ b/chrome/browser/resources/bookmark_manager/css/tree.css
@@ -100,9 +100,10 @@ tree:focus .tree-row[selected] {
.tree-label {
-webkit-padding-start: 20px;
- background-repeat: no-repeat;
- background-position: 0 50%;
background-image: url("../images/folder_closed.png");
+ background-position: 0 50%;
+ background-repeat: no-repeat;
+ white-space: pre;
}
/* We need to ensure that even empty labels take up space */