Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /style/www/dev/docs/

style
Discussion topic

Back to topic list

CVS update: /style/www/dev/docs/

Reply

Author tfahrner
Full name Todd Fahrner
Date 2002-10-22 10:23:15 PDT
Message User: tfahrner
Date: 02/10/22 10:23:15

Modified
 /style/www/dev/docs/
  sampler_inst.html

Log
 fixed merge conflict

File Changes:

Directory: /style/www/dev/docs/
===============================

File [changed]: sampler_inst.html
Url: http://style.tigris.​org/source/browse/st​yle/www/dev/docs/sam​pler_inst.html.diff?​r1=1.45&r2=1.46
Delta lines: +4 -192
---------------------
--- sampler_inst.html 17 Oct 2002 22:28:16 -0000 1.45
+++ sampler_inst.html 22 Oct 2002 17:23:15 -0000 1.46
@@ -4,7 +4,7 @@
  <head>
 <style type="text/css">
 /* <![CDATA[ */
-@import "../css/tigris.css";
+@import "/client-side-includ​e/dev/css/tigris.css​";
 @import "/client-side-includ​e/dev/css/inst.css";​
 /* ]]> */
 </style>
@@ -14,7 +14,7 @@
   <title>branded tigris style sampler</title>
   <meta http-equiv="Content-type" content="text/html" />
   <meta http-equiv="Content-style-type" content="text/css" />
- <meta name="version" content="/* $Id: sampler_inst.html,v 1.45 2002/10/17 22:28:16 tfahrner Exp $" />
+ <meta name="version" content="/* $Id: sampler_inst.html,v 1.46 2002/10/22 17:23:15 tfahrner Exp $" />
   <meta name="keywords" content="britney spears bob dole" />
   <meta name="description" content="Your ad here" />
  </head>
@@ -339,7 +339,8 @@
           <p><a href="foo" class="collapsed"><span class="alt">/+​</span></a>​ <a href="bar">filebrowse-alt collapsed</a></p>
          </div>
          <p>To represent logical nesting, use ul/li:</p>
- <ul class="filebrowse">
+<div class="filebrowse">
+ <ul>
           <li class="expanded">
            <a href="foo">filebrowse expanded/</a>
            <ul>
@@ -360,6 +361,7 @@
            </ul>
           </li>
          </ul>
+</div>
          <p>When it isn't possible actually to nest the markup (e.g., when tree must be smooshed across multiple table rows), use the tier<var>n</var> classes on the containing blocks. The table below also shows (nonsensical) usage for sortable columns - note arrow widgets in table headings:</p>
          <table width="100%" cellpadding="3" cellspacing="2" class="filebrowse-alt">
           <tr>
@@ -605,197 +607,7 @@
           <p>It was modified at some time or another.</p>
          </div>
         </div>
