Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

BUGFIX: #6840 Fix navigation highlights on LeftAndMain

  • Loading branch information...
commit 71f37b993c5f544b55e8b16b8c3cf317f0586404 1 parent ebec3ba
Will Rossiter wilr authored
1  admin/css/screen.css
View
@@ -654,6 +654,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
.cms-menu-list li.current li a { font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; color: #e2f0f7; background: none; border-top: 1px solid #338dc1; border-bottom: 1px solid #1e5270; }
.cms-menu-list li.current li a.current, .cms-menu-list li.current li a:hover { background: #2e7ead; border-top: 1px solid #2e7ead; color: white; }
.cms-menu-list li.current li a:focus { background: #236184; border-top: 1px solid #1e5270; color: white; }
+.cms-menu-list li.current li.current { background: #2e7ead; border-top: 1px solid #2e7ead; }
.cms-menu-list li.current li.current a { font-weight: bold; color: white; }
.cms-menu-list li.current li.first a { border-top: none; }
.cms-menu-list li ul { display: none; }
11 admin/scss/_menu.scss
View
@@ -271,9 +271,14 @@
}
- &.current a {
- font-weight: bold;
- color: $color-text-light;
+ &.current {
+ background: darken($color-menu-button, 5%);
+ border-top: 1px solid darken($color-menu-button, 5%);
+
+ a {
+ font-weight: bold;
+ color: $color-text-light;
+ }
}
&.first a {
8 admin/templates/Includes/LeftAndMain_Menu.ss
View
@@ -51,12 +51,12 @@
<% if Code == 'CMSPagesController' %>
<ul>
- <li class="last <% if Top.class == 'CMSPagesController' %>current<% end_if %>" id="Menu-CMSPagesController">
+ <li class="first <% if Top.class == 'CMSPagesController' %>current<% end_if %>" id="Menu-CMSPagesController">
<a href="admin/pages/">
<span class="text">Edit &amp; organize</span>
</a>
</li>
- <li class="first <% if Top.class == 'CMSPageAddController' %>current<% end_if %>" id="Menu-CMSPageAddController">
+ <li class="last <% if Top.class == 'CMSPageAddController' %>current<% end_if %>" id="Menu-CMSPageAddController">
<a href="admin/page/add/?ParentID=$Top.CurrentPageID">
<span class="text">Add pages</span>
</a>
@@ -66,12 +66,12 @@
<% if Code == 'AssetAdmin' %>
<ul>
- <li class="last <% if Top.class == 'AssetAdmin' %>current<% end_if %>" id="Menu-AssetAdmin">
+ <li class="first <% if Top.class == 'AssetAdmin' %>current<% end_if %>" id="Menu-AssetAdmin">
<a href="admin/assets/">
<span class="text">Edit &amp; organize</span>
</a>
</li>
- <li class="first <% if Top.class == 'CMSFileAddController' %>current<% end_if %>" id="Menu-CMSFileAddController">
+ <li class="last <% if Top.class == 'CMSFileAddController' %>current<% end_if %>" id="Menu-CMSFileAddController">
<a href="admin/assets/add">
<span class="text">Add files</span>
</a>
Please sign in to comment.
Something went wrong with that request. Please try again.