Bug 196262 Enable and tweak primary selection in folder pane r=bienvenu,jan sr=mscott a=asa

mailnews/base/resources/content/folderPane.xul

@@ -33,7 +33,7 @@
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <tree id="folderTree" class="plain focusring" flex="1" seltype="single"
+  <tree id="folderTree" class="plain focusring" flex="1" seltype="single" selstyle="primary"
             disableKeyNavigation="true"
             datasources="rdf:null"
             statedatasource="rdf:mailnewsfolders"

themes/classic/global/mac/tree.css

@@ -53,7 +53,6 @@ tree {
 
 /* ::::: tree rows ::::: */
 
-tree[selstyle="primary"] > treechildren::-moz-tree-row,
 treechildren::-moz-tree-row {
   -moz-appearance: treeitem;
   border-top: 1px solid -moz-Field;
@@ -70,6 +69,11 @@ treechildren::-moz-tree-row(selected, focus) {
   background-color: Highlight;
 }
 
+tree[selstyle="primary"] > treechildren::-moz-tree-row {
+  border-top: none;
+  background-color: transparent;
+}
+
 /* ::::: tree cells ::::: */
 
 treechildren::-moz-tree-cell {
@@ -81,6 +85,10 @@ treechildren::-moz-tree-cell-text {
   color: inherit;
 }
 
+tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary) {
+  padding: 0px 1px 1px 1px;
+}
+
 treechildren::-moz-tree-cell-text(selected) {
   color: -moz-DialogText;
 }

themes/classic/global/win/tree.css

@@ -54,7 +54,6 @@ tree {
 
 /* ::::: tree rows ::::: */
 
-tree[selstyle="primary"] > treechildren::-moz-tree-row,
 treechildren::-moz-tree-row {
   border: 1px solid transparent;
   background-color: transparent;
@@ -78,6 +77,11 @@ treechildren::-moz-tree-row(selected, current, focus) {
   border: 1px dotted #C0C0C0;
 }
 
+tree[selstyle="primary"] > treechildren::-moz-tree-row {
+  border: none;
+  background-color: transparent;
+}
+
 /* ::::: tree cells ::::: */
 
 treechildren::-moz-tree-cell {
@@ -86,7 +90,6 @@ treechildren::-moz-tree-cell {
 
 tree[selstyle="primary"] > treechildren::-moz-tree-cell-text,
 treechildren::-moz-tree-cell-text {
-  border: 1px solid transparent;
   color: inherit;
 }
 
@@ -94,6 +97,11 @@ treechildren::-moz-tree-cell-text(selected) {
   color: -moz-DialogText;
 }
 
+tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary) {
+  border: 1px solid transparent;
+  padding: 0px 1px 1px 1px;
+}
+
 tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected) {
   background-color: -moz-Dialog;
   color: -moz-DialogText;

themes/modern/global/tree.css

@@ -66,7 +66,6 @@ tree {
 
 /* ::::: tree rows ::::: */
 
-tree[selstyle="primary"] > treechildren::-moz-tree-row,
 treechildren::-moz-tree-row {
   border: 1px solid transparent;
   background-color: transparent;
@@ -87,6 +86,11 @@ treechildren::-moz-tree-row(current, focus) {
   border-bottom-color: #000000;
 }
 
+tree[selstyle="primary"] > treechildren::-moz-tree-row {
+  background-color: transparent;
+  border: none;
+}
+
 /* ::::: tree cells ::::: */
 
 treechildren::-moz-tree-cell {
@@ -95,10 +99,14 @@ treechildren::-moz-tree-cell {
 
 tree[selstyle="primary"] > treechildren::-moz-tree-cell-text,
 treechildren::-moz-tree-cell-text {
-  border: 1px solid transparent;
   color: inherit;
 }
 
+tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary) {
+  border: 1px solid transparent;
+  padding: 0px 1px 1px 1px;
+}
+
 treechildren::-moz-tree-cell-text(selected) {
   color: #000000;
 }