mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-09 00:43:23 +01:00
Fix some minor issues un the toolbar.
This commit is contained in:
parent
11809a4493
commit
a8d30ece9f
@ -1,6 +1,6 @@
|
|||||||
/* HEADER STYLES */
|
/* HEADER STYLES */
|
||||||
#header {
|
#header {
|
||||||
margin-top: 2px;
|
margin-top: 0px;
|
||||||
height: 78px;
|
height: 78px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: white;
|
background: white;
|
||||||
@ -31,7 +31,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
#headerLogo {
|
#headerLogo {
|
||||||
margin-top: 8px;
|
margin-top: 13px;
|
||||||
height: 80px;
|
height: 80px;
|
||||||
width: 160px;
|
width: 160px;
|
||||||
background: url("../images/logo-medium.png") no-repeat;
|
background: url("../images/logo-medium.png") no-repeat;
|
||||||
@ -100,30 +100,6 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
|
|||||||
border-bottom: 0;
|
border-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#signUpHeader {
|
|
||||||
padding-right: 8px;
|
|
||||||
padding-top: 4px;
|
|
||||||
position: absolute;
|
|
||||||
right: 0;
|
|
||||||
z-index: 50;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#signUpHeader a, #signUpHeader a:hover {
|
|
||||||
font-size: 100%;
|
|
||||||
color: #BBB4D6;
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
#editorHeader {
|
|
||||||
height: 40px;
|
|
||||||
width: 100%;
|
|
||||||
background: white;
|
|
||||||
border-bottom: 1px solid #bbb4d6;
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#footer {
|
#footer {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -166,6 +142,11 @@ div#headerActions {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
z-index: 50;
|
z-index: 50;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#headerActions span {
|
||||||
|
border-bottom: 3px solid #F7C931;
|
||||||
}
|
}
|
||||||
|
|
||||||
div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
|
div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
|
||||||
|
@ -8,26 +8,18 @@
|
|||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${principal != null}">
|
<c:when test="${principal != null}">
|
||||||
<div id="headerActions">
|
<div id="headerActions">
|
||||||
<spring:message code="WELCOME"/>
|
<spring:message code="WELCOME"/>, ${principal.firstname}
|
||||||
, ${principal.firstname}
|
| <span><a href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span>
|
||||||
| <a href="${pageContext.request.contextPath}/c/mymaps.htm">
|
| <span><a href="${pageContext.request.contextPath}/c/settings.htm" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
|
||||||
<spring:message code="MY_WISEMAPS"/>
|
| <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
|
||||||
</a>
|
|
||||||
| <a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
|
|
||||||
title="<spring:message code="SETTINGS_DETAIL"/>">
|
|
||||||
<spring:message code="SETTINGS"/>
|
|
||||||
</a>
|
|
||||||
| <a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
|
|
||||||
<spring:message code="LOGOUT"/>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${param.removeSignin!=true}">
|
<c:when test="${param.removeSignin!=true}">
|
||||||
<div id="signUpHeader">
|
<div id="headerActions">
|
||||||
<spring:message code="ALREADY_A_MEMBER"/>
|
<spring:message code="ALREADY_A_MEMBER"/>
|
||||||
<a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
|
<span><a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
|
||||||
<spring:message code="SIGN_IN"/>
|
<spring:message code="SIGN_IN"/>
|
||||||
</a>
|
</a></span>
|
||||||
</div>
|
</div>
|
||||||
</c:when>
|
</c:when>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
|
Loading…
Reference in New Issue
Block a user