[sword-cvs] swordweb wash.css,1.9,1.10

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv22054

Modified Files:
	wash.css 
Log Message:
fixes

Index: wash.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wash.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wash.css	24 Oct 2003 08:06:37 -0000	1.9
+++ wash.css	24 Oct 2003 08:08:00 -0000	1.10
@@ -33,7 +33,6 @@
 font-family: palatino, georgia, serif;
 }
 
-
 #navlist ul, #navlist li{
 display: inline;
 list-style-type: none;
@@ -41,12 +40,7 @@
 padding: 0;
 }
 
-<<<<<<< wash.css
-
-#navlist a:link, #navlist a:visited{
-=======
 #navlist a:link, #navlist a:visited{
->>>>>>> 1.8
 background: #E8EBF0;
 border: 1px solid #ccc;
 color: #666;
@@ -475,62 +469,6 @@
 color:#f00;
 }
 
-<<<<<<< wash.css
-/* Parallel Display */
-
-#paralleldisplay {
-font-family:  Verdana, Arial, Helvetica, Sans-Serif;
-font-size: 1em;
-line-height: 1.4em;
-margin: 0px 14em 0px 11.5em;
-padding: 0 0 0px 0;
-}
-
-
-#paralleldisplay  ul {
-background: #eee;
-border-top: 1px solid #ccc;
-border-bottom: 1px solid #ccc;
-margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 0px;
-text-indent: 0px;
-}
-
-#paralleldisplay  ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#paralleldisplay  ul li a {
-color:#000;
-}
-
-#paralleldisplay  ul li a:hover {
-color:#f00;
-}
-
-#paralleldisplay td {
- vertical-align: top;
-}
-
-#paralleldisplay td {
-	padding: 0px .5em 0px .5em;
-}
-
-#paralleldisplay td.currentverse {
-	background-color: #eee;
-}
-
-#paralleldisplay p {
-	padding: 0px .5em 0px .5em;
-}
-
-
-#footer img {border:0;
-=======
 /* Parallel Display */
 
 #paralleldisplay {
@@ -581,18 +519,10 @@
 
 #paralleldisplay td.currentverse {
 	background-color: #eee;
->>>>>>> 1.8
 }
 
-<<<<<<< wash.css
-/* Unicode stuff */
-span.unicode {
-	font-family:code2000, code2001, arial unicode ms,bitstream cyberbit,arial,georgia,palatino,sans-serif;
-	font-size:1.5em;
-}=======
 
 
 
 #footer img {border:0;
 }
->>>>>>> 1.8