diff options
| author | liabru <liabru@brm.io> | 2015-10-17 19:27:35 +0100 |
|---|---|---|
| committer | liabru <liabru@brm.io> | 2015-10-17 19:27:35 +0100 |
| commit | 89b74a7bbcc65504056cbb9bc952bbbd11e612f0 (patch) | |
| tree | 6343f9e874d8e839b9695695f630f389a54c4a16 /jquery.matchHeight.js | |
| parent | a7d35dca8b452d29c6183ca7a01e9da846f90cf2 (diff) | |
| parent | 8844acb9fea5e734ba10ef365091eee01e3c2be9 (diff) | |
| download | jquery-match-height-89b74a7bbcc65504056cbb9bc952bbbd11e612f0.zip jquery-match-height-89b74a7bbcc65504056cbb9bc952bbbd11e612f0.tar.gz jquery-match-height-89b74a7bbcc65504056cbb9bc952bbbd11e612f0.tar.bz2 | |
Merge branch 'floatingcontents' of https://github.com/jorrit/jquery-match-height into jorrit-floatingcontents
Conflicts:
jquery.matchHeight.js
Diffstat (limited to 'jquery.matchHeight.js')
| -rw-r--r-- | jquery.matchHeight.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jquery.matchHeight.js b/jquery.matchHeight.js index 99310c3..f4ab786 100644 --- a/jquery.matchHeight.js +++ b/jquery.matchHeight.js @@ -188,7 +188,8 @@ 'margin-bottom': '0', 'border-top-width': '0', 'border-bottom-width': '0', - 'height': '100px' + 'height': '100px', + 'overflow': 'hidden' }); }); |