diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index 786701719..290969054 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -444,16 +444,12 @@ article.comment p.text { display:inline; } -.aside.third { +/*.aside.third { border-top:1px solid #dbdbdb; clear:both; -} +}*/ + -#layout-tripel div > div { - float:left; - width:316px; - /*padding:12px 6px 0 6px;*/ -} #footer-quad div.zone { float:left; @@ -487,6 +483,39 @@ article.comment p.text { /*border:1px solid #ff0000;*/ } +/* Tripel */ + +#layout-tripel div { + float:left; + /*padding:12px 6px 0 6px;*/ +} + +/*1 zone on */ +.tripel-1 #tripel-first { width:960px; } + +/*2 zone on */ +.tripel-2 #tripel-second { width:960px; } + +/*3 zone on */ +.tripel-3 #tripel-third { width:960px; } + +/*2 zones on */ + +/* If zones 1, 2 are on */ +.tripel-12 #tripel-first, .tripel-12 #tripel-second { width:480px; } + +/* If zones 2, 3 are on */ +.tripel-23 #tripel-second, .tripel-23 #tripel-third { width:480px; } + +/* If zones 1, 3 are on */ +.tripel-13 #tripel-first, .tripel-13 #tripel-third { width:480px; } + +/*3 zones on */ + +/* If zones 1, 2, 3 are on */ +.tripel-123 #tripel-first, .tripel-123 #tripel-second, .tripel-123 #tripel-third { width:320px; } + + /* Quad */ /*1 zone on */ diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml index 2462c24bf..4fbc20ecf 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml @@ -47,6 +47,10 @@ Model.Classes.Add(footerQuadClass); } + debug: +tripelClass:@tripelClass
+footerQuadClass:@footerQuadClass + Model.Id = "layout-wrapper"; var tag = Tag (Model, "div");