kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#692] renamed div#account to div#header cleanup

This commit is contained in:
Romano Licker 2011-10-06 10:53:35 +02:00 committed by Eric Davis
parent 7e287d6e5a
commit 729e801c9f
2 changed files with 51 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/base.rhtml
View File

@ -31,7 +31,7 @@
<body class="<%=h body_css_classes %>"> <body class="<%=h body_css_classes %>">
<div id="wrapper"> <div id="wrapper">
<div id="top-menu"> <div id="top-menu">
<div id="account"> <div id="header">
<div id="logo"></div> <div id="logo"></div>
<div id="top-menu-items"> <div id="top-menu-items">
<div id="search"> <div id="search">

92
public/stylesheets/application.css
View File

@ -1086,10 +1086,9 @@ a:hover {
#top-menu.open { /*IE 6-7 z-index stacking issue*/ #top-menu.open { /*IE 6-7 z-index stacking issue*/
z-index:5; z-index:5;
} }
#account { #account-nav {
background: url(../images/background_header.png) repeat-x 20px; display:block;
height:43px; background:url(../images/background_top_navigation.png) repeat-x left top;
font: arial,19px,white;
} }
#logo { #logo {
float:left; float:left;
@ -1101,11 +1100,12 @@ a:hover {
float:right; float:right;
padding-right:15px; padding-right:15px;
} }
#account-nav { #header {
display:block; background: url(../images/background_header.png) repeat-x 20px;
background:url(../images/background_top_navigation.png) repeat-x left top; height:43px;
font: arial,19px,white;
} }
#account ul { #header ul {
line-height:43px; line-height:43px;
float:left; float:left;
font-size:13px; font-size:13px;
@ -1118,44 +1118,43 @@ a:hover {
position:relative; position:relative;
} }
#account ul#account-info { #header ul#account-info {
margin-right:15px; margin-right:15px;
} }
#account ul#account-nav { #header li {
margin-right:6px;
}
#account li {
float:left; float:left;
border-left:1px solid #450308; border-left:1px solid #450308;
position:relative; position:relative;
z-index:5; z-index:5;
} }
#account li:first-child { #header li:last-child {
border:0;
}
#header li.last-child {
border-right:0px; border-right:0px;
} }
#account li > a { #header li > a {
text-decoration:none; text-decoration:none;
color:#FFFFFF; color:#FFFFFF;
height:43px; height:43px;
font-weight:normal; font-weight:normal;
} }
#header li.drop-down select {
#account li.drop-down > a { width:100%;
}
#header li.drop-down > a {
background:url(../images/arrow-down-white.png) no-repeat right center; background:url(../images/arrow-down-white.png) no-repeat right center;
padding-right:35px; padding-right:35px;
} }
#account li.drop-down > a:hover { #header li > a:hover {
background:#FFFFFF url(../images/arrow-down-grey.png) no-repeat right center; background-color:#700407;
}
#header li.drop-down > a:hover {
background:#700407 url(../images/arrow-down-grey.png) no-repeat right center;
padding-right:35px; padding-right:35px;
} }
#account-nav li > a:hover, #account li li a:hover { #header li li a:hover {
background-color:#FFFFFF; background-color:#FFFFFF;
color:#222222; color:#222222;
} }
#account li.drop-down li > a:hover, #main-menu li a.selected, #main-menu li a:hover { #header li.drop-down li > a:hover, #main-menu li a.selected, #main-menu li a:hover {
-moz-border-radius-topleft:5px; -moz-border-radius-topleft:5px;
-moz-border-radius-topright:5px; -moz-border-radius-topright:5px;
-webkit-border-top-left-radius:5px; -webkit-border-top-left-radius:5px;
@ -1180,9 +1179,6 @@ li a.home {
background:url(../images/icon_home.png) no-repeat 50% 50%; background:url(../images/icon_home.png) no-repeat 50% 50%;
} }
li a.home:hover {
background-image:url(../images/icon_home_grey.png);
}
li a.help { li a.help {
text-indent:-999em; text-indent:-999em;
width:20px; width:20px;
@ -1192,7 +1188,7 @@ li a.help {
li a.help:hover { li a.help:hover {
background-image:url(../images/icon_help_grey.png); background-image:url(../images/icon_help_grey.png);
} }
#account li.drop-down.open > a { #header li.drop-down.open > a {
background:#FFFFFF url(../images/arrow-down-grey.png) no-repeat right center; background:#FFFFFF url(../images/arrow-down-grey.png) no-repeat right center;
padding-right:35px; padding-right:35px;
} }
@ -1203,7 +1199,7 @@ li a.help:hover {
display:block; display:block;
padding:0px 9px 0px; padding:0px 9px 0px;
} }
#account .search_field { #header .search_field {
border:0px; border:0px;
color:white; color:white;
background:transparent url(../images/background_suche.png); background:transparent url(../images/background_suche.png);
@ -1225,45 +1221,35 @@ input:-moz-placeholder {
#search { #search {
float:left; float:left;
} }
#account li.open > a { #header li.open > a {
position:relative; position:relative;
top:0px; top:0px;
z-index:21; z-index:21;
} }
#account-nav li > a:hover, #account li li a:hover { #header li > ul {
background-color:#DDDDDD;
}
#account li ul {
display:none; display:none;
position:absolute; position:absolute;
border-top:1px solid #555;
top:22px;
height:auto; height:auto;
min-width:200px;
left:-1px; left:-1px;
z-index:20; z-index:20;
border: 1px solid #b7b7b7; border: 1px solid #b7b7b7;
border-top: 0px; border-top: 0px;
background-color:#FFFFFF; background-color:#FFFFFF;
} }
#account li.last-child > ul { #header li.last-child > ul {
left:auto; left:auto;
right:-1px; right:-1px;
} }
#account li li { #header li li {
float:none; float:none;
white-space:nowrap; white-space:nowrap;
border-style:solid; border-style:solid;
border-width:1px 0; border-width:1px 0;
} }
#account li li:first-child { #header li.drop-down li > a {
border-bottom:1px solid #1D5D6E;
}
#account li li:last-child {
border-bottom:0;
}
#account li.drop-down li > a {
padding:5px 9px; padding:5px 9px;
background:none; background:#FFFFFF;
position:static; position:static;
color:#222222; color:#222222;
font-size:13px; font-size:13px;
@ -1299,16 +1285,6 @@ input:-moz-placeholder {
margin:5px 5px; margin:5px 5px;
width:94%; width:94%;
} }
#nav-login {
display:none;
width: 500px;
position: absolute;
right:-1px;
background: transparent;
border:0px;
border-top:0;
}
#nav-login-content { #nav-login-content {
position: relative; position: relative;
position-top:44px; position-top:44px;
@ -1331,10 +1307,6 @@ input:-moz-placeholder {
color:black; color:black;
padding:0; padding:0;
} }
#nav-login div a:hover {
background-color: transparent;
text-decoration:underline;
}
div#optional_login_fields { div#optional_login_fields {
top:10px; top:10px;
white-space:nowrap; white-space:nowrap;