Skip to content

Commit

Permalink
Merge pull request #32 from rayshan/master
Browse files Browse the repository at this point in the history
Remove overflow: hidden on grid items to allow more flexible styling
  • Loading branch information
xudafeng committed Jan 14, 2016
2 parents 0bfed38 + 5c98c23 commit 6f3ce82
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
7 changes: 3 additions & 4 deletions assets/examples.js
Original file line number Diff line number Diff line change
Expand Up @@ -18238,11 +18238,11 @@
var _again = true;_function: while (_again) {
var object = _x,
property = _x2,
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
var parent = Object.getPrototypeOf(object);if (parent === null) {
return undefined;
} else {
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
}
} else if ('value' in desc) {
return desc.value;
Expand Down Expand Up @@ -18383,8 +18383,7 @@

if (this.props.containerWidth) {
style = {
position: 'absolute',
overflow: 'hidden'
position: 'absolute'
};
}
Util.merge(s, style);
Expand Down
7 changes: 3 additions & 4 deletions assets/homepage.js
Original file line number Diff line number Diff line change
Expand Up @@ -18447,11 +18447,11 @@
var _again = true;_function: while (_again) {
var object = _x,
property = _x2,
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
var parent = Object.getPrototypeOf(object);if (parent === null) {
return undefined;
} else {
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
}
} else if ('value' in desc) {
return desc.value;
Expand Down Expand Up @@ -18592,8 +18592,7 @@

if (this.props.containerWidth) {
style = {
position: 'absolute',
overflow: 'hidden'
position: 'absolute'
};
}
Util.merge(s, style);
Expand Down
5 changes: 2 additions & 3 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

Expand Down Expand Up @@ -138,8 +138,7 @@ var AutoResponsive = (function (_React$Component) {

if (this.props.containerWidth) {
style = {
position: 'absolute',
overflow: 'hidden'
position: 'absolute'
};
}
Util.merge(s, style);
Expand Down
3 changes: 1 addition & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ class AutoResponsive extends React.Component {

if (this.props.containerWidth) {
style = {
position: 'absolute',
overflow: 'hidden'
position: 'absolute'
};
}
Util.merge(s, style);
Expand Down
3 changes: 1 addition & 2 deletions test/basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('AutoResponsive Test Suite - Basic', function() {
it('render children', function() {

const children = component.props.children;
children.should.be.a.Object;
children.should.be.an.Object();

const child = children['.0'];
child.type.should.equal('p');
Expand All @@ -70,7 +70,6 @@ describe('AutoResponsive Test Suite - Basic', function() {
style.height.should.equal(itemStyle.height);
style.Transform.should.equal('translate3d(0px, 0px, 0)');
style.position.should.equal('absolute');
style.overflow.should.equal('hidden');
});

});

0 comments on commit 6f3ce82

Please sign in to comment.