diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index 07ddc30c2..786701719 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -487,14 +487,53 @@ article.comment p.text { /*border:1px solid #ff0000;*/ } -/* If zone 1 is empty and 2, 3, 4 are not */ + +/* Quad */ +/*1 zone on */ + +/* If zone 1 is on */ +.split-1 #footer-quad-first div.zone { width:960px; } + +/* If zone 2 is on */ +.split-2 #footer-quad-second div.zone { width:960px; } + +/* If zone 3 is on */ +.split-3 #footer-quad-third div.zone { width:960px; } + +/* If zone 4 is on */ +.split-4 #footer-quad-fourth div.zone { width:960px; } + + +/*2 zones on */ + +/* If zones 1, 2 are on */ +.split-12 #footer-quad-first div.zone, .split-12 #footer-quad-second div.zone { width:480px; } + +/* If zones 1, 3 are on */ +.split-13 #footer-quad-first div.zone, .split-13 #footer-quad-third div.zone { width:480px; } + +/* If zones 1, 4 are on */ +.split-14 #footer-quad-first div.zone, .split-14 #footer-quad-fourth div.zone { width:480px; } + +/* If zones 2, 3 are on */ +.split-23 #footer-quad-second div.zone, .split-23 #footer-quad-third div.zone { width:480px; } + +/* If zones 2, 4 are on */ +.split-24 #footer-quad-second div.zone, .split-24 #footer-quad-fourth div.zone { width:480px; } + +/* If zones 3, 4 are on */ +.split-34 #footer-quad-third div.zone, .split-34 #footer-quad-fourth div.zone { width:480px; } + +/*3 zones on */ + +/* If zones 2, 3, 4 are on */ .split-234 #footer-quad-second div.zone { width:480px; } -/* If zone 2 is empty and 1, 3, 4 are not */ +/* If zones 1, 3, 4 are on */ .split-134 #footer-quad-first div.zone { width:480px; } -/* If zone 3 is empty and 1, 2, 4 are not */ +/* If zones 1, 2, 4 are on */ .split-124 #footer-quad-fourth div.zone { width:480px; } -/* If zone 4 is empty and 1, 2, 3 are not */ +/* If zones 1, 2, 3 are on */ .split-123 #footer-quad-third div.zone { width:480px; } \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt index 905809199..12f3ec41d 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt +++ b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt @@ -4,4 +4,4 @@ Description: It's a *really* good theme, yo. Version: 0.1 Tags: Awesome Website: http://orchardproject.net -Zones: Header, Navigation, Featured, BeforeMain, Messages, BeforeContent, Content, AfterContent, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer, AsideFirst, AsideSecond, AsideThird \ No newline at end of file +Zones: Header, Navigation, Featured, BeforeMain, Messages, BeforeContent, Content, AfterContent, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer, AsideFirst, AsideSecond \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml index 698790fc1..2462c24bf 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml @@ -47,10 +47,6 @@ Model.Classes.Add(footerQuadClass); } - @*debug: *@ - @*tripelClass:@tripelClass*@ - @*footerQuadClass:@footerQuadClass*@ - Model.Id = "layout-wrapper"; var tag = Tag (Model, "div");