From e25a36d1ccf211065da0e42e4ae696cf7ac4105b Mon Sep 17 00:00:00 2001 From: jowall Date: Sat, 16 Jan 2010 00:13:24 +0000 Subject: [PATCH] Updated green theme CSS and added comment bubbles. --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045499 --- .../Themes/Classic/Styles/site.css | 1 - .../Green/Content/Images/commentpointer.gif | Bin 0 -> 97 bytes src/Orchard.Web/Themes/Green/Styles/blog.css | 30 +++++++++++++++--- src/Orchard.Web/Themes/Green/Styles/site.css | 6 ++-- .../DisplayTemplates/Items/Blogs.Blog.ascx | 1 - .../Themes/Green/Views/ListOfComments.ascx | 17 ++++++++++ 6 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 src/Orchard.Web/Themes/Green/Content/Images/commentpointer.gif create mode 100644 src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css index acc1d6ba0..d6da316c7 100644 --- a/src/Orchard.Web/Themes/Classic/Styles/site.css +++ b/src/Orchard.Web/Themes/Classic/Styles/site.css @@ -110,7 +110,6 @@ input[type="submit"], input[type="button"], .button { float:left; font-size:220%; color:#000; - /*padding:16px 0 0 0;*/ padding:42px 0 0 0; border-bottom:none; } diff --git a/src/Orchard.Web/Themes/Green/Content/Images/commentpointer.gif b/src/Orchard.Web/Themes/Green/Content/Images/commentpointer.gif new file mode 100644 index 0000000000000000000000000000000000000000..d6874be3e69680c1b3c5d5bef814bd1087cc2cc6 GIT binary patch literal 97 zcmZ?wbhEHblw{y%n8?iV;L+Vv=Z^gc1I3>#j0_CS3_1)z0Fq~5GV1ADS#I{<`ZD^)v6JQd7Msf({b@KT`?1646BmOu05;(!wg3PC literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Themes/Green/Styles/blog.css b/src/Orchard.Web/Themes/Green/Styles/blog.css index 84a9206ec..89d8f5631 100644 --- a/src/Orchard.Web/Themes/Green/Styles/blog.css +++ b/src/Orchard.Web/Themes/Green/Styles/blog.css @@ -1,7 +1,7 @@ /*Blog specific styles ----------------------------------------------------------*/ -.posted, div.comment { +.posted { margin: 0 0 8px 0; } @@ -23,12 +23,32 @@ } .comments li { - margin:20px 20px 20px 10px; + margin:0 10px 0 0; padding:8px; - border-bottom:1px solid #eef2ed; - } + div.comment { + padding:8px 8px 8px 16px; + color: #000; + min-width:200px; + background:#fff; + border:1px solid #CACEC6; + -moz-border-radius:6px; + -webkit-border-radius:6px; +} + +.commentauthor { + background-position: 20px 0px; + padding: 16px 0 0 8px; + margin: 0 0 10px 0; + background: url(../Content/Images/commentpointer.gif) no-repeat; + position:relative; + top:-1px; + left:10px; +} + span.who { font-weight:700; - } \ No newline at end of file + } + + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css index 41b351f5c..6eb487370 100644 --- a/src/Orchard.Web/Themes/Green/Styles/site.css +++ b/src/Orchard.Web/Themes/Green/Styles/site.css @@ -31,7 +31,7 @@ h6 {font-size: 123.1%;} /*16px*/ /* Paragraphs and lists */ -p {line-height:20px; padding:12px 0px;} +p {line-height:24px; padding:12px;} .small {font-size: 96%;} strong {font-weight:700;} @@ -67,7 +67,7 @@ input[type="text"], textarea, #password { fieldset { margin: 20px 20px 20px 10px; - border:1px solid #eef2ed; + border:1px solid #CACEC6; -moz-border-radius:6px; -webkit-border-radius:6px; } @@ -224,7 +224,7 @@ colgroup } #subcolumn ul { - border:1px solid #eef2ed; + border:1px solid #CACEC6; -webkit-border-radius: 6px; -moz-border-radius: 6px; padding:8px; diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx index deda717df..4111fe8b9 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -13,7 +13,6 @@ - <% Html.Zone("primary"); Html.ZonesAny(); %> diff --git a/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx b/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx new file mode 100644 index 000000000..95a1b3a1d --- /dev/null +++ b/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx @@ -0,0 +1,17 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.Comments.Models"%> +
    <% +foreach (var comment in Model) { %> +
  • + +
    +

    <%=Html.Encode(comment.CommentText) %>

    +
    + +
    +<%=Html.LinkOrDefault(Html.Encode(comment.UserName), Html.Encode(comment.SiteName), new { rel = "nofollow" })%> said <%=Html.Link(Html.DateTimeRelative(comment.CommentDate), "#")%> +
    + +
  • <% +} %> +