Fixed merge conflicts

Conflicts:

	src/themes/dark/main.css
	src/themes/default/main.css
This commit is contained in:
Andre Lorbach 2008-05-05 14:52:12 +02:00
commit 146bd75a09
4 changed files with 429 additions and 429 deletions

View File

@ -1,2 +1,2 @@
Andre Lorbach Andre Lorbach
http://www.adiscon.com http://www.adiscon.com

View File

@ -389,4 +389,4 @@ select, input, button, textarea
font:10px Verdana,Arial,Helvetica,sans-serif; font:10px Verdana,Arial,Helvetica,sans-serif;
border: 1px solid; border: 1px solid;
border-color: #233B51 #124A7C #124A7C #233B51; border-color: #233B51 #124A7C #124A7C #233B51;
} }

View File

@ -1,2 +1,2 @@
Andre Lorbach Andre Lorbach
http://www.adiscon.com http://www.adiscon.com

View File

@ -1,424 +1,424 @@
/* Generell Tag Classes */ /* Generell Tag Classes */
BODY BODY
{ {
BACKGROUND-COLOR: #f9f9f9; BACKGROUND-COLOR: #f9f9f9;
COLOR: #000000; COLOR: #000000;
FONT-FAMILY: ARIAL; FONT-FAMILY: ARIAL;
FONT-SIZE: 8pt; FONT-SIZE: 8pt;
scrollbar-face-color: #DEE3E7; scrollbar-face-color: #DEE3E7;
scrollbar-highlight-color: #FFFFFF; scrollbar-highlight-color: #FFFFFF;
scrollbar-shadow-color: #DEE3E7; scrollbar-shadow-color: #DEE3E7;
scrollbar-3dlight-color: #D1D7DC; scrollbar-3dlight-color: #D1D7DC;
scrollbar-arrow-color: #006699; scrollbar-arrow-color: #006699;
scrollbar-track-color: #EFEFEF; scrollbar-track-color: #EFEFEF;
scrollbar-darkshadow-color: #98AAB1 scrollbar-darkshadow-color: #98AAB1
} }
TD { font-family: Arial, Helvetica, sans-serif; font-size: 8pt; color: #000000 } TD { font-family: Arial, Helvetica, sans-serif; font-size: 8pt; color: #000000 }
/* Default Link Classes */ /* Default Link Classes */
a:link,a:active,a:visited,a.postlink a:link,a:active,a:visited,a.postlink
{ {
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight:bold; font-weight:bold;
background-color: transparent; background-color: transparent;
color:#38140E; color:#38140E;
text-decoration:none; text-decoration:none;
} }
a:hover a:hover
{ {
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight:bold; font-weight:bold;
color:#FF0000; color:#FF0000;
} }
img img
{ {
border: 0px; border: 0px;
} }
/* Title Classes */ /* Title Classes */
.title .title
{ {
FONT: bold 11px Verdana, Arial, Helvetica, sans-serif; FONT: bold 11px Verdana, Arial, Helvetica, sans-serif;
BACKGROUND-COLOR: #D2C598; BACKGROUND-COLOR: #D2C598;
COLOR: #032D5D; COLOR: #032D5D;
border: 1px solid; border: 1px solid;
border-color: #ACBED6 #3B679B #3B679B #ACBED6; border-color: #ACBED6 #3B679B #3B679B #ACBED6;
height: 20px; height: 20px;
text-align:center; text-align:center;
vertical-align:middle; vertical-align:middle;
} }
A.title, A.title:active, A.title:visited A.title, A.title:active, A.title:visited
{ {
FONT: bold 11px Verdana, Arial, Helvetica, sans-serif; FONT: bold 11px Verdana, Arial, Helvetica, sans-serif;
COLOR: #ED9D10; COLOR: #ED9D10;
TEXT-DECORATION: none; TEXT-DECORATION: none;
} }
A.title:hover A.title:hover
{ {
FONT: bold 11px Verdana, Arial, Helvetica, sans-serif; FONT: bold 11px Verdana, Arial, Helvetica, sans-serif;
COLOR: #982D00; COLOR: #982D00;
TEXT-DECORATION: none; TEXT-DECORATION: none;
} }
/* Default Font Classes */ /* Default Font Classes */
font font
{ {
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
} }
/* Table / Border Classes */ /* Table / Border Classes */
.table_with_border .table_with_border
{ {
background-color:#EEF2F6; background-color:#EEF2F6;
border:1px solid; border:1px solid;
border-color: #CCCCCC #000000 #000000 #CCCCCC; border-color: #CCCCCC #000000 #000000 #CCCCCC;
} }
.table_with_border_second .table_with_border_second
{ {
background-color:#D5E0E7; background-color:#D5E0E7;
border:1px solid; border:1px solid;
border-color: #CCCCCC #000000 #000000 #CCCCCC; border-color: #CCCCCC #000000 #000000 #CCCCCC;
} }
.with_border .with_border
{ {
text-indent:3px; text-indent:3px;
background-color:#CCCCCC; background-color:#CCCCCC;
border:1px #AAAAAA solid; border:1px #AAAAAA solid;
} }
.with_border_alternate .with_border_alternate
{ {
text-indent:3px; text-indent:3px;
background-color:#CCCCCC; background-color:#CCCCCC;
border:1px #AAAAAA ridge; border:1px #AAAAAA ridge;
} }
.mainheader .mainheader
{ {
border:1px solid; border:1px solid;
background-color:#C7CBD1; background-color:#C7CBD1;
border-color: #44617D #203040 #203040 #44617D; border-color: #44617D #203040 #203040 #44617D;
} }
.mainfooter .mainfooter
{ {
height: 20px; height: 20px;
background-color:#DDDDDD; background-color:#DDDDDD;
border-top: #97A8B9 1px solid; border-top: #97A8B9 1px solid;
border-bottom: #6592BD 1px solid; border-bottom: #6592BD 1px solid;
} }
.imageborder .imageborder
{ {
border:1px solid; border:1px solid;
border-color: #44617D #203040 #203040 #44617D; border-color: #44617D #203040 #203040 #44617D;
} }
/* Cells for listening */ /* Cells for listening */
.line0 .line0
{ {
height: 16px; height: 16px;
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
background-color: #DDDDDD; background-color: #DDDDDD;
} }
.line0:hover .line0:hover
{ {
background-color:#F9F9F9; background-color:#F9F9F9;
} }
.line1 .line1
{ {
height: 16px; height: 16px;
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
background-color: #EEEEEE; background-color: #EEEEEE;
} }
.line1:hover .line1:hover
{ {
background-color:#F9F9F9; background-color:#F9F9F9;
} }
.line2 .line2
{ {
height: 16px; height: 16px;
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
.line2:hover .line2:hover
{ {
background-color:#F9F9F9; background-color:#F9F9F9;
} }
.tableBackground .tableBackground
{ {
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
/* /*
.line_alt0 .line_alt0
{ {
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
background-color: #AAAAAA; background-color: #AAAAAA;
background-image: url("images/dither.png"); background-image: url("images/dither.png");
} }
.line_alt0:hover .line_alt0:hover
{ {
background-color:#F9F9F9; background-color:#F9F9F9;
background-image: url("images/dither.png"); background-image: url("images/dither.png");
} }
.line_alt1 .line_alt1
{ {
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
background-color: #DDDDDD; background-color: #DDDDDD;
background-image: url("images/dither.png"); background-image: url("images/dither.png");
} }
.line_alt1:hover .line_alt1:hover
{ {
background-color:#F9F9F9; background-color:#F9F9F9;
background-image: url("images/dither.png"); background-image: url("images/dither.png");
} }
*/ */
.lineColouredWhite, .lineColouredWhite:hover, A.lineColouredWhite .lineColouredWhite, .lineColouredWhite:hover, A.lineColouredWhite
{ {
font-size: 8pt; font-size: 8pt;
color: #FFFFFF; color: #FFFFFF;
} }
.lineColouredBlack, .lineColouredBlack:hover, A.lineColouredBlack .lineColouredBlack, .lineColouredBlack:hover, A.lineColouredBlack
{ {
font-size: 8pt; font-size: 8pt;
color: #000000; color: #000000;
} }
/* TOP Menu Classes */ /* TOP Menu Classes */
.topmenu1 .topmenu1
{ {
height: 20px; height: 20px;
border:1px ridge; border:1px ridge;
border-color: #79AABE #09506C #79AABE #79AABE; border-color: #79AABE #09506C #79AABE #79AABE;
font: 10px Verdana, Arial, Helvetica, sans-serif; font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF; color: #FFFFFF;
background-color: #597196; background-color: #597196;
} }
.topmenu1:hover .topmenu1:hover
{ {
color: #FFFF99; color: #FFFF99;
background-color: #6A88B8; background-color: #6A88B8;
text-decoration: none; text-decoration: none;
} }
.topmenu1_link, A.topmenu1_link .topmenu1_link, A.topmenu1_link
{ {
color: #FFDD22; color: #FFDD22;
} }
.topmenu1_link:hover, A.topmenu1_link:hover .topmenu1_link:hover, A.topmenu1_link:hover
{ {
color: #FFFF99; color: #FFFF99;
text-decoration: none; text-decoration: none;
} }
.topmenuend .topmenuend
{ {
height: 20px; height: 20px;
font: 10px Verdana, Arial, Helvetica, sans-serif; font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF; color: #FFFFFF;
background-color: #597196; background-color: #597196;
} }
.topmenu2 .topmenu2
{ {
height: 20px; height: 20px;
border:1px ridge; border:1px ridge;
border-color: #79AABE #79AABE #09506C #79AABE; border-color: #79AABE #79AABE #09506C #79AABE;
font: 10px Verdana, Arial, Helvetica, sans-serif; font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF; color: #FFFFFF;
background-color: #597196; background-color: #597196;
} }
.topmenu2:hover .topmenu2:hover
{ {
color: #FFFF99; color: #FFFF99;
background-color: #6A88B8; background-color: #6A88B8;
text-decoration: none; text-decoration: none;
} }
.topmenu2_link, A.topmenu2_link .topmenu2_link, A.topmenu2_link
{ {
color: #FFDD22; color: #FFDD22;
} }
.topmenu2_link:hover, A.topmenu2_link:hover .topmenu2_link:hover, A.topmenu2_link:hover
{ {
color: #FFFF99; color: #FFFF99;
text-decoration: none; text-decoration: none;
} }
.topmenu2end .topmenu2end
{ {
height: 20px; height: 20px;
border:1px inset; border:1px inset;
border-color: #09506C #79AABE #09506C #09506C; border-color: #09506C #79AABE #09506C #09506C;
font: 10px Verdana, Arial, Helvetica, sans-serif; font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF; color: #FFFFFF;
background-color: #6A8296; background-color: #6A8296;
} }
/* Cell Columns */ /* Cell Columns */
.cellmenu1 .cellmenu1
{ {
/* height: 16px; */ /* height: 16px; */
border:1px ridge; border:1px ridge;
border-color: #79AABE #09506C #09506C #79AABE; border-color: #79AABE #09506C #09506C #79AABE;
text-indent:5px; text-indent:5px;
font: bold 10px Verdana, Arial, Helvetica, sans-serif; font: bold 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF; color: #FFFFFF;
background-color: #6C8E9C; background-color: #6C8E9C;
} }
.cellmenu1:hover .cellmenu1:hover
{ {
color: #FFFF99; color: #FFFF99;
text-decoration: none; text-decoration: none;
} }
A.cellmenu1_link A.cellmenu1_link
{ {
color: #FFFF55; color: #FFFF55;
text-decoration: underline; text-decoration: underline;
} }
A.cellmenu1_link:hover A.cellmenu1_link:hover
{ {
color: #FFBB55; color: #FFBB55;
text-decoration: none; text-decoration: none;
} }
.cellmenu2 .cellmenu2
{ {
height: 15px; height: 15px;
border:1px inset; border:1px inset;
border-color: #79AABE #09506C #09506C #79AABE; border-color: #79AABE #09506C #09506C #79AABE;
text-indent:5px; text-indent:5px;
font: 10px Verdana, Arial, Helvetica, sans-serif; font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #393327; color: #393327;
background-color: #B8D4E0; background-color: #B8D4E0;
} }
.cellmenu2:hover .cellmenu2:hover
{ {
color: #A31D32; color: #A31D32;
text-decoration: none; text-decoration: none;
} }
/* Usefull Text Classes */ /* Usefull Text Classes */
.ErrorMsg .ErrorMsg
{ {
font: bold 12px Verdana, Arial, Helvetica, sans-serif; font: bold 12px Verdana, Arial, Helvetica, sans-serif;
COLOR: #FF0000; COLOR: #FF0000;
border-top: 1px solid; border-top: 1px solid;
border-bottom: 1px solid; border-bottom: 1px solid;
border-color: #58363E; border-color: #58363E;
} }
.PriorityEmergency .PriorityEmergency
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #ff4444; background-color: #ff4444;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityAlert .PriorityAlert
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #dd00dd; background-color: #dd00dd;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityCrit .PriorityCrit
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #dd9900; background-color: #dd9900;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityError .PriorityError
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #CC0000; background-color: #CC0000;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityWarning .PriorityWarning
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #FFAA00; background-color: #FFAA00;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityNotice .PriorityNotice
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #66CC33; background-color: #66CC33;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityInfo .PriorityInfo
{ {
color: #000000; color: #000000;
background-color: #ABF1FF; background-color: #ABF1FF;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
.PriorityDebug .PriorityDebug
{ {
color: #FFFFFF; color: #FFFFFF;
background-color: #3333ff; background-color: #3333ff;
border-top: black 1px solid; border-top: black 1px solid;
border-bottom: black 1px solid; border-bottom: black 1px solid;
border-right: gray 1px solid; border-right: gray 1px solid;
} }
/* Form elements */ /* Form elements */
select, input, button, textarea select, input, button, textarea
{ {
background-color: #E8E7E2; background-color: #E8E7E2;
color:#000000; color:#000000;
font:bold 10px Verdana,Arial,Helvetica,sans-serif; font:bold 10px Verdana,Arial,Helvetica,sans-serif;
border: 1px solid; border: 1px solid;
border-color: #233B51 #124A7C #124A7C #233B51; border-color: #233B51 #124A7C #124A7C #233B51;
} }
.SearchFormControl .SearchFormControl
{ {
height: 20px; height: 20px;
margin: 2px; margin: 2px;
background-color: #E8E7E2; background-color: #E8E7E2;
color:#000000; color:#000000;
font:bold 10px Verdana,Arial,Helvetica,sans-serif; font:bold 10px Verdana,Arial,Helvetica,sans-serif;
border: 1px solid; border: 1px solid;
border-color: #233B51 #124A7C #124A7C #233B51; border-color: #233B51 #124A7C #124A7C #233B51;
} }
.SearchFormTextbox .SearchFormTextbox
{ {
height: 20px; height: 20px;
margin: 2px; margin: 2px;
background-color: #E8E7E2; background-color: #E8E7E2;
color:#000000; color:#000000;
font:10px Verdana,Arial,Helvetica,sans-serif; font:10px Verdana,Arial,Helvetica,sans-serif;
border: 1px solid; border: 1px solid;
border-color: #233B51 #124A7C #124A7C #233B51; border-color: #233B51 #124A7C #124A7C #233B51;
} }