Skip to content
This repository
Browse code

BUGFIX: #6840 Fix navigation highlights on LeftAndMain

  • Loading branch information...
commit 71f37b993c5f544b55e8b16b8c3cf317f0586404 1 parent ebec3ba
Will Rossiter authored March 24, 2012
1  admin/css/screen.css
@@ -654,6 +654,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
654 654
 .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; }
655 655
 .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; }
656 656
 .cms-menu-list li.current li a:focus { background: #236184; border-top: 1px solid #1e5270; color: white; }
  657
+.cms-menu-list li.current li.current { background: #2e7ead; border-top: 1px solid #2e7ead; }
657 658
 .cms-menu-list li.current li.current a { font-weight: bold; color: white; }
658 659
 .cms-menu-list li.current li.first a { border-top: none; }
659 660
 .cms-menu-list li ul { display: none; }
11  admin/scss/_menu.scss
@@ -271,9 +271,14 @@
271 271
 
272 272
 				}
273 273
 				
274  
-				&.current a {
275  
-					font-weight: bold;
276  
-					color: $color-text-light;
  274
+				&.current {
  275
+					background: darken($color-menu-button, 5%);
  276
+					border-top: 1px solid darken($color-menu-button, 5%);
  277
+					
  278
+					a {
  279
+						font-weight: bold;
  280
+						color: $color-text-light;
  281
+					}
277 282
 				}
278 283
 				
279 284
 				&.first a {
8  admin/templates/Includes/LeftAndMain_Menu.ss
@@ -51,12 +51,12 @@
51 51
 
52 52
 				<% if Code == 'CMSPagesController' %>
53 53
 					<ul>
54  
-						<li class="last <% if Top.class == 'CMSPagesController' %>current<% end_if %>" id="Menu-CMSPagesController">
  54
+						<li class="first <% if Top.class == 'CMSPagesController' %>current<% end_if %>" id="Menu-CMSPagesController">
55 55
 							<a href="admin/pages/">
56 56
 								<span class="text">Edit &amp; organize</span>
57 57
 							</a>
58 58
 						</li>
59  
-						<li class="first <% if Top.class == 'CMSPageAddController' %>current<% end_if %>" id="Menu-CMSPageAddController">
  59
+						<li class="last <% if Top.class == 'CMSPageAddController' %>current<% end_if %>" id="Menu-CMSPageAddController">
60 60
 							<a href="admin/page/add/?ParentID=$Top.CurrentPageID">
61 61
 								<span class="text">Add pages</span>
62 62
 							</a>
@@ -66,12 +66,12 @@
66 66
 
67 67
 				<% if Code == 'AssetAdmin' %>
68 68
 					<ul>
69  
-						<li class="last <% if Top.class == 'AssetAdmin' %>current<% end_if %>" id="Menu-AssetAdmin">
  69
+						<li class="first <% if Top.class == 'AssetAdmin' %>current<% end_if %>" id="Menu-AssetAdmin">
70 70
 							<a href="admin/assets/">
71 71
 								<span class="text">Edit &amp; organize</span>
72 72
 							</a>
73 73
 						</li>
74  
-						<li class="first <% if Top.class == 'CMSFileAddController' %>current<% end_if %>" id="Menu-CMSFileAddController">
  74
+						<li class="last <% if Top.class == 'CMSFileAddController' %>current<% end_if %>" id="Menu-CMSFileAddController">
75 75
 							<a href="admin/assets/add">
76 76
 								<span class="text">Add files</span>
77 77
 							</a>

0 notes on commit 71f37b9

Please sign in to comment.
Something went wrong with that request. Please try again.