diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-09 11:33:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-09 11:33:14 +0000 |
| commit | 179c77ccddcd8bd4df2f29d05b460c6365396d49 (patch) | |
| tree | 872b58682c59b2e3400fe841e541b5a8c9455db7 /phpBB/adm/style/install_update_diff.html | |
| parent | c923e4191a28026a21c0ebb0dd2120c258d96229 (diff) | |
| download | forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.gz forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.bz2 forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.xz forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.zip | |
- do not include if there are no files fetched with glob()
- allow options for merged files on update (merge, new file, old file)
git-svn-id: file:///svn/phpbb/trunk@7848 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/install_update_diff.html')
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 54242d94b4..799ca34292 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -42,11 +42,16 @@ function resize_panel() width: 99%; } +#diff_content { + padding: 30px 10px 10px; +} + <!-- 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 { @@ -230,7 +235,7 @@ table.hrdiff caption span { <div id="acp"> <div class="panel" id="codepanel"> <span class="corners-top"><span></span></span> - <div id="content"> + <div id="diff_content"> <div id="main"> <!-- IF S_DIFF_CONFLICT_FILE --> |