Index: chrome/browser/resources/md_bookmarks/folder_node.html |
diff --git a/chrome/browser/resources/md_bookmarks/folder_node.html b/chrome/browser/resources/md_bookmarks/folder_node.html |
index 6f2c5afa57bf7487ae92509f6aa7a00ef7b2bd98..938745cb0873a7796ba19fe4113a8dc9caaab9f8 100644 |
--- a/chrome/browser/resources/md_bookmarks/folder_node.html |
+++ b/chrome/browser/resources/md_bookmarks/folder_node.html |
@@ -12,6 +12,7 @@ |
<template> |
<style include="shared-style"> |
:host { |
+ --padding-start-per-depth: 36px; |
display: block; |
} |
@@ -22,24 +23,24 @@ |
} |
.menu-label { |
- -webkit-margin-start: 24px; |
+ -webkit-margin-start: 16px; |
color: var(--folder-inactive-color); |
font-weight: 500; |
- overflow: hidden; |
text-overflow: ellipsis; |
tsergeant
2017/03/15 00:07:52
Ellipsizing doesn't seem to work, but it's pretty
calamity
2017/03/15 00:48:19
Done.
|
white-space: nowrap; |
} |
#container { |
+ -webkit-padding-start: |
+ calc(var(--node-depth, 0) * var(--padding-start-per-depth)); |
+ cursor: pointer; |
height: 40px; |
- padding-left: calc(var(--node-depth, 0) * 30px); |
} |
#folder-label { |
+ -webkit-padding-end: 8px; |
color: var(--secondary-text-color); |
- cursor: pointer; |
flex-grow: 1; |
- overflow: hidden; |
} |
:host([is-selected-folder_]) .menu-label, |
@@ -53,24 +54,37 @@ |
min-width: 20px; |
} |
- paper-icon-button { |
+ #arrow { |
color: var(--secondary-text-color); |
height: 36px; |
+ margin: 0 8px; |
min-width: 36px; |
- padding: 8px; |
+ transform: rotate(-90deg); |
tsergeant
2017/03/15 00:07:52
You'll need to adjust this transform in RTL to +90
calamity
2017/03/15 00:48:19
T_T
|
+ transition: transform 150ms; |
width: 36px; |
} |
+ |
+ #arrow[is-open] { |
+ transform: initial; |
+ } |
+ |
+ [no-children] { |
+ -webkit-padding-start: 52px; /* The width of the arrow and its margin */ |
+ } |
</style> |
- <div id="container" class="v-centered"> |
- <div id="folder-label" class="v-centered" on-tap="selectFolder_"> |
- <iron-icon icon="[[getFolderIcon_(isSelectedFolder_)]]"></iron-icon> |
- <div class="menu-label">[[item_.title]]</div> |
- </div> |
+ <div id="container" class="v-centered" on-tap="selectFolder_"> |
<template is="dom-if" if="[[hasChildFolder_(item_.children)]]"> |
- <paper-icon-button icon="[[getArrowIcon_(isClosed_)]]" |
- on-tap="toggleFolder_"></paper-icon-button> |
+ <paper-icon-button id="arrow" icon="cr:arrow-drop-down" |
+ is-open$="[[!isClosed_]]" on-tap="toggleFolder_"> |
+ </paper-icon-button> |
</template> |
+ <div id="folder-label" class="v-centered"> |
+ <iron-icon icon="[[getFolderIcon_(isSelectedFolder_)]]" |
+ no-children$="[[!hasChildFolder_(item_.children)]]"> |
+ </iron-icon> |
+ <div class="menu-label">[[item_.title]]</div> |
+ </div> |
</div> |
<div id="descendants" hidden$="[[isClosed_]]"> |
<template is="dom-repeat" |