lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 13:51:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing conflict between lists and container admin navicon by applying the unused menu.list-definition.png to lists

Browse Source
This commit is contained in:
Benedek Farkas 2024-11-20 14:30:14 +01:00
parent 79ade4b6f8
commit df34496aa2
6 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Containers/AdminMenu.cs
View File

@ -76,7 +76,7 @@ namespace Orchard.Core.Containers {
item.Action(containerMetadata.AdminRouteValues);
item.Action(containerMetadata.AdminRouteValues);
item.AddClass("nav-list");
item.AddClass("section-container");
item.AddClass(closureContainer.AdminMenuText.HtmlClassify());
item.LinkToFirstChild(false);

19
src/Orchard.Web/Core/Containers/Styles/menu.container-admin.css
View File

@ -1,22 +1,7 @@
.navicon-list,
.navicon-lists,
.section-new .subnavicon-list,
.nav-list > h3 > a,
.nav-list-definition > h3 > a {
.menu-admin > .section-container > h3 > a {
background-image: url(images/menu.container.png) !important;
}
.navicon-list:hover,
.navicon-lists:hover,
.nav-list > h3 > a:hover,
.nav-list-definition > h3 > a:hover {
.menu-admin > .section-container > h3 > a:hover {
background-position: 0 -30px !important;
}
.navicon-lists {
background-image: url(images/menu.container.png) !important;
}
.navicon-lists:hover {
background-position: 0 -30px !important;
}

2
src/Orchard.Web/Modules/Orchard.Lists/AdminMenu.cs
View File

@ -8,7 +8,7 @@ namespace Orchard.Lists {
public void GetNavigation(NavigationBuilder builder) =>
builder
.AddImageSet("container")
.AddImageSet("lists")
.Add(T("Lists"), "11", item => item
.Action("Index", "Admin", new { area = "Orchard.Lists" }).Permission(Permissions.ManageLists));
}

3
src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
View File

@ -115,6 +115,7 @@
<Content Include="Styles\images\icons.png" />
<Content Include="Styles\images\view.default.png" />
<Content Include="Styles\images\view.condensed.png" />
<Content Include="Styles\menu.lists-admin.css" />
<Content Include="Styles\nprogress.css" />
<Content Include="Scripts\nprogress.js" />
<Content Include="Scripts\orchard-lists-admin.js" />
@ -143,7 +144,7 @@
<Content Include="Scripts\orchard-lists-admin.min.js">
<DependentUpon>orchard-lists-admin.js</DependentUpon>
</Content>
<Content Include="Styles\images\menu.list-definition.png" />
<Content Include="Styles\images\menu.lists.png" />
<Content Include="Styles\images\move.gif" />
<Content Include="Styles\images\offline.gif" />
<Content Include="Styles\images\online.gif" />

0
src/Orchard.Web/Modules/Orchard.Lists/Styles/images/menu.list-definition.png → src/Orchard.Web/Modules/Orchard.Lists/Styles/images/menu.lists.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

7
src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.lists-admin.css Normal file
View File

@ -0,0 +1,7 @@
.navicon-lists {
background-image: url(images/menu.lists.png) !important;
}
.navicon-lists:hover {
background-position: 0 -30px !important;
}