diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
| commit | 021c186be91095397d4e76801738373989360a52 (patch) | |
| tree | 4a5b42c0ebcaeb0be77edacb839bf164fe2dadc0 /phpBB/adm/style/install_update_diff.html | |
| parent | 4f9c3b8f5c0181c2ebf367436f3c0336d8f2251d (diff) | |
| parent | 3ddedd5ff228cdcc3c0b05000affe3944afc7854 (diff) | |
| download | forums-021c186be91095397d4e76801738373989360a52.tar forums-021c186be91095397d4e76801738373989360a52.tar.gz forums-021c186be91095397d4e76801738373989360a52.tar.bz2 forums-021c186be91095397d4e76801738373989360a52.tar.xz forums-021c186be91095397d4e76801738373989360a52.zip | |
Merge commit 'release-3.0.6-RC1'
Diffstat (limited to 'phpBB/adm/style/install_update_diff.html')
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index efbe1d045c..d794c5c516 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -28,6 +28,9 @@ function resize_panel() //whatever IE needs to do this } } + +window.onresize = resize_panel; + // ]]> </script> @@ -48,10 +51,7 @@ function resize_panel() <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> div#codepanel { - overflow: auto; width: 100%; - height: 350px; - display: inline-block; } <!-- ELSE --> div#codepanel { @@ -59,12 +59,22 @@ div#codepanel { } <!-- ENDIF --> +<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' --> +div#diff_content pre { + overflow: auto; + height: 414px; + width: 100% !important; +} +<!-- ENDIF --> + <!-- IF not S_DIFF_NEW_FILE --> /** * Unified Diff */ .file { line-height: .7em; + overflow: auto; + height: 414px; } .diff { @@ -203,9 +213,8 @@ table.hrdiff caption span { </head> - <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> -<body onresize="resize_panel();" onload="resize_panel();"> +<body onload="resize_panel();"> <!-- ELSE --> <body> <!-- ENDIF --> @@ -220,7 +229,7 @@ table.hrdiff caption span { <!-- ENDIF --> <!-- IF not S_DIFF_NEW_FILE --> <p id="skip"><a href="#acp">{L_SKIP}</a></p> - <form method="post"> + <form method="post" action=""> <fieldset class="quick"> <label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> <select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select> |