Changeset 702 for trunk/forum/adm/style/install_update_diff.html
- Timestamp:
- Mar 31, 2010, 6:32:40 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/forum/adm/style/install_update_diff.html
r400 r702 16 16 function resize_panel() 17 17 { 18 var block = document.getElementById('codepanel'); 18 var block = document.getElementById('codepanel'); 19 19 var height; 20 20 21 21 if (window.innerHeight) 22 22 { … … 27 27 { 28 28 //whatever IE needs to do this 29 } 30 } 29 } 30 } 31 32 window.onresize = resize_panel; 33 31 34 // ]]> 32 35 </script> … … 49 52 <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> 50 53 div#codepanel { 51 overflow: auto;52 54 width: 100%; 53 height: 350px;54 display: inline-block;55 55 } 56 56 <!-- ELSE --> 57 div#codepanel { 57 div#codepanel { 58 58 background-color: #eee; 59 } 60 <!-- ENDIF --> 61 62 <!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' --> 63 div#diff_content pre { 64 overflow: auto; 65 height: 414px; 66 width: 100% !important; 59 67 } 60 68 <!-- ENDIF --> … … 66 74 .file { 67 75 line-height: .7em; 76 overflow: auto; 77 height: 414px; 68 78 } 69 79 … … 140 150 table.hrdiff tbody td.old { 141 151 border-left: 1px solid #999; 142 border-right: 1px solid #999; 152 border-right: 1px solid #999; 143 153 } 144 154 table.hrdiff tbody td.new { 145 border-right: 1px solid #999; 155 border-right: 1px solid #999; 146 156 } 147 157 … … 204 214 </head> 205 215 206 207 216 <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> 208 <body on resize="resize_panel();" onload="resize_panel();">217 <body onload="resize_panel();"> 209 218 <!-- ELSE --> 210 219 <body> … … 221 230 <!-- IF not S_DIFF_NEW_FILE --> 222 231 <p id="skip"><a href="#acp">{L_SKIP}</a></p> 223 <form method="post" >232 <form method="post" action=""> 224 233 <fieldset class="quick"> 225 234 <label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> … … 230 239 </form> 231 240 <!-- ENDIF --> 241 <!-- IF S_DIFF_CONFLICT_FILE --> 242 <div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> 243 <br style="clear: both;" /> 244 <!-- ENDIF --> 232 245 </div> 233 246 234 247 <div id="page-body"> 235 248 <div id="acp"> … … 238 251 <div id="diff_content"> 239 252 <div id="main"> 240 241 <!-- IF S_DIFF_CONFLICT_FILE -->242 <div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>243 <!-- ENDIF -->244 253 {DIFF_CONTENT} 245 254 </div> … … 249 258 </div> 250 259 </div> 251 260 252 261 253 262 <!-- INCLUDE simple_footer.html -->
Note:
See TracChangeset
for help on using the changeset viewer.