Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

A slight bit of cosmetics.

  • Loading branch information...
commit 6091e46f5dcbbb23a658b33af467df36e8d605ba 1 parent 0411a0d
Luke Palmer authored
Showing with 6 additions and 6 deletions.
  1. +4 −4 demo.php
  2. +1 −1  merge3.php
  3. +1 −1  resolve.php
8 demo.php
View
@@ -9,15 +9,15 @@
<tr>
<td>
<h3>Left</h3>
- <textarea name="left" rows="30"></textarea>
+ <textarea name="left" rows="30" cols="50"></textarea>
</td>
<td>
- <h3>Orig</h3>
- <textarea name="orig" rows="30"></textarea>
+ <h3>Original</h3>
+ <textarea name="orig" rows="30" cols="50"></textarea>
</td>
<td>
<h3>Right</h3>
- <textarea name="right" rows="30"></textarea>
+ <textarea name="right" rows="30" cols="50"></textarea>
</td>
</tr>
</table>
2  merge3.php
View
@@ -3,7 +3,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
<title>Merged output</title>
<style>
-pre { margin: 0 }
+pre { margin: 0; width: 50ex }
pre.left.addleft { background: #bbffbb }
pre.left.addright { color: white }
2  resolve.php
View
@@ -12,7 +12,7 @@
preg_split('/\r?\n/', $_POST['right']));
?>
-<textarea><?php
+<textarea rows="30" cols="50"><?php
for ($i = 0; $i < count($merged); $i++) {
$type = $merged[$i][0];
Please sign in to comment.
Something went wrong with that request. Please try again.