mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 03:25:23 +08:00
Updated styles to theme machine. Started to override neccessary blog shapes that will eventually make it back to core.
--HG-- branch : dev
This commit is contained in:
Michael Dorian Bach
@@ -216,6 +216,10 @@
|
||||
<Content Include="TheAdmin\Views\Header.cshtml" />
|
||||
<Content Include="TheThemeMachine\Views\Items\Content.Blog.cshtml" />
|
||||
<Content Include="TheThemeMachine\Views\Items_Widget-Content.cshtml" />
|
||||
<Content Include="TheThemeMachine\Views\Items\BlogPost.Summary.cshtml" />
|
||||
<Content Include="TheThemeMachine\Views\Items\BlogPost.cshtml">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
<None Include="TheThemeMachine\Views\Layout.cshtml" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
@@ -63,20 +63,20 @@ header, footer, aside, nav, article { display: block; }
|
||||
***************************************************************/
|
||||
.group:after
|
||||
{
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.zone-asidethird:after
|
||||
{
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
|
||||
@@ -156,7 +156,7 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
|
||||
***************************************************************/
|
||||
#layout-wrapper
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
#layout-header, #layout-before-main, #layout-main, #layout-footer, #layout-after-main, #layout-tripel {
|
||||
@@ -166,46 +166,51 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
|
||||
|
||||
#layout-header
|
||||
{
|
||||
margin: 30px auto;
|
||||
margin: 30px auto;
|
||||
}
|
||||
#branding
|
||||
{
|
||||
font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif;
|
||||
font-size: 3.4em;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
}
|
||||
#branding
|
||||
{
|
||||
font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif;
|
||||
font-size: 3.4em;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
}
|
||||
|
||||
#branding a
|
||||
{
|
||||
text-decoration:none;
|
||||
color: #434343;
|
||||
}
|
||||
#branding a
|
||||
{
|
||||
text-decoration:none;
|
||||
color: #434343;
|
||||
}
|
||||
|
||||
#layout-tripel
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
}
|
||||
|
||||
#layout-before-main
|
||||
{
|
||||
border-bottom: 1px solid #dbdbdb;
|
||||
}
|
||||
|
||||
#layout-main
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
|
||||
}
|
||||
|
||||
#layout-after-main
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* Navigation */
|
||||
#layout-navigation
|
||||
{
|
||||
width: 960px;
|
||||
width: 960px;
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
border-bottom: 1px solid #dbdbdb;
|
||||
border-bottom: 1px solid #dbdbdb;
|
||||
}
|
||||
|
||||
nav ul
|
||||
@@ -213,41 +218,45 @@ nav ul
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
nav ul li
|
||||
{
|
||||
border:1px solid #dbdbdb;
|
||||
background:#f6f6f6;
|
||||
display:block;
|
||||
float:left;
|
||||
margin:0 2px -1px 0;
|
||||
}
|
||||
nav ul li.current
|
||||
{
|
||||
border-bottom: 1px solid #fff;
|
||||
background:#fff;
|
||||
}
|
||||
nav ul a
|
||||
{
|
||||
padding:0 18px;
|
||||
display:block;
|
||||
float:left;
|
||||
color: #333;
|
||||
font-size:1.4em;
|
||||
text-decoration:none;
|
||||
line-height:24px;
|
||||
}
|
||||
nav ul li
|
||||
{
|
||||
border:1px solid #dbdbdb;
|
||||
background:#f6f6f6;
|
||||
display:block;
|
||||
float:left;
|
||||
margin:0 2px -1px 0;
|
||||
}
|
||||
nav ul li.current
|
||||
{
|
||||
border-bottom: 1px solid #fff;
|
||||
background:#fff;
|
||||
}
|
||||
nav ul a
|
||||
{
|
||||
padding:0 18px;
|
||||
display:block;
|
||||
float:left;
|
||||
color: #333;
|
||||
font-size:1.4em;
|
||||
text-decoration:none;
|
||||
line-height:24px;
|
||||
}
|
||||
|
||||
#layout-footer
|
||||
{
|
||||
border-top: 1px solid #dbdbdb;
|
||||
border-top: 1px solid #dbdbdb;
|
||||
}
|
||||
#footer-sig
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/* Zones */
|
||||
/*.zone {
|
||||
background-color: yellow;
|
||||
box-shadow:inset 0 0 1px red;
|
||||
-moz-box-shadow:inset 0 0 1px red;
|
||||
-webkit-box-shadow:inset 0 0 1px red;
|
||||
background-color: yellow;
|
||||
box-shadow:inset 0 0 1px red;
|
||||
-moz-box-shadow:inset 0 0 1px red;
|
||||
-webkit-box-shadow:inset 0 0 1px red;
|
||||
} Used for visualizing zones */
|
||||
.zone-header { }
|
||||
.zone-footer { padding: 24px 0 12px 0px; float: left; font-size: 1.3em; color: #999999; }
|
||||
@@ -267,7 +276,7 @@ nav ul
|
||||
|
||||
.has-aside .aside-second
|
||||
{
|
||||
width: 360px;
|
||||
width: 360px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
@@ -282,13 +291,18 @@ nav ul
|
||||
}
|
||||
.has-asides .aside-first, .has-asides .aside-second
|
||||
{
|
||||
width: 180px;
|
||||
width: 180px;
|
||||
}
|
||||
.has-asides .aside-first, .has-asides .aside-second, .has-asides #layout-content
|
||||
{
|
||||
float:left;
|
||||
float:left;
|
||||
}
|
||||
|
||||
/* Blogs */
|
||||
|
||||
.blog-post {}
|
||||
.blog-post-title {}
|
||||
.meta {}
|
||||
|
||||
|
||||
/* Secondary
|
||||
@@ -305,45 +319,45 @@ legend { font-weight: 600; font-size:1.2em; }
|
||||
|
||||
|
||||
input[type="text"], #CommentText, #password, #confirmPassword {
|
||||
border:1px solid #999;
|
||||
display: block;
|
||||
padding:6px;
|
||||
width:50%;
|
||||
border:1px solid #999;
|
||||
display: block;
|
||||
padding:6px;
|
||||
width:50%;
|
||||
}
|
||||
|
||||
form.search {
|
||||
margin-bottom:2em;
|
||||
margin-bottom:2em;
|
||||
}
|
||||
|
||||
.search input[type=text] {
|
||||
display:inline;
|
||||
width:17em;
|
||||
display:inline;
|
||||
width:17em;
|
||||
}
|
||||
|
||||
fieldset div {margin:1.6em 0 0 0}
|
||||
|
||||
|
||||
legend {
|
||||
font-size: 1.4em;
|
||||
border:none;
|
||||
}
|
||||
|
||||
label {
|
||||
font-size: 1.3em;
|
||||
margin:0 0 .3em 0;
|
||||
}
|
||||
font-size: 1.3em;
|
||||
margin:0 0 .3em 0;
|
||||
}
|
||||
|
||||
input[type="checkbox"] {
|
||||
margin:.2em 0 1.2em 0;
|
||||
margin:.2em 0 1.2em 0;
|
||||
}
|
||||
|
||||
input[type="submit"], input[type="button"], button, .button, .button:link, .button:visited {
|
||||
color:#333;
|
||||
background:#F5F5F5;
|
||||
background:#F5F5F5;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb));
|
||||
background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb);
|
||||
border:1px solid #999;
|
||||
cursor:pointer;
|
||||
margin:.2em 0 2em 0;
|
||||
margin:.2em 0 2em 0;
|
||||
padding:.3em 1.8em;
|
||||
text-align:center;
|
||||
}
|
||||
@@ -354,9 +368,9 @@ input[type="submit"]:focus, input[type="button"]:focus,
|
||||
button:hover, .button:hover,
|
||||
button:active, .button:active,
|
||||
button:focus, .button:focus {
|
||||
text-decoration:none;
|
||||
background: #ebebeb;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb));
|
||||
text-decoration:none;
|
||||
background: #ebebeb;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb));
|
||||
background:-moz-linear-gradient(top , #e1e1e1, #ebebeb);
|
||||
}
|
||||
|
||||
@@ -401,74 +415,74 @@ button:focus, .button:focus {
|
||||
|
||||
/* For testing purposes */
|
||||
#comments {
|
||||
font-size:1.6em;
|
||||
font-weight:600;
|
||||
margin:1.2em 0 1.8em 1.2em;
|
||||
font-size:1.6em;
|
||||
font-weight:600;
|
||||
margin:1.2em 0 1.8em 1.2em;
|
||||
}
|
||||
|
||||
ul.comments, form.comment {
|
||||
margin:1.2em 0 1.2em 1.8em;
|
||||
margin:1.2em 0 1.2em 1.8em;
|
||||
}
|
||||
|
||||
div.comment {
|
||||
font-size:1.3em;
|
||||
font-style:italic;
|
||||
color:#484848;
|
||||
font-size:1.3em;
|
||||
font-style:italic;
|
||||
color:#484848;
|
||||
}
|
||||
|
||||
div.comment a {
|
||||
color:#484848;
|
||||
text-decoration:none;
|
||||
color:#484848;
|
||||
text-decoration:none;
|
||||
}
|
||||
|
||||
div.comment span.who {
|
||||
font-weight:600;
|
||||
font-style:normal;
|
||||
text-transform:capitalize;
|
||||
color:#333;
|
||||
font-weight:600;
|
||||
font-style:normal;
|
||||
text-transform:capitalize;
|
||||
color:#333;
|
||||
}
|
||||
|
||||
ul.comments li div.text {
|
||||
margin:.6em 0 2.4em 0;
|
||||
margin:.6em 0 2.4em 0;
|
||||
}
|
||||
|
||||
.user-display {
|
||||
display:inline;
|
||||
display:inline;
|
||||
}
|
||||
|
||||
.aside.third {
|
||||
border-top:1px solid #dbdbdb;
|
||||
clear:both;
|
||||
border-top:1px solid #dbdbdb;
|
||||
clear:both;
|
||||
}
|
||||
|
||||
#layout-tripel div > div {
|
||||
float:left;
|
||||
width:316px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
float:left;
|
||||
width:316px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
}
|
||||
|
||||
#footer-quad div.zone {
|
||||
float:left;
|
||||
width:240px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
float:left;
|
||||
width:240px;
|
||||
/*padding:12px 6px 0 6px;*/
|
||||
}
|
||||
|
||||
/* Featured Zone - switch to an image */
|
||||
|
||||
.featuredimage {
|
||||
float:left;
|
||||
border: 1px solid #dbdbdb;
|
||||
width: 462px;
|
||||
height: 240px;
|
||||
margin: 6px;
|
||||
float:left;
|
||||
border: 1px solid #dbdbdb;
|
||||
width: 462px;
|
||||
height: 240px;
|
||||
margin: 6px;
|
||||
}
|
||||
|
||||
/* Recent Zone */
|
||||
|
||||
#zone-recent ul li {
|
||||
float:left;
|
||||
width: 462px;
|
||||
margin: 6px;
|
||||
float:left;
|
||||
width: 462px;
|
||||
margin: 6px;
|
||||
}
|
||||
|
||||
.clearfix {
|
||||
@@ -476,25 +490,25 @@ ul.comments li div.text {
|
||||
}
|
||||
|
||||
#footer div {
|
||||
/*border:1px solid #ff0000;*/
|
||||
/*border:1px solid #ff0000;*/
|
||||
}
|
||||
|
||||
/* If zones 1 and 2 are empty in the quad */
|
||||
|
||||
.split-left #footer-quad-third div.zone {
|
||||
width:600px;
|
||||
width:600px;
|
||||
}
|
||||
|
||||
.split-left #footer-quad-fourth div.zone {
|
||||
width:360px;
|
||||
width:360px;
|
||||
}
|
||||
|
||||
/* If zones 3 and 4 are empty in the quad */
|
||||
|
||||
.split-right #footer-quad-first div.zone {
|
||||
width:600px;
|
||||
width:600px;
|
||||
}
|
||||
|
||||
.split-right #footer-quad-second div.zone {
|
||||
width:360px;
|
||||
width:360px;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
@using Orchard.Blogs.Extensions;
|
||||
@using Orchard.Blogs.Models;
|
||||
@using Orchard.Core.Common.Extensions;
|
||||
@using Orchard.Core.Common.Models;
|
||||
@using Orchard.Core.Common.ViewModels;
|
||||
|
||||
<h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
|
||||
|
||||
<!-- TODO: Meta should be it's own shape and not part of the blog summary view. Theme authors will need access to it. -->
|
||||
<div class="meta">
|
||||
@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T)
|
||||
@Display(Model.meta)
|
||||
</div>
|
||||
|
||||
<div class="content">@Display(Model.Content)</div>
|
||||
@@ -0,0 +1,11 @@
|
||||
<div class="blog-post @Display(Model.Slug)">
|
||||
<h1 class="blog-post-title">@Html.TitleForPage((string)Model.Title)</h1>
|
||||
@if (Model.Meta != null) {
|
||||
<div class="meta">
|
||||
@Display(Model.Meta)
|
||||
</div>
|
||||
}
|
||||
<div class="content">
|
||||
@Display(Model.Content)
|
||||
</div>
|
||||
</div>
|
||||
@@ -4,7 +4,7 @@
|
||||
RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
|
||||
RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });
|
||||
}
|
||||
<h1>@Html.TitleForPage((string)Model.Title)</h1>
|
||||
<h1>TOO CRAZY @Html.TitleForPage((string)Model.Title)</h1>
|
||||
@Display(Model.manage)
|
||||
@Display(Model.metadata)
|
||||
@Display(Model.Primary)
|
||||
Reference in New Issue
Block a user