summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2010-03-20 22:44:48 +0000
committerivan <ivan>2010-03-20 22:44:48 +0000
commite26b6570a1ff89dcdd0aee757857c3b335bf90be (patch)
tree863c7e04ddfbbf694c8ac473ed4c97b95fd6bdbd
parent10e462292b42813dce6e1034064c55c7fddd42a4 (diff)
more RT integration / reskin / 2.1, RT#6640
-rw-r--r--httemplate/elements/freeside-menu.css2
-rw-r--r--httemplate/elements/header.html15
-rw-r--r--httemplate/elements/xmenu.css42
-rw-r--r--httemplate/elements/xmenu.js2
-rw-r--r--httemplate/elements/xmenu.top.css67
5 files changed, 19 insertions, 109 deletions
diff --git a/httemplate/elements/freeside-menu.css b/httemplate/elements/freeside-menu.css
index 165f7f4b9..58cb49b4d 100644
--- a/httemplate/elements/freeside-menu.css
+++ b/httemplate/elements/freeside-menu.css
@@ -1,7 +1,7 @@
input.fsblackbutton {
background-color:#aaaaaa;
color: #333333;
- border:1px solid #cccccc;
+ border:1px solid #888888;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 11211607b..c9e8f5756 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -77,7 +77,7 @@ Example:
<% $head |n %>
</HEAD>
- <BODY <% $menu_position eq 'left' ? qq( BACKGROUND="${fsurl}images/background-cheat.png" ) : ' BGCOLOR="#f8f8f8" ' %> <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
+ <BODY BGCOLOR="#f8f8f8" <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
<table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0; padding-right:4">
<tr>
<td BGCOLOR="#ffffff"><IMG BORDER=0 ALT="freeside" HEIGHT="36" SRC="<%$fsurl%>view/REAL_logo.cgi"></td>
@@ -190,20 +190,7 @@ Example:
<SCRIPT TYPE="text/javascript">
document.write(myBar);
</SCRIPT>
- <BR>
- <IMG SRC="<%$fsurl%>images/32clear.gif" HEIGHT="1" WIDTH="154">
-
- <TABLE CELLSPACING=0 CELLPADDING=0 BGCOLOR="#cccccc" WIDTH="100%">
- <TR>
- <TD ALIGN="left" STYLE="padding-bottom:1px;border-bottom:1px solid #999999"><% include('/elements/about_freeside.html') |n %></TD>
- </TR>
- <TR>
- <TD ALIGN="right" STYLE="padding-bottom:1px"><% include('/elements/about_rt.html') |n %></TD>
- </TR>
- </TABLE>
-
</TD>
- <TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<%$fsurl%>images/black-gray-side.png"></TD>
% }
diff --git a/httemplate/elements/xmenu.css b/httemplate/elements/xmenu.css
index 33ad90caa..183d26912 100644
--- a/httemplate/elements/xmenu.css
+++ b/httemplate/elements/xmenu.css
@@ -33,7 +33,7 @@
.webfx-menu-empty {
display: block;
- border: 1px solid white;
+ border: 1px solid white;
padding: 2px 5px 2px 5px;
font-size: 11px;
/* font-family: Tahoma, Verdan, Helvetica, Sans-Serif; */
@@ -53,12 +53,12 @@
text-decoration: none;
vertical-align: center;
color: black;
- border: 1px solid white;
+ border: 1px solid white;
}
.webfx-menu a:visited {
color: black;
- border: 1px solid white;
+ border: 1px solid white;
}
.webfx-menu a:hover {
@@ -100,7 +100,7 @@
/* background: rgb(120,172,255);/*rgb(255,128,0);*/
/* background: #a097ed; */
- background: #000000;
+ background: #cccccc;
/* border: 1px solid #7E0079; */
/* border: 1px solid #000000; */
/* border: none */
@@ -117,21 +117,13 @@
/* i want a vertical bar */
display: block;
- /* border: 1px solid black; /*rgb(0,0,0);/*rgb(255,128,0);*/
- /* border: 1px solid black; /* #ffffff; */
- /* border-bottom: 1px solid black; */
- border-bottom: 1px solid white;
- /* border-bottom: 1px solid rgb(0,66,174);
- /* border-bottom: 1px solid black;
- border-bottom: 1px solid black;
- border-bottom: 1px solid black; */
padding: 1px 5px 1px 5px;
font-size: 14px;
- /* color: black; */
- color: white;
+ color: black;
+ /* color: white; */
text-decoration: none;
/* IE5.0 Does not paint borders and padding on inline elements without a height/width */
@@ -139,19 +131,13 @@
}
.webfx-menu-bar a:link {
- color: white;
+ /* color: white; */
+ color: black;
}
.webfx-menu-bar a:hover {
- /* color: black; */
- color: white;
- /* background: rgb(120,172,255); */
- /* background: #BC79B8; */
- background: #7e0079;
- /* border-left: 1px solid rgb(234,242,255);
- border-right: 1px solid rgb(0,66,174);
- border-top: 1px solid rgb(234,242,255);
- border-bottom: 1px solid rgb(0,66,174); */
+ text-decoration: underline;
+ color: #7e0079;
}
.webfx-menu-bar a .arrow {
@@ -171,11 +157,6 @@
a proprietary property on HTMLElement. Did I say that IE sucks at CSS?
*/
ie-dummy: expression(this.hideFocus=true);
-
-/* border-left: 1px solid rgb(0,66,174); */
-/* border-right: 1px solid rgb(234,242,255); */
-/* border-top: 1px solid rgb(0,66,174); */
-/* border-bottom: 1px solid rgb(234,242,255); */
}
.webfx-menu-title {
@@ -191,8 +172,7 @@
font-weight: bold;
text-decoration: none;
color: white;
-/* border: 1px solid white; */
- border-bottom: 1px solid white;
+ border-bottom: 1px solid white;
width: expression(constExpression(ie ? "98%": "auto")); /* should be ignored by mz and op */
}
diff --git a/httemplate/elements/xmenu.js b/httemplate/elements/xmenu.js
index 134265f53..3ef9a3ddc 100644
--- a/httemplate/elements/xmenu.js
+++ b/httemplate/elements/xmenu.js
@@ -369,7 +369,7 @@ WebFXMenuButton.prototype.toString = function () {
)
)) +
">" +
- (this.subMenu ? "<img class='arrow' src='" + webfxMenuImagePath + "arrow.right.png'>" : "") +
+ (this.subMenu ? "<img class='arrow' src='" + webfxMenuImagePath + "arrow.right.black.png'>" : "") +
this.text +
"</a>";
};
diff --git a/httemplate/elements/xmenu.top.css b/httemplate/elements/xmenu.top.css
index eb4da64e6..4fc4d3338 100644
--- a/httemplate/elements/xmenu.top.css
+++ b/httemplate/elements/xmenu.top.css
@@ -33,7 +33,7 @@
.webfx-menu-empty {
display: block;
- border: 1px solid white;
+ border: 1px solid white;
padding: 2px 5px 2px 5px;
font-size: 11px;
/* font-family: Tahoma, Verdan, Helvetica, Sans-Serif; */
@@ -53,12 +53,12 @@
text-decoration: none;
vertical-align: center;
color: black;
- border: 1px solid white;
+ border: 1px solid white;
}
.webfx-menu a:visited {
color: black;
- border: 1px solid white;
+ border: 1px solid white;
}
.webfx-menu a:hover {
@@ -114,44 +114,20 @@
/* i want a vertical bar */
/* display: block; */
- /* border: 1px solid black; /*rgb(0,0,0);/*rgb(255,128,0);*/
- /* border: 1px solid black; /* #ffffff; */
- /* border-bottom: 1px solid black; */
- /* border-bottom: 1px solid white; */
- /* border-bottom: 1px solid rgb(0,66,174);
- /* border-bottom: 1px solid black;
- border-bottom: 1px solid black;
- border-bottom: 1px solid black; */
-
padding: 1px 5px 1px 5px;
font-size: 16px;
- /* font-weight: bold; */
color: black;
/* color: white; */
text-decoration: none;
- /* text-decoration: underline; */
/* IE5.0 Does not paint borders and padding on inline elements without a height/width */
height: expression(constExpression(ie50 ? "17px" : "auto"));
-/* background-color:#333333;
- border:1px solid;
- border-top-color:#cccccc;
- border-left-color:#cccccc;
- border-right-color:#aaaaaa;
- border-bottom-color:#aaaaaa;
-*/
-/* -moz-border-radius: 15px;
- -webkit-border-radius: 15px;
- border-radius: 15px;
- behavior: url(border-radius.htc);
-*/
-
border: 1px solid #cccccc;
- margin-right: 4px
+ margin-right: 4px
}
@@ -161,34 +137,7 @@
}
.webfx-menu-bar a:hover {
- color: black;
- /* color: white; */
- /* background: rgb(120,172,255); */
- /* background: #BC79B8; */
- /* background: #7e0079; */
text-decoration: underline;
- /* font-weight: bold; */
- /* border-left: 1px solid rgb(234,242,255);
- border-right: 1px solid rgb(0,66,174);
- border-top: 1px solid rgb(234,242,255);
- border-bottom: 1px solid rgb(0,66,174); */
-
-/* border:1px solid;
- border-top-color:#cccccc;
- border-left-color:#cccccc;
- border-right-color:#aaaaaa;
- border-bottom-color:#aaaaaa;
-*/
-/* -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- behavior: url(border-radius.htc);
-*/
-
- /* border: 1px solid #7e0079; */
-/* border: 1px solid #d8d8d8;
- background: #bbbbbb;
-*/
color: #7e0079;
}
@@ -211,11 +160,6 @@
a proprietary property on HTMLElement. Did I say that IE sucks at CSS?
*/
ie-dummy: expression(this.hideFocus=true);
-
-/* border-left: 1px solid rgb(0,66,174); */
-/* border-right: 1px solid rgb(234,242,255); */
-/* border-top: 1px solid rgb(0,66,174); */
-/* border-bottom: 1px solid rgb(234,242,255); */
}
.webfx-menu-title {
@@ -231,8 +175,7 @@
font-weight: bold;
text-decoration: none;
color: white;
-/* border: 1px solid white; */
- border-bottom: 1px solid white;
+ border-bottom: 1px solid white;
width: expression(constExpression(ie ? "98%": "auto")); /* should be ignored by mz and op */
}