mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

- do not include if there are no files fetched with glob()

Browse Source 
- 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
This commit is contained in:
Meik Sievertsen
2007-07-09 11:33:14 +00:00
parent c923e4191a
commit 179c77ccdd
6 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/adm/style/install_update_diff.html
View File

@@ -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 -->