lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 12:03:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.10.x' into dev

Browse Source 
Conflicts:
	ClickToBuildAzurePackage.cmd
	Orchard.proj
	src/Orchard.Azure/Orchard.Azure.sln
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
This commit is contained in:
Sebastien Ros
2016-03-28 09:19:21 -07:00
parent a6f46d17cd ba134bb868
commit 2a545d992a
41 changed files with 436 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
View File

@@ -11,7 +11,7 @@
float:left;
}
.extensionName.installed {
background: url("images/installed.gif") no-repeat 0px 8px #fff;
background: url("images/installed.gif") no-repeat 0px 8px;
padding:0 0 0 60px;
}
.contentItems .related {