FIX: UploadField height calculation fix (fixes #2862 & #2863) #2866

Merged
merged 2 commits into from Sep 25, 2014

Conversation

Projects
None yet
3 participants
Owner

kinglozzer commented Feb 18, 2014

Minor tweaks to the calculated height. Needs IE9 testing if anyone feels like doing that for me :).

Before:

After:

IE8 before:
screen shot 2014-02-19 at 17 08 53

IE8 after:
screen shot 2014-02-19 at 17 07 51

Owner

kinglozzer commented Feb 26, 2014

Aaaaand IE10. Before:

screen shot 2014-02-26 at 17 06 00

After:

screen shot 2014-02-26 at 17 05 29

Owner

kinglozzer commented Feb 28, 2014

I’ve reworked this to make use of jQuery’s height calculation instead of hardcoding pixel values, seems a more robust way of doing this.

Slight styling re-arrangements to facilitate this (took the padding off the body element and applied it to the actual iframe element for asset admin section - this matches how UploadField has padding applied).

@simonwelsh simonwelsh added 3.1 labels Mar 15, 2014

kinglozzer added some commits Feb 18, 2014

Owner

kinglozzer commented Jun 25, 2014

Rebased and retested, good to go :)

halkyon added a commit that referenced this pull request Sep 25, 2014

Merge pull request #2866 from kinglozzer/2862-uploadfield-editform-he…
…ight

FIX: UploadField height calculation fix (fixes #2862 & #2863)

@halkyon halkyon merged commit 2c25358 into silverstripe:3.1 Sep 25, 2014

2 checks passed

continuous-integration/travis-ci The Travis CI build passed
Details
default Scrutinizer: No new issues — Tests: pending
Details

@kinglozzer kinglozzer deleted the kinglozzer:2862-uploadfield-editform-height branch Sep 26, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment