lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updated the classic theme.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Jonathan Wall
2010-03-01 11:29:35 -08:00
parent 4487940e60
commit 287442135a
9 changed files with 194 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -172,6 +172,7 @@
<Content Include="Themes\Classic\Theme.txt" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Pages.Page.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />

38
src/Orchard.Web/Themes/Classic/Styles/blog.css
View File

@@ -1,31 +1,21 @@
/*Blog specific styles
----------------------------------------------------------*/
.posted {
margin: 8px 0;
font-size:105%;
font-weight:600;
h3.blogs, h3.blog {
display:block;
border-bottom:1px solid #f1f1f1;
}
.meta, .manage {
font-size:105%;
float:right;
margin:-23px 0 0 0;
}
.blogdescription, .postsummary {
ul.blogs p {
clear:both;
}
div.comment {
margin: 16px 0 8px 0;
}
span.who {
font-weight:600;
font-size:105%;
}
.text {
border-bottom:1px dotted #e5e5e5;
}
.post {
margin: -8px 0 12px 0px;
}
.meta {
font-style:italic;
color:#666666;
}

216
src/Orchard.Web/Themes/Classic/Styles/site.css
View File

@@ -20,29 +20,31 @@ html {height: 100%;}
body {
font: normal 90% "Georgia", Times New Roman, Times, serif;
background:url(../Content/Images/bodyBackgroundgrey.gif) top left repeat-x #e5e5e5;
height: 100%;
text-align:left;
color:#333;
color:#373737;
background:#fdfdfd;
/*background:#E5E5E5 url(../Content/Images/bodyBackgroundgrey.gif) repeat-x scroll left top;*/
}
/* ---------- Headings and defaults ---------- */
h1,h2,h3,h4,h5,h6, legend {font-weight:normal; font-style: normal; color:#670404; border-bottom:1px dotted #e5e5e5;}
h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal; margin:12px 0 4px 0;}
h1 {font-size: 190%;}
h1 {font-size: 180%;}
h2 {font-size: 160%;}
h3 {font-size: 150%;}
h3 {font-size: 145%;}
h4 {font-size: 130%;}
h5 {font-size: 120%;}
h6 {font-size: 105%;}
h1.sitename {border-bottom:none;}
p {line-height:24px; margin:12px 0 32px 0;}
p.small {line-height:22px; font-size:85%;}
p.small {line-height:24px; font-size:85%;}
a {
color:#004386;
color:#05325f;
text-decoration:none;
}
@@ -53,17 +55,17 @@ ol.decimal {list-style:decimal; list-style-position:inside; line-height:24px; ma
/* Forms
----------------------------------------------------------*/
input[type="text"], #CommentText, #password {
border:1px solid #DDDEDF;
input[type="text"], #CommentText, #password, #confirmPassword {
border:1px solid #cacec6;
display: block;
}
fieldset {margin: 20px 0;}
padding:2px;
width:90%;
}
fieldset div {margin:16px 0 0 0}
legend {
font-size: 105%;
font-size: 110%;
border:none;
}
@@ -72,18 +74,12 @@ label {
margin:0 0 2px 0;
}
input[type="text"], #CommentText, #password {
border-color:#cacec6;
padding:2px;
width:90%;
}
input[type="checkbox"] {
margin:2px 0 20px 10px;
}
input[type="submit"], input[type="button"], .button {
font:90% Verdana, Geneva, Tahoma, sans-serif;
font: normal 90% "Georgia", Times New Roman, Times, serif;
color:#333;
padding:2px 14px;
display: block;
@@ -97,112 +93,182 @@ input[type="submit"], input[type="button"], .button {
}
/* Tables
----------------------------------------------------------*/
table {
background:#fff;
border:1px solid #f1f1f1;
border-collapse:collapse;
width:100%;
}
table thead, table th {
overflow:hidden;
text-align:left;
}
table th {
font:70% Verdana, Geneva, Tahoma, sans-serif;
background-color:#69625e;
color:#f1f1f1;
}
table caption {
padding:8px 0;
text-indent:0;
}
table col {
display:table-column;
}
table colgroup {
display:table-column-group;
}
table tbody {
vertical-align:middle;
}
th, td {
font:70% Verdana, Geneva, Tahoma, sans-serif;
padding:6px
}
td.even {
background-color:#f1f1f1;
}
/* ---------- Layout ---------- */
#headercontainer {
border:2px solid #69625e;
border-left:0;
border-right:0;
margin:0 auto;
width:930px;
}
#header {
margin:0 38px 0 40px;
height:75px;
border-bottom:1px #d6d6d6 solid;
}
border:1px solid #69625e;
border-left:0;
border-right:0;
margin:3px 0 3px 0;
}
#header h1{
#header h1 {
font-size:240%;
color:#333;
border:0;
margin:12px 18px;
float:left;
font-size:220%;
color:#000;
padding:42px 0 0 0;
border-bottom:none;
}
#logindisplay {
float:right;
margin:58px 8px 0 0;
font:80%;
margin:12px auto;
text-align:right;
width: 930px;
}
#wrapper {
width:985px;
height:100%;
display:block;
margin:0em auto;
background:url(../Content/Images/mainBackgroundgrey.png) no-repeat center top;
background:#fff;
border:1px solid #f1f1f1;
}
#main {
clear:both;
margin:32px 0 0 27px;
margin:0 0 0 27px;
width:930px;
border:1px #f5f5f5 solid;
border-top:none;
background:url(../Content/Images/sidebarBackground.gif) no-repeat right top #fff;
}
#content {
float:left;
margin:0 0 0 27px;
margin:26px 0 0 27px;
width:520px;
min-height:555px;
}
#sidebar {
float:right;
margin:4px 12px 0 0;
margin:28px 0 0 0;
width:325px;
}
#sidebar h3 {
border-bottom:1px dotted #e5e5e5;
border-bottom:1px solid #f1f1f1;
font-size: 130%;
}
#content ul,#sideBar1 ul {
list-style:none;
line-height:normal;
#footercontainer {
clear:both;
border:2px solid #69625e;
width:930px;
background:#69625e;
margin:18px 0;
}
#footer {
color:#918e8e;
clear:both;
border-top:1px solid #d6d6d6;
margin:0 12px;
padding:18px 0 18px 8px;
border:1px solid #fff;
margin:3px;
}
#footer a{
color:#918e8e;
margin:0 8px;
text-transform:uppercase;
color:#fff;
}
/* ---------- Navigation ---------- */
#menucontainer {
width:960px;
.menucontainer {
display:block;
height:35px;
margin:0em auto;
}
#menucontainer ul, #footer ul {
list-style:none;
float:right;
margin:18px 0;
}
#menucontainer ul li {
.menucontainer ul, #footer ul {
list-style:none
}
.menucontainer ul li {
margin:8px 0 0 0;
float:left;
background:url(../Content/Images/navDivider.gif) no-repeat top right;
}
#menucontainer ul li.last {
background:none;
}
#menucontainer ul li a {
margin:0 18px 0 18px;
font-size:110%;
display:block;
text-decoration:none;
float:left;
color:#fff;
}
.menucontainer ul li a {
margin:0 18px 0 18px;
display:block;
text-decoration:none;
text-transform:uppercase;
float:left;
}
#footer .menucontainer {
font-size:80%;
float:left;
margin:0px;
}
#footer .menucontainer ul li {
margin:12px 0;
}
/* ---------- Tags and Comments ---------- */
.tags, .comment {
font-style:italic;
color:#666666;
}
/* ---------- Generic ---------- */
.clearBoth {
clear:both;
}

