CVS update: /de/www/styles/

[markomlm]

User: markomlm
Date: 05/12/14 07:00:53

Modified:
 /de/www/styles/
  de_navbar4.css

Log:
 Blau für Hintergund (fix cvs-bug) geändert M. Moeller

File Changes:

Directory: /de/www/styles/
==========================

File [changed]: de_navbar4.css
Url: 
http://de.openoffice.org/source/browse/de/www/styles/de_navbar4.css?r1=1.4&r2=1.5
Delta lines:  +3 -52
--------------------
--- de_navbar4.css      14 Dec 2005 13:59:32 -0000      1.4
+++ de_navbar4.css      14 Dec 2005 15:00:50 -0000      1.5
@@ -3,12 +3,6 @@
        Navbar
        - Spezielle Styles für Navbar
        - Navbar eingeblendet
-
-<<<<<<< de_navbar4.css
-       $Id: de_navbar4.css,v 1.4 2005/12/14 13:59:32 markomlm Exp $
-=======
-       $Id: de_navbar4.css,v 1.4 2005/12/14 13:59:32 markomlm Exp $
->>>>>>> 1.3
 -------------------------------------------------------------*/
 
 #navbar_de {
@@ -65,7 +59,6 @@
 
 ul#navbar_de li{
 font-weight: bold; 
-<<<<<<< de_navbar4.css
 padding-top:3px;
 padding-bottom:3px;
 border: 0;
@@ -73,45 +66,22 @@
 text-align:center;
 color: white;
 background: #0947b5; 
-=======
-padding-top:3px;
-padding-bottom:3px;
-border: 0;
-border-style:none;
-text-align:center;
-color: white;
-background: #06348C; 
->>>>>>> 1.3
 }
-<<<<<<< de_navbar4.css
 ul#navbar_de li a:link {
 text-decoration: none;
 font-weight: normal; 
 color: white;
 background: #0947b5; 
-=======
-ul#navbar_de li a:link {
-text-decoration: none;
-font-weight: normal; 
-color: white;
-background: #06348C; 
->>>>>>> 1.3
 }
 ul#navbar_de li a:visited {
 text-decoration: none;
 font-weight: normal; 
-<<<<<<< de_navbar4.css
 color: #ffafaf;
 background: #0947b5; 
-=======
-color: #ffafaf;
-background: #06348C; 
->>>>>>> 1.3
 }
 ul#navbar_de li a:hover {
 font-weight: bold; 
 }
-<<<<<<< de_navbar4.css
 
 ul#navbar_de li ul {
 display: block;
@@ -125,27 +95,8 @@
 font-weight: bold; 
 display: block;
 width: 98%;
-=======
-
-ul#navbar_de li ul {
-display: block;
-width: 99%;
->>>>>>> 1.3
-margin: 0;
-<<<<<<< de_navbar4.css
-padding: 1px;
-=======
-padding: 1px;
-border: 0;
-}
-
-ul#navbar_de li ul li{
-font-weight: bold; 
-display: block;
-width: 98%;
 margin: 0;
 padding: 1px;
->>>>>>> 1.3
 border: 0;
 text-align:left;
 color: black;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]