Files.app: Add subfolders in the left nav

chrome/browser/resources/file_manager/css/file_manager.css

Index: chrome/browser/resources/file_manager/css/file_manager.css
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css
index 8a0fc401e9ff4550b1ecb6a235fcc36fec42ed6e..1ea06efc83eb50c5bd418e2072b1858248058e38 100644
--- a/chrome/browser/resources/file_manager/css/file_manager.css
+++ b/chrome/browser/resources/file_manager/css/file_manager.css
@@ -160,7 +160,7 @@ body.loaded {
   display: -webkit-box;
 }
 
-/* Roots list at the left. */
+/* Directory tree at the left. */
 .dialog-sidebar {
   -webkit-box-flex: 0;
   background-color: #e6e6e6;
@@ -184,80 +184,83 @@ div.sidebar-splitter {
   z-index: 2;
 }
 
-/* Roots list at the left. */
-#roots-list {
-  -webkit-box-flex: 1;
+#directory-tree {
   -webkit-box-orient: vertical;
   border-right: 1px solid rgb(170, 170, 170);
   display: -webkit-box;
+  overflow-x: hidden;
+  overflow-y: auto;
+  width: 100%;
 }
 
-#roots-list > * {
+#directory-tree .tree-row {
   background-color: #e6e6e6;
   background-image: none;
   border: none;
+  display: -webkit-box;
   height: 39px;

[mtomasz, 2013/03/14 02:52:05]

Remove height: 39px;

[yoshiki, 2013/03/14 07:57:53]

Done.

+  line-height: 39px;
   margin: 0;
   padding: 0 5px;
 }
 
-#roots-list > :hover {
-  background-color: rgba(0, 0, 0, 0.05);
-  border-color: rgba(0, 0, 0, 0.05);
+#directory-tree .tree-row > .expand-icon {
+  margin: 0 0;

[mtomasz, 2013/03/14 02:52:05]

1. Override .expand-icon opacity: 0.5 to 1.0 to match specs.
2. Add margin-left to match specs.

[yoshiki, 2013/03/14 07:57:53]

I think we should match to default tree view keeping opacity: 0.5. I'll ask josh
about it.
Instead of adding margin-left, I added both-side margin and change the width of
volume-icon to 16px. This looks like as mock.

+  top: 11px;

[mtomasz, 2013/03/14 02:52:05]

Can we avoid this absolute positioning with a magical number? How about
centering the same way as volume-icon?

[yoshiki, 2013/03/14 07:57:53]

I changed it vertical-align:center, but to fit it to the center line of the
label. I'm keeping top:-1px. 

 }
 
-#roots-list > .accepts,
-#roots-list > [lead][selected],
-#roots-list > [lead],
-#roots-list > [selected],
-#roots-list > [anchor] {
-  background-color: rgb(204, 204, 204);
+#directory-tree .tree-row > .volume-icon {
+  background-position: center 2px;
+  background-repeat: no-repeat;
+  height: 24px;
+  margin: 0 0;

[mtomasz, 2013/03/14 02:52:05]

Is this margin: 0 0 necessary here?

[yoshiki, 2013/03/14 07:57:53]

removed.

+  vertical-align: middle;
+  width: 24px;
 }
 
-#roots-list:focus > .accepts,
-#roots-list:focus > [lead][selected],
-#roots-list:focus > [lead],
-#roots-list:focus > [selected],
-#roots-list:focus > [anchor] {
-  background-color: rgb(193, 209, 232);
+#directory-tree .tree-row > .label {
+  -webkit-box-flex: 1;
+  display: block;
+  margin: 0 3px;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
 }
 
-#roots-list > .accepts:hover,
-#roots-list > [lead]:hover,
-#roots-list > [lead][selected]:hover,
-#roots-list > [selected]:hover,
-#roots-list > [anchor]:hover {
-  background-color: rgb(192, 192, 192);
+#directory-tree .tree-row:hover {
+  background-color: rgba(0, 0, 0, 0.05);
+  border-color: rgba(0, 0, 0, 0.05);
 }
 
-#roots-list:hover > .accepts:hover,
-#roots-list:hover > [lead]:hover,
-#roots-list:hover > [lead][selected]:hover,
-#roots-list:hover > [selected]:hover,
-#roots-list:hover > [anchor]:hover {
-  background-color: rgb(177, 193, 216);
+#directory-tree .accepts,
+#directory-tree .tree-row[lead][selected],
+#directory-tree .tree-row[lead],
+#directory-tree .tree-row[selected],
+#directory-tree .tree-row[anchor] {
+  background-color: rgb(204, 204, 204);
 }
 
-#roots-list li.root-item {
-  -webkit-box-align: center;
-  display: -webkit-box;
-  line-height: 22px;  /* To accomodate for icons. */
-  padding-left: 11px;
+#directory-tree:focus  .accepts,
+#directory-tree:focus  .tree-row[lead][selected],
+#directory-tree:focus  .tree-row[lead],
+#directory-tree:focus  .tree-row[selected],
+#directory-tree:focus  .tree-row[anchor] {
+  background-color: rgb(193, 209, 232);
 }
 
-li.root-item > .root-label {
-  -webkit-box-flex: 1;
-  margin: 0 2px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+#directory-tree  .accepts:hover,
+#directory-tree  .tree-row[lead]:hover,
+#directory-tree  .tree-row[lead][selected]:hover,
+#directory-tree  .tree-row[selected]:hover,
+#directory-tree  .tree-row[anchor]:hover {
+  background-color: rgb(192, 192, 192);
 }
 
-.volume-icon {
-  background-position: center 2px;
-  background-repeat: no-repeat;
-  height: 24px;
-  width: 24px;
+#directory-tree:hover .accepts:hover,
+#directory-tree:hover .tree-row[lead]:hover,
+#directory-tree:hover .tree-row[lead][selected]:hover,
+#directory-tree:hover .tree-row[selected]:hover,
+#directory-tree:hover .tree-row[anchor]:hover {
+  background-color: rgb(177, 193, 216);
 }
 
 div.root-eject {
@@ -272,6 +275,7 @@ div.root-eject {
   height: 20px;
   margin-right: 6px;
   opacity: 0.7;

[mtomasz, 2013/03/14 02:52:05]

IS this opacity: 0.7 necessary here?

[yoshiki, 2013/03/14 07:57:53]

It exists original on eject icon hence I'm keeping this. It will be changed to
1.0 on hover (see below).

+  vertical-align: middle;
   width: 20px;
 }
 
@@ -279,6 +283,10 @@ div.root-eject:hover {
   opacity: 1;
 }
 
+div.root-eject[hidden] {
+  display: none;
+}
+
 .root-item[selected] > div.root-eject:not(:hover),
 .root-item:hover > div.root-eject:not(:hover) {
   opacity: 0.7;