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:
Renaud Paquay
2010-10-07 11:57:23 -07:00
parent 9c6b024205 1e8cd2b2bb
commit 34bbd4a062
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
View File

@@ -55,7 +55,7 @@ header, footer, aside, nav, article {
/* Clearing Float /* Clearing Float
***************************************************************/ ***************************************************************/
group:after { .group:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
@@ -150,6 +150,32 @@ nav ul li a {
/* For testing purposes */ /* For testing purposes */
div, nav, section { #layout-wrapper {
border:1px solid #CCC; border:1px solid #CCC;
}
/* Sidebar off - Content Zone 960 */
#content {
background-color:#e8e8e8;
width: 960px;
clear:both;
}
/* Sidebar on - Content Zone 640 */
.icanhassidebar #content {
background-color:#e8e8e8;
width: 640px;
float:left;
clear:both;
}
.sidebar {
background-color:#f6f6f6;
width: 320px;
float:right;
}
#sitemap {
clear:both;
} }

11
src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
View File

@@ -12,6 +12,7 @@
} }
} }
<div id="layout-wrapper"> <div id="layout-wrapper">
@Display.User()
<header id="layout-header"> <header id="layout-header">
@* needs to be the page title, not page (head) title... *@ @* needs to be the page title, not page (head) title... *@
<h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1> <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
@@ -43,13 +44,13 @@
</div> </div>
} }
@if(Model.Sidebar != null) { @if(Model.Sidebar != null) {
<aside> <aside class="sidebar">
@Zone(Model.Sidebar) @Zone(Model.Sidebar)
</aside> </aside>
} }
@if(Model.Footer != null) {
<footer> <footer id="sitemap">
@Zone(Model.Footer) Powered by Awesomeness...
</footer> </footer>
}
</div> </div>