Luis Pedro Lemos pushed to branch feature/essentials-menu-options-improvement
at cms-community / hippo-essentials
Commits:
d90fa26d by Luís Pedro Lemos at 2016-03-22T18:07:35+01:00
ESSENTIALS-815: Removed changes on bootstrap css and added inline styling
- - - - -
7 changed files:
- plugins/menu/src/main/resources/freemarker/essentials-menu-navbar.ftl
- plugins/menu/src/main/resources/freemarker/essentials-menu-vertical.ftl
- plugins/menu/src/main/resources/freemarker/essentials-menu.ftl
- plugins/menu/src/main/resources/jsp/essentials-menu.jsp
-
plugins/skeleton-package/src/main/resources/instructions/bootstrap/css/bootstrap.css
-
plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl
- plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp
Changes:
=====================================
plugins/menu/src/main/resources/freemarker/essentials-menu-navbar.ftl
=====================================
--- a/plugins/menu/src/main/resources/freemarker/essentials-menu-navbar.ftl
+++ b/plugins/menu/src/main/resources/freemarker/essentials-menu-navbar.ftl
@@ -7,9 +7,9 @@
<#list menu.siteMenuItems as item>
<#if !item.hstLink?? && !item.externalLink??>
<#if item.selected || item.expanded>
- <li class="active"><span>${item.name?html}</span></li>
+ <li class="active"><div style="padding: 10px
15px;">${item.name?html}</div></li>
<#else>
- <li><span>${item.name?html}</span></li>
+ <li><div style="padding: 10px
15px;">${item.name?html}</div></li>
</#if>
<#else>
<#if item.hstLink??>
=====================================
plugins/menu/src/main/resources/freemarker/essentials-menu-vertical.ftl
=====================================
--- a/plugins/menu/src/main/resources/freemarker/essentials-menu-vertical.ftl
+++ b/plugins/menu/src/main/resources/freemarker/essentials-menu-vertical.ftl
@@ -6,9 +6,9 @@
<#list menu.siteMenuItems as item>
<#if !item.hstLink?? && !item.externalLink??>
<#if item.selected || item.expanded>
- <li class="active"><span>${item.name?html}</span></li>
+ <li class="active"><div style="padding: 10px
15px;">${item.name?html}</div></li>
<#else>
- <li><span>${item.name?html}</span></li>
+ <li><div style="padding: 10px 15px;">${item.name?html}</div></li>
</#if>
<#else>
<#if item.hstLink??>
=====================================
plugins/menu/src/main/resources/freemarker/essentials-menu.ftl
=====================================
--- a/plugins/menu/src/main/resources/freemarker/essentials-menu.ftl
+++ b/plugins/menu/src/main/resources/freemarker/essentials-menu.ftl
@@ -6,9 +6,9 @@
<#list menu.siteMenuItems as item>
<#if !item.hstLink?? && !item.externalLink??>
<#if item.selected || item.expanded>
- <li class="active"><span>${item.name?html}</span></li>
+ <li class="active"><div style="padding: 10px
15px;">${item.name?html}</div></li>
<#else>
- <li><span>${item.name?html}</span></li>
+ <li><div style="padding: 10px 15px;">${item.name?html}</div></li>
</#if>
<#else>
<#if item.hstLink??>
=====================================
plugins/menu/src/main/resources/jsp/essentials-menu.jsp
=====================================
--- a/plugins/menu/src/main/resources/jsp/essentials-menu.jsp
+++ b/plugins/menu/src/main/resources/jsp/essentials-menu.jsp
@@ -8,10 +8,10 @@
<c:when test="${empty item.hstLink && empty item.externalLink}">
<c:choose>
<c:when test="${item.selected or item.expanded}">
- <li class="active"><span><c:out
value="${item.name}"/></span></li>
+ <li class="active"><div style="padding: 10px 15px;"><c:out
value="${item.name}"/></div></li>
</c:when>
<c:otherwise>
- <li><span><c:out value="${item.name}"/></span></li>
+ <li><div style="padding: 10px 15px;"><c:out
value="${item.name}"/></div></li>
</c:otherwise>
</c:choose>
</c:when>
=====================================
plugins/skeleton-package/src/main/resources/instructions/bootstrap/css/bootstrap.css
=====================================
---
a/plugins/skeleton-package/src/main/resources/instructions/bootstrap/css/bootstrap.css
+++
b/plugins/skeleton-package/src/main/resources/instructions/bootstrap/css/bootstrap.css
@@ -3863,25 +3863,21 @@ select[multiple].input-group-sm > .input-group-btn >
.btn {
position: relative;
display: block;
}
-.nav > li > a, span {
+.nav > li > a {
position: relative;
display: block;
padding: 10px 15px;
}
.nav > li > a:hover,
-.nav > li > a:focus,
-.nav > li > span:hover,
-.nav > li > span:focus{
+.nav > li > a:focus {
text-decoration: none;
background-color: #eee;
}
-.nav > li.disabled > a, span {
+.nav > li.disabled > a {
color: #777;
}
.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus,
-.nav > li.disabled > span:hover,
-.nav > li.disabled > span:focus {
+.nav > li.disabled > a:focus {
color: #777;
text-decoration: none;
cursor: not-allowed;
@@ -3974,7 +3970,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn
{
.nav-pills > li {
float: left;
}
-.nav-pills > li > a, span {
+.nav-pills > li > a {
border-radius: 4px;
}
.nav-pills > li + li {
@@ -4841,9 +4837,6 @@ a.badge:focus {
.nav-pills > li > a > .badge {
margin-left: 3px;
}
-.nav-pills > li > span > .badge {
- margin-left: 3px;
-}
.jumbotron {
padding: 30px 15px;
margin-bottom: 30px;
@@ -5952,7 +5945,7 @@ button.close {
border: 1px solid rgba(0, 0, 0, .2);
border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
- box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
}
.popover.top {
margin-top: -10px;
=====================================
plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl
=====================================
---
a/plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl
+++
b/plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl
@@ -8,9 +8,9 @@
<#list menu.siteMenuItems as item>
<#if !item.hstLink?? && !item.externalLink??>
<#if item.selected || item.expanded>
- <li class="active"><span>${item.name?html}</span></li>
+ <li class="active"><div style="padding: 10px
15px;">${item.name?html}</div></li>
<#else>
- <li><span>${item.name?html}</span></li>
+ <li><div style="padding: 10px
15px;">${item.name?html}</div></li>
</#if>
<#else>
<#if item.hstLink??>
=====================================
plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp
=====================================
---
a/plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp
+++
b/plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp
@@ -11,10 +11,10 @@
<c:when test="${empty item.hstLink && empty item.externalLink}">
<c:choose>
<c:when test="${item.selected or item.expanded}">
- <li class="active"><span><c:out
value="${item.name}"/></span></li>
+ <li class="active"><div style="padding: 10px 15px;"><c:out
value="${item.name}"/></div></li>
</c:when>
<c:otherwise>
- <li><span><c:out value="${item.name}"/></span></li>
+ <li><div style="padding: 10px 15px;"><c:out
value="${item.name}"/></div></li>
</c:otherwise>
</c:choose>
</c:when>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/d90fa26de433446d9d98d20b2f745031067c7b8e
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
