Changeset 14146

Timestamp:

06/25/08 12:47:20 (12 months ago)

Author:

toonetown

Message:

Fixes #7049 - updates the styling for tundra, nihilo, and soria to have views line up correctly !strict

Location:

dojox/trunk/grid

Files:

• resources/nihiloGrid.css (modified) (3 diffs)
• resources/soriaGrid.css (modified) (3 diffs)
• resources/tundraGrid.css (modified) (3 diffs)
• _RowSelector.js (modified) (1 diff)
• _ViewManager.js (modified) (1 diff)

dojox/trunk/grid/resources/nihiloGrid.css

@@ -58 +58 @@
         border: 1px solid transparent;
         /* border-color: #F6F4EB #ACA899 #ACA899 #F6F4EB; */
-        border-color: white #ACA899 #919191 white;
+        border-color: transparent #ACA899 #919191 transparent;
         background: url(../../../dijit/themes/nihilo/images/titleBar.png) #e9e9e9 repeat-x top;
         padding-bottom: 2px;
@@ -175 +175 @@
 }
 
-.nihilo .dojoxGrid-row-table {
+.nihilo .dojoxGrid-row-table,
+.nihilo .dojoxGrid-rowbar-table {
         table-layout: fixed;
         width: 0;
-        border-collapse: collapse;
-}
-
-.dj_ff2 .nihilo .dojoxGrid-row-table {
-        border-collapse: separate;
 }
 
@@ -206 +202 @@
 .nihilo .dojoxGrid-cell {
         border: 1px dotted #D5CDB5;
+        border-left-color: transparent;
+        border-top-color: transparent;
         padding: 3px 3px 3px 3px;
         text-align: left;

dojox/trunk/grid/resources/soriaGrid.css

@@ -58 +58 @@
         border: 1px solid transparent;
         /* border-color: #F6F4EB #ACA899 #ACA899 #F6F4EB; */
-        border-color: white #ACA899 #919191 white;
+        border-color: transparent #ACA899 #919191 transparent;
         background: url(../../../dijit/themes/soria/images/titleBar.png) #e9e9e9 repeat-x top;
         padding-bottom: 2px;
@@ -176 +176 @@
 }
 
-.soria .dojoxGrid-row-table {
+.soria .dojoxGrid-row-table,
+.soria .dojoxGrid-rowbar-table {
         table-layout: fixed;
         width: 0;
-        border-collapse: collapse;
-}
-
-.dj_ff2 .soria .dojoxGrid-row-table {
-        border-collapse: separate;
 }
 
@@ -207 +203 @@
 .soria .dojoxGrid-cell {
         border: 1px dotted #D5CDB5;
+        border-left-color: transparent;
+        border-top-color: transparent;
         padding: 3px 3px 3px 3px;
         text-align: left;

dojox/trunk/grid/resources/tundraGrid.css

@@ -58 +58 @@
         border: 1px solid transparent;
         /* border-color: #F6F4EB #ACA899 #ACA899 #F6F4EB; */
-        border-color: white #ACA899 #919191 white;
+        border-color: transparent #ACA899 #919191 transparent;
         background: url(../../../dijit/themes/tundra/images/tabEnabled.png) #e9e9e9 repeat-x top;
         padding-bottom: 2px;
@@ -169 +169 @@
 }
 
-.tundra .dojoxGrid-row-table {
+.tundra .dojoxGrid-row-table,
+.tundra .dojoxGrid-rowbar-table {
         table-layout: fixed;
         width: 0;
-        border-collapse: collapse;
-}
-
-.dj_ff2 .tundra .dojoxGrid-row-table {
-        border-collapse: separate;
 }
 
@@ -200 +196 @@
 .tundra .dojoxGrid-cell {
         border: 1px dotted #D5CDB5;
+        border-left-color: transparent;
+        border-top-color: transparent;
         padding: 3px 3px 3px 3px;
         text-align: left;

dojox/trunk/grid/_RowSelector.js

@@ -18 +18 @@
         buildRowContent: function(inRowIndex, inRowNode){
                 var w = this.contentNode.offsetWidth - this.padBorderWidth 
-                inRowNode.innerHTML = '<table style="width:' + w + 'px;" role="wairole:presentation"><tr><td class="dojoxGrid-rowbar-inner"></td></tr></table>';
+                inRowNode.innerHTML = '<table class="dojoxGrid-rowbar-table" style="width:' + w + 'px;" border="0" cellspacing="0" cellpadding="0" role="wairole:presentation"><tr><td class="dojoxGrid-rowbar-inner">&nbsp;</td></tr></table>';
         },
         renderHeader: function(){

dojox/trunk/grid/_ViewManager.js

@@ -74 +74 @@
                 var h = 0; 
                 for(var i=0, n, o; (n=inRowNodes[i]); i++){
-                        h = Math.max(h, (n.firstChild.clientHeight)||(n.firstChild.offsetHeight));
+                        h = Math.max(h, dojo.marginBox(n.firstChild).h);
                 }
                 h = (h >= 0 ? h : 0);
                 //
-                var hpx = h + 'px';
+                //
                 for(var i=0, n; (n=inRowNodes[i]); i++){
-                        if(n.firstChild.clientHeight!=h){
-                                n.firstChild.style.height = hpx;
-                        }
+                        dojo.marginBox(n.firstChild, {h:h});
                 }
                 //