-<<<<<<< sampler_inst.html
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <tr>
- <th>Edit</th>
- <th>Name</th>
- <th>Summary</th>
- <th>Categories</th>
- </tr>
- <tr class="a">
- <td><input type="radio" name="foo" value="bar" /></td>
- <td><a href="#">Chunk​</a></td>
- <td>A project for HTML documents and information</td>
- <td>none</td>
- </tr>
- <tr class="b">
- <td><input type="radio" name="foo" value="bar" /></td>
- <td><a href="#">Testproj​ect</a></td​>
- <td>Test project for beta test</td>
- <td>none</td>
- </tr>
- <tr class="a">
- <td><input type="radio" name="foo" value="bar" /></td>
- <td><a href="#">Applethr​asher</a></​td>
- <td>A project for HTML documents and information</td>
- <td>none</td>
- </tr>
- </table>
- <div class="functnbar3">
- <input type="submit" name="f" value="Make changes" />
-</div>
- <div class="h3" id="mimes">
- <h3>Expiring mimes want to, no?</h3>
-
-<table width="100%" cellpadding="3" cellspacing="2" class="filebrowse">
- <tr><th>​Select</th>​<th>Name</th​><th>Files​</th><th>Lo​rem</th><th​>Last modified</th>​<th>Gelid light</th></tr>
-
-
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier1">
- <a href="#" class="expanded" title="collapse"><span class="alt">[-] /</span></a> <a href="#" title="view details">User Docs</a>
-</div></td>
- <td>0</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
- </tr>
-
- <tr class="a">
- <td><input type="checkbox" /></td>
- <td><div class="tier2">
- <a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">Installation Guides</a>
-</div></td>
- <td>3</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier2">
- <a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">User Manual</a>
-</div></td>
- <td>4</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="a">
- <td><input type="checkbox" /></td>
- <td><div class="tier2">
-<a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">HOWTOs</a>
-</div></td>
- <td>8</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier1">
- <a href="#" class="expanded" title="collapse"><span class="alt">[-] /</span></a> <a href="drill-detail2.html" title="view details">Releases</a>
-</div></td>
- <td>0</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
- </tr>
-
- <tr class="a">
- <td><input type="checkbox" /></td>
- <td><div class="tier2">
- <a href="#" class="expanded" title="collapse"><span class="alt">[-] /</span></a> <a href="drill-detail.html" title="view details">Stable releases</a>
-</div></td>
- <td>2</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier3">
-<a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">2.0.0</a>
-</div></td>
- <td>18</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="a">
- <td><input type="checkbox" /></td>
- <td><div class="tier3">
-<a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">1.2.5</a>
-</div></td>
- <td>12</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier3">
- <a href="#" class="leaf" title="download"><span class="alt">[down​load]</span>​</a> <a href="#" title="view details">snapshot​-12302.tar</a>​
-</div></td>
- <td>--</td>
- <td>username</td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="a">
- <td><input type="checkbox" /></td>
- <td><div class="tier3">
- <a href="#" class="leaf" title="download"><span class="alt">[down​load]</span>​</a> <a href="#" title="view details">snapshot​-12402.tar</a>​
-</div></td>
- <td>--</td>
- <td>username</td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
-
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier2">
- <a href="#" class="expanded" title="collapse"><span class="alt">[-] /</span></a> <a href="#" title="view details">Developer Releases</a>
-</div></td>
- <td>0</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="a">
- <td><input type="checkbox" /></td>
- <td><div class="tier3">
-<a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">2.0.0TR15</a>
-</div></td>
- <td>16</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
- <tr class="b">
- <td><input type="checkbox" /></td>
- <td><div class="tier3">
-<a href="#" class="collapsed" title="expand"><span class="alt">[+] /</span></a> <a href="#" title="view details">1.2.3</a>
-</div></td>
- <td>9</td>
- <td></td>
- <td>3/28/2002</td>
- <td>username</td>
-</tr>
-
-</table>
-<div class="functnbar3">
- <input type="submit" value="Add leafnode" name="#" /> <input type="submit" value="Add leaf" name="#" /> <input type="submit" value="Molt seasonally" name="#" /> <input type="submit" value="Delete selected" name="#" />
-</div>
-
-
-<p><acronym title="Cascading Style Sheets">CSS</acronym> came late to the TLA party. It competes with Christ Saves Souls and <a href="http://www.reprod-en​t.com/bullserv.html#​only">Certified Semen Services</a>, but Cascading Style Sheets is more than a religion or animal husbandry commodity: much more. It is a way out of the bloated, murky HTML generation and maintenance business. It is a way to cut the transmission times of your screens to perhaps 30% what they are now, depending on how bad you've been. It is a way to stop using HTML tables except for train schedule-style tabular data. No more font tags, no more spacer GIFs, no more GIFs of text. And still look good - better even than with all the painful crufty techniques just mentioned.
-</p>
-=======
        </div>
->>>>>>> 1.44
        <div class="h4" id="feedingtime">
         <h4>Feeding time at the Zoo</h4>
         <table border="1" cellspacing="2" cellpadding="3" width="100%" class="grid">




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@styl​e.tigris.org
For additional commands, e-mail: cvs-help at style dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /style/www/dev/docs/ tfahrner Todd Fahrner 2002-10-22 10:23:15 PDT
Messages per page: