lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	lib/windowsazure/Microsoft.WindowsAzure.Storage.xml
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs
	src/Orchard.Web/Web.config
This commit is contained in:
Sebastien Ros
2015-10-15 15:07:19 -07:00
parent 508d97ed7d 101d61b808
commit f1cd6aa38d
42 changed files with 360 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
View File

@@ -18,7 +18,7 @@ html.dyn #main ul.features button { display:none; }
height:6em;
margin:0 .5% 1% .5%;
position:relative;
width:32.2%;
width:32%;
}
.features.summary-view .missingDependencies{
@@ -250,4 +250,4 @@ h2.recentlyInstalledModule {padding:0 0 0 40px;}
.dir-rtl .manage {
float: left;
}
}