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

More updates to the CSS for the new theme.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Jonathan Wall
2010-10-11 15:03:07 -07:00
parent 6f72d040b3
commit 71d3c9c32a
2 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,31 +132,40 @@ p, .meta {
/* Sidebar off - Content Zone 960 */ /* Sidebar off - Content Zone 960 */
#content { #content {
clear:both; /*clear:both;
/*padding:12px;*/ padding:12px;*/
} }
/*Right Sidebar on - Content Zone 600 */ /*One Sidebar on */
.has-sidebar #content { .has-sidebar #content {
background-color:#e8e8e8; background-color:#e8e8e8;
width: 600px; width: 600px;
/*padding:12px 6px 6px 12px;*/ /*padding:12px 6px 6px 12px;*/
float:left; float:left;
clear:both; /*clear:both;*/
} }
/*Left Sidebar on - Content Zone 600 .has-sidebar .sidebar {
.has-sidebar #content {
float:right;
}*/
.sidebar {
background-color:#f6f6f6; background-color:#f6f6f6;
width: 360px; width: 360px;
float:right; float:right;
} }
/*Two Sidebars on */
.has-sidebars #content {
background-color:#e8e8e8;
width: 600px;
}
.has-sidebars .sidebar {
background-color:#f6f6f6;
width: 180px;
}
.has-sidebars .primary, .has-sidebars .secondary, .has-sidebars #content {
float:left;
}
#sitemap { #sitemap {
clear:both; clear:both;
} }
@@ -166,37 +175,37 @@ p, .meta {
#navigation { #navigation {
width: 960px; width: 960px;
margin: 4px auto; margin: 4px auto;
display:block; display:block;
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
} }
nav ul { nav ul {
padding: 0 0 0 8px; padding: 0 0 0 8px;
} }
nav ul li nav ul li
{ {
border:1px solid #999; border:1px solid #999;
background:#e7e7e7; background:#e7e7e7;
display:block; display:block;
float:left; float:left;
margin:0 2px -1px 0; margin:0 2px -1px 0;
} }
nav ul li.on { nav ul li.on {
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
background:#fff; background:#fff;
} }
nav ul a { nav ul a {
padding:0 18px; padding:0 18px;
display:block; display:block;
float:left; float:left;
font-size:1.4em; font-size:1.4em;
text-decoration:none; text-decoration:none;
line-height:24px; line-height:24px;
} }
#footer {} #footer {}
@@ -288,6 +297,6 @@ form.inline p { margin-bottom:0; }
} }
.clearfix { .clearfix {
clear:both; clear:both;
} }

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

@@ -7,9 +7,21 @@
// Zone is an alias for Display // Zone is an alias for Display
Func<dynamic, dynamic> Zone = x => Display(x); Func<dynamic, dynamic> Zone = x => Display(x);
if (Model.Sidebar != null) {
if (Model.Sidebar != null && Model.Sidebar2 == null) {
Model.Classes.Add("has-sidebar"); Model.Classes.Add("has-sidebar");
} }
else if (Model.Sidebar == null && Model.Sidebar2 != null) {
Model.Classes.Add("has-sidebar-left");
}
else if (Model.Sidebar != null && Model.Sidebar2 != null) {
Model.Classes.Add("has-sidebars");
}
else {
}
//Model.Attributes.Add("onclick", "javscript:alert('woot')"); //Model.Attributes.Add("onclick", "javscript:alert('woot')");
@@ -73,10 +85,9 @@
</div> </div>
} }
@{WorkContext.Layout.Sidebar1.Add("just some text in featured");} @if(Model.Sidebar2 != null) {
@if(Model.Sidebar1 != null) { <aside class="sidebar secondary">
<aside class="sidebar"> @Zone(Model.Sidebar2)
@Zone(Model.Sidebar1)
</aside> </aside>
} }
@@ -86,14 +97,10 @@
@Zone(Model.Content) @Zone(Model.Content)
</div> </div>
} }
else {
<div id="content" class="group">
Let's take over the home page
</div>
}
@if(Model.Sidebar != null) { @if(Model.Sidebar != null) {
<aside class="sidebar"> <aside class="sidebar primary">
@Zone(Model.Sidebar) @Zone(Model.Sidebar)
</aside> </aside>
} }