lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-21 10:32:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updating ThemeMachine to work with our new 20 zones.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Michael Dorian Bach
2010-10-14 15:18:56 -07:00
parent 81c77a1901
commit ef4eeae808
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
View File

@@ -159,7 +159,7 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
} }
#layout-header, #layout-main, #layout-footer { #layout-header, #layout-before-main, #layout-main, #layout-footer, #layout-after-main, #layout-tripel {
width:960px; width:960px;
margin:0 auto; margin:0 auto;
} }
@@ -183,11 +183,22 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
color: #434343; color: #434343;
} }
#layout-footer #layout-tripel
{ {
border-top: 1px solid #dbdbdb; border-top: 1px solid #dbdbdb;
} }
#layout-main
{
border-top: 1px solid #dbdbdb;
}
#layout-after-main
{
border-top: 1px solid #dbdbdb;
}
/* Navigation */ /* Navigation */
#layout-navigation #layout-navigation
{ {
@@ -226,6 +237,11 @@ nav ul
line-height:24px; line-height:24px;
} }
#layout-footer
{
border-top: 1px solid #dbdbdb;
}
/* Zones */ /* Zones */
/*.zone { /*.zone {
background-color: yellow; background-color: yellow;
@@ -425,10 +441,16 @@ ul.comments li div.text {
clear:both; clear:both;
} }
.aside.third div > div { #layout-tripel div > div {
float:left; float:left;
width:304px; width:316px;
padding:12px 6px 0 6px; /*padding:12px 6px 0 6px;*/
}
#footer-quad div.zone {
float:left;
width:240px;
/*padding:12px 6px 0 6px;*/
} }
/* Featured Zone - switch to an image */ /* Featured Zone - switch to an image */
@@ -449,7 +471,6 @@ ul.comments li div.text {
margin: 6px; margin: 6px;
} }
.clearfix { .clearfix {
clear:both; clear:both;
} }

2
src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
View File

@@ -4,4 +4,4 @@ Description: It's a *really* good theme, yo.
Version: 0.1 Version: 0.1
Tags: Awesome Tags: Awesome
Website: http://orchardproject.net Website: http://orchardproject.net
Zones: Header, Navigation, Messages, AsideFirst, AsideSecond, AsideThird, Content, Footer Zones: Header, Navigation, Featured, BeforeMain, Messages, BeforeContent, Content, AfterContent, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer, AsideFirst, AsideSecond, AsideThird

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

@@ -31,7 +31,7 @@
<h1 id="branding"><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1> <h1 id="branding"><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
} }
using(Capture(pbo => WorkContext.Layout.Footer.Add(pbo) )) { using(Capture(pbo => WorkContext.Layout.Footer.Add(pbo) )) {
<div class="credits"><span class="poweredby">Powered by Orchard</span> <span class="copyright">&#169; The Theme Machine 2010.</span></div> <div class="credits"><span class="poweredby">Powered by <a href="http://www.orchardproject.net" title="Welcome to the New World Order" target="_blank">Orchard</a></span> <span class="copyright">&#169; The Theme Machine 2010.</span></div>
} }
WorkContext.Layout.Footer.Add(New.User()); WorkContext.Layout.Footer.Add(New.User());
@@ -121,7 +121,7 @@
} }
<div id="layout-footer" class="group"> <div id="layout-footer" class="group">
<footer id="footer"> <footer id="footer">
<div id="footer-quad"> <div id="footer-quad" class="group">
@if (Model.FooterQuadFirst != null) { @if (Model.FooterQuadFirst != null) {
<div id="footer-quad-first"> <div id="footer-quad-first">
@Zone(Model.FooterQuadFirst) @Zone(Model.FooterQuadFirst)