lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-10-13 12:53:36 -07:00
parent 726bfc95bd bdd384d7b4
commit bfd3fb1998
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
View File

@@ -142,11 +142,9 @@
<Content Include="Views\Items\Content.Edit.Blog.cshtml"> <Content Include="Views\Items\Content.Edit.Blog.cshtml">
<SubType>Code</SubType> <SubType>Code</SubType>
</Content> </Content>
<Content Include="Views\Items\Content.Editor-BlogPost.cshtml" />
<Content Include="Views\Items\Content.Summary.Blog.cshtml" /> <Content Include="Views\Items\Content.Summary.Blog.cshtml" />
<Content Include="Views\Items\Content.Summary.BlogPost.cshtml" /> <Content Include="Views\Items\Content.Summary.BlogPost.cshtml" />
<Content Include="Views\Items\Content.SummaryAdmin.Blog.cshtml" /> <Content Include="Views\Items\Content.SummaryAdmin.Blog.cshtml" />
<Content Include="Views\Items\Content.SummaryAdmin.BlogPost.cshtml" />
<Content Include="Web.config" /> <Content Include="Web.config" />
<Content Include="Views\Web.config" /> <Content Include="Views\Web.config" />
</ItemGroup> </ItemGroup>

4
src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
View File

@@ -5,7 +5,7 @@
.widgets-availableWidgets { .widgets-availableWidgets {
float: left; float: left;
width: 35%; width: 30%;
} }
.widgets-availableLayers { .widgets-availableLayers {
@@ -17,7 +17,7 @@
.widgets-layerZones { .widgets-layerZones {
font-size: 1.4em; font-size: 1.4em;
float: left; float: left;
width: 75%; width: 70%;
border: 1px solid #eaeaea; border: 1px solid #eaeaea;
background: #fff; background: #fff;
} }

7
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -715,10 +715,8 @@ table .button {
/* Content item lists /* Content item lists
----------------------------------------------------------*/ ----------------------------------------------------------*/
.contentItems { .contentItems {
border:1px solid #eaeaea;
background:#FFF; background:#FFF;
box-shadow:inset 0 1px 2px #878686;
-moz-box-shadow:inset 0 1px 3px #878686;
-webkit-box-shadow:inset 0 1px 2px #878686;
clear:both; clear:both;
margin:1em 0; margin:1em 0;
padding:0; padding:0;
@@ -729,6 +727,9 @@ table .button {
overflow:hidden; overflow:hidden;
padding:0 1.4em .8em; padding:0 1.4em .8em;
} }
.contentItems li.last {
border-bottom:none;
}
.contentItems.bulk-items li { .contentItems.bulk-items li {
padding-bottom:.6em; padding-bottom:.6em;
padding-left:.6em; padding-left:.6em;