BIN
src/Orchard.Web/Themes/Classic/Theme.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 33 KiB

2
src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
<h2><%=Html.TitleForPage(Model.Item.Name) %></h2>
<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("Edit") %></a></div>
<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
<% Html.Zone("primary");

2
src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
View File

@@ -4,6 +4,6 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<h3><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug)) %></h3>
<h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug)) %></h2>
<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
<div class="postsummary"><%=Model.Item.As<BodyAspect>().Text ?? string.Format("<p><em>{0}</em></p>", _Encoded("there's no content for this blog post"))%></div>

12
src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx Normal file
View File

@@ -0,0 +1,12 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
<div class="metadata">
<% if (Model.Item.Creator != null) {
%><div class="posted"><%=_Encoded("Posted by {0} {1}", Model.Item.Creator.UserName, Html.PublishedWhen(Model.Item)) %> | <a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Id) %>" class="ibutton edit"><%=_Encoded("Edit") %></a></div><%
} %>
</div>
<% Html.Zone("primary");
Html.ZonesAny(); %>

9
src/Orchard.Web/Themes/Classic/Views/Footer.ascx
View File

@@ -1,5 +1,10 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<div id="footercontainer">
<div id="footer">
<a href="/">Link 1</a> | <a href="/">Link 2</a> | <a href="/">Link 3</a> | <a href="/">Link 4</a>
</div>
<div class="menucontainer">
<% Html.Include("menu"); %>
</div>
<div class="clearBoth"></div>
</div>
</div>

27
src/Orchard.Web/Themes/Classic/Views/Layout.ascx
View File

@@ -5,21 +5,28 @@
Html.RegisterStyle("site.css");
Html.RegisterStyle("blog.css");
%>
<%--Top Navigation--%>
<%-- todo:(nheskew) this will need to be a generated menu --%>
<% Html.Include("menu"); %>
<div id="wrapper">
<%--HTML.Include will render a div with an id="logindisplay" --%>
<% Html.Include("User"); %>
<%--Top Navigation and branding--%>
<div id="headercontainer">
<div id="header">
<h1><%=Html.Encode(Html.SiteName()) %></h1>
<%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
<% Html.Include("User"); %>
<h1><%=Html.Encode(Html.SiteName()) %></h1>
<div class="menucontainer">
<% Html.Include("menu"); %>
</div>
<div class="clearBoth"></div>
</div>
<div id="main">
</div>
<div id="main">
<div id="content">
<%--Main Content--%>
<%Html.ZoneBody("content");%>
<%--Main Content--%>
<%Html.ZoneBody("content");%>
</div>
<div id="sidebar">
<ul>