Skip to content

Commit

Permalink
Merge pull request #30 from adazzle/jp-styling-changes
Browse files Browse the repository at this point in the history
add titles to cells and remove overflow
  • Loading branch information
malonecj committed Apr 22, 2015
2 parents a9b5d6c + 708a90b commit 78c3fe3
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/Canvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ var Canvas = React.createClass({
position: 'absolute',
top: 0,
left: 0,
overflowX: 'auto',
overflowY: 'scroll',
//overflowX: 'auto',
//overflowY: 'scroll',
width: this.props.totalWidth,
height: this.props.height,
transform: 'translate3d(0, 0, 0)'
Expand Down
2 changes: 1 addition & 1 deletion src/Cell.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var Cell = React.createClass({
renderCellContent(props) {
var formatter = React.isValidElement(this.props.formatter) ? cloneWithProps(this.props.formatter, props) : this.props.formatter(props);
return (<div
className="react-grid-Cell__value">{formatter} {this.props.cellControls}</div>)
className="react-grid-Cell__value" title={this.props.value}>{formatter} {this.props.cellControls}</div>)

},

Expand Down
2 changes: 1 addition & 1 deletion src/HeaderCell.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ var HeaderCell = React.createClass({
});

function simpleCellRenderer(props) {
return <div className="rex-widget-HeaderCell__value">{props.column.name}</div>;
return <div className="rex-widget-HeaderCell__value" title={props.column.name}>{props.column.name}</div>;
}

module.exports = HeaderCell;
2 changes: 1 addition & 1 deletion src/Viewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ var Viewport = React.createClass({
bottom: 0,
left: 0,
right: 0,
overflow: 'hidden',
//overflow: 'hidden',
position: 'absolute',
top: this.props.rowOffsetHeight
};
Expand Down
1 change: 1 addition & 0 deletions themes/reactGrid.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
}

.react-grid-Grid {
overflow: scroll;
background-color: #ffffff;
border: 1px solid #dddddd;
}
Expand Down
1 change: 1 addition & 0 deletions themes/reactGrid.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@react-grid-scrollbar-color: @gray-light;

.react-grid-Grid {
overflow: scroll;
background-color: @body-bg;
border: 1px solid @table-border-color;
}
Expand Down

0 comments on commit 78c3fe3

Please sign in to comment.