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

Updated classic theme css. Added temporary inline style to installed modules page.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Jonathan Wall
2010-05-19 16:09:20 -07:00
parent d085161054
commit 15c2b46aee
4 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
View File

@@ -13,11 +13,11 @@
<div class="summary"> <div class="summary">
<div class="properties"> <div class="properties">
<h3><%=Html.Encode(module.DisplayName) %></h3> <h3><%=Html.Encode(module.DisplayName) %></h3>
<ul class="pageStatus" style="color:#666"> <ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
<li><%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></li> <li><%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></li>
<li>&nbsp;&#124;&nbsp;<%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(Html.Encode(f.Name), string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %></li> <li>&nbsp;&#124;&nbsp;<%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(Html.Encode(f.Name), string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %></li>
<li>&nbsp;&#124;&nbsp;<%=T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? Html.Encode(module.Author) : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%> <li>&nbsp;&#124;&nbsp;<%=T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? Html.Encode(module.Author) : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
<li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li> <li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li>
</ul> </ul>
</div> </div>
</div><% </div><%
@@ -27,5 +27,7 @@
</li><% </li><%
} %> } %>
</ul> </ul>
</fieldset><% </fieldset><%
} %> } %>

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

@@ -200,6 +200,7 @@
<Content Include="Themes\ClassicDark\Views\ZoneTest.ascx" /> <Content Include="Themes\ClassicDark\Views\ZoneTest.ascx" />
<Content Include="Themes\ClassicDark\Zones\Sidebar.html" /> <Content Include="Themes\ClassicDark\Zones\Sidebar.html" />
<Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" /> <Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
<Content Include="Themes\Classic\Views\Content\Images\sidebarBackground.gif" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" /> <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
<Content Include="Themes\Classic\Zones\Sidebar.html" /> <Content Include="Themes\Classic\Zones\Sidebar.html" />
<Content Include="Themes\Classic\Styles\blog.css" /> <Content Include="Themes\Classic\Styles\blog.css" />

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

@@ -15,17 +15,19 @@ ul.blogs p {
} }
.postsummary { .postsummary {
border-bottom:1px dotted #f1f1f1; padding: 0 0 4px 0;
border-bottom:1px dotted #666;
} }
.meta { .meta {
font-size:1.5em;
font-style:italic; font-style:italic;
color:#666666; color:#666666;
} }
.tagCloud { .tagCloud {
font-style:italic; font-style:italic;
font-size:120%; font-size:1.8em;
} }
.tagCloud li { .tagCloud li {
@@ -39,5 +41,14 @@ ul.blogs p {
} }
ul.archiveMonthList li { ul.archiveMonthList li {
font-size:1.5em;
padding:8px; padding:8px;
}
.comment span {
font-size:1.4em;
}
.text p {
margin:0 0 1.4em 0;
} }

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

@@ -19,30 +19,28 @@ abbr,acronym { border:0;}
html {height: 100%;} html {height: 100%;}
body { body {
font: normal 90% "Georgia", Times New Roman, Times, serif; font: normal 62.5% "Georgia", Times New Roman, Times, serif; /* 62.5% sets font to 10px */
height: 100%; height: 100%;
text-align:left; text-align:left;
color:#373737; color:#373737;
background:#fdfdfd;
background:#f7f7f7; background:#f7f7f7;
/*background:#E5E5E5 url(../Content/Images/bodyBackgroundgrey.gif) repeat-x scroll left top;*/
} }
/* ---------- Headings and defaults ---------- */ /* ---------- Headings and defaults ---------- */
h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal; margin:12px 0 4px 0;} h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal; margin:.2em 0;}
h1 {font-size: 180%;} h1 { font-size:2.6em; } /* 26px */
h2 {font-size: 160%;} h2 { font-size:2.4em; } /* 24px */
h3 {font-size: 145%;} h3 { font-size:2.2em; } /* 22px */
h4 {font-size: 130%;} h4 { font-size:2.0em; } /* 20px */
h5 {font-size: 120%;} h5 { font-size:1.8em; } /* 18px */
h6 {font-size: 105%;} h6 { font-size:1.6em; } /* 16px */
h1.sitename {border-bottom:none;} h1.sitename {border-bottom:none;}
p {line-height:24px; margin:12px 0 32px 0;} p {font-size:1.4em; line-height:2em; margin:1.2em 0 1.2em 0;}
p.small {line-height:24px; font-size:85%;} p.small {font-size:1.2em;}
a {color:#004386; text-decoration:none;} /* unvisited link */ a {color:#004386; text-decoration:none;} /* unvisited link */
a:active {color: #004386;} /* selected link */ a:active {color: #004386;} /* selected link */
@@ -51,8 +49,8 @@ a:hover {color: #087df3;} /* mouse over link */
#content a:hover, #sidebar a:hover {text-decoration:underline;} #content a:hover, #sidebar a:hover {text-decoration:underline;}
ul.square {list-style:square; list-style-position:inside; line-height:24px; margin:0 0 0 12px;} ul.square {font-size:1.4em; list-style:square; list-style-position:inside; line-height:2em; margin:0 0 0 1.2em;}
ol.decimal {list-style:decimal; list-style-position:inside; line-height:24px; margin:0 0 0 12px;} ol.decimal {font-size:1.4em; list-style:decimal; list-style-position:inside; line-height:2em; margin:0 0 0 1.2em;}
/* Forms /* Forms
@@ -61,37 +59,38 @@ ol.decimal {list-style:decimal; list-style-position:inside; line-height:24px; ma
input[type="text"], #CommentText, #password, #confirmPassword { input[type="text"], #CommentText, #password, #confirmPassword {
border:1px solid #cacec6; border:1px solid #cacec6;
display: block; display: block;
padding:2px; padding:3px;
width:90%; width:90%;
} }
fieldset div {margin:16px 0 0 0} fieldset div {margin:1.6em 0 0 0}
legend { legend {
font-size: 110%; font-size: 1.8em;
border:none; border:none;
} }
label { label {
font-size: 1.4em;
display: block; display: block;
margin:0 0 2px 0; margin:0 0 .1em 0;
} }
input[type="checkbox"] { input[type="checkbox"] {
margin:2px 0 20px 10px; margin:.2em 0 2em 1em;
} }
input[type="submit"], input[type="button"], .button { input[type="submit"], input[type="button"], .button {
font: normal 90% "Georgia", Times New Roman, Times, serif; font: normal 1.4em "Georgia", Times New Roman, Times, serif;
color:#333; color:#333;
padding:2px 14px; padding:2px 14px;
display: block; display: block;
margin:2px 0 20px 0; margin:.2em 0 2em 0;
font-weight:600; font-weight:600;
} }
.forcheckbox { .forcheckbox {
margin:0 0 0 4px; margin:0 0 0 .4em;
display:inline; display:inline;
} }
@@ -99,6 +98,7 @@ input[type="submit"], input[type="button"], .button {
/* Tables /* Tables
----------------------------------------------------------*/ ----------------------------------------------------------*/
table { table {
font:1.2em Verdana, Geneva, Tahoma, sans-serif;
background:#fff; background:#fff;
border:1px solid #f1f1f1; border:1px solid #f1f1f1;
border-collapse:collapse; border-collapse:collapse;
@@ -111,7 +111,6 @@ table thead, table th {
} }
table th { table th {
font:70% Verdana, Geneva, Tahoma, sans-serif;
background-color:#69625e; background-color:#69625e;
color:#f1f1f1; color:#f1f1f1;
} }
@@ -135,15 +134,16 @@ table tbody {
th, td { th, td {
font:70% Verdana, Geneva, Tahoma, sans-serif; font:1em Verdana, Geneva, Tahoma, sans-serif;
padding:6px padding:6px;
} }
td.even { td.even {
background-color:#f1f1f1; background-color:#f1f1f1;
} }
/* ---------- Layout ---------- */ /* Layout
----------------------------------------------------------*/
#headercontainer { #headercontainer {
border:2px solid #69625e; border:2px solid #69625e;
@@ -157,21 +157,22 @@ td.even {
border:1px solid #69625e; border:1px solid #69625e;
border-left:0; border-left:0;
border-right:0; border-right:0;
margin:3px 0 3px 0; margin:.3em 0 .3em 0;
} }
#header h1 { #header h1 {
font-size:240%; font-size:3.2em;
color:#333; color:#333;
border:0; border:0;
margin:12px 18px; margin:0 0 0 .8em;
padding:10px 0;
float:left; float:left;
} }
#logindisplay { #logindisplay {
font:80%; font-size:1.4em;
margin:12px auto; margin:1em auto;
text-align:right; text-align:right;
width: 930px; width: 930px;
} }
@@ -185,7 +186,7 @@ td.even {
} }
#main { #main {
margin:0 0 0 27px; margin:0 0 0 2.7em;
width:930px; width:930px;
background:url(../Content/Images/sidebarBackground.gif) no-repeat right top #fff; background:url(../Content/Images/sidebarBackground.gif) no-repeat right top #fff;
} }
@@ -193,45 +194,45 @@ td.even {
#content { #content {
float:left; float:left;
margin:26px 0 0 27px; margin:2.6em 0 0 2.7em;
width:520px; width:520px;
min-height:555px; min-height:555px;
} }
#sidebar { #sidebar {
float:right; float:right;
margin:28px 0 0 0; margin:2.8em 0 0 0;
width:325px; width:325px;
} }
#sidebar h3 { #sidebar h3 {
border-bottom:1px dotted #f1f1f1; border-bottom:1px dotted #666;
font-size: 130%; font-size: 2.0em;
} }
#footercontainer { #footercontainer {
clear:both; clear:both;
border-top:2px solid #69625e; border-top:2px solid #69625e;
width:930px; width:930px;
margin:18px 0 6px 0; margin:1.8em 0 .6em 0;
} }
#footer { #footer {
border-top:1px solid #69625e; border-top:1px solid #69625e;
margin-top:3px; margin-top:.3em;
} }
#footer a{ #footer a{
text-transform:uppercase; text-transform:uppercase;
} }
/* Navigation
/* ---------- Navigation ---------- */ ----------------------------------------------------------*/
.menucontainer { .menucontainer {
display:block; display:block;
float:right; float:right;
margin:18px 0; margin-top:1.3em;
} }
.menucontainer ul, #footer ul { .menucontainer ul, #footer ul {
@@ -239,12 +240,13 @@ td.even {
} }
.menucontainer ul li { .menucontainer ul li {
margin:8px 0 0 0; margin:.8em 0 0 0;
float:left; float:left;
} }
.menucontainer ul li a { .menucontainer ul li a {
margin:0 18px 0 18px; font-size:1.4em;
margin:0 1.8em 0 1.8em;
display:block; display:block;
text-decoration:none; text-decoration:none;
text-transform:uppercase; text-transform:uppercase;
@@ -252,23 +254,23 @@ td.even {
} }
#footer .menucontainer { #footer .menucontainer {
font-size:80%;
margin:0px; margin:0px;
} }
#footer .menucontainer ul li { #footer .menucontainer ul li {
margin:12px 0; margin:1.2em 0;
} }
/* Confirmations, Messages and the like /* Confirmations, Messages and the like
----------------------------------------------------------*/ ----------------------------------------------------------*/
.message, .validation-summary-errors { .message, .validation-summary-errors {
margin:10px 0 4px 0; font-size:1.4em;
margin:1em 0 .4em 0;
padding:4px; padding:4px;
} }
span.message { span.message {
display:block; display:block;
margin:4px 0 4px 4px; margin:.4em 0 .4em .4em;
} }
.message a { .message a {
font-weight:bold; font-weight:bold;
@@ -299,24 +301,25 @@ span.message {
background:#eee; background:#eee;
border:1px dashed #D2D6C6; border:1px dashed #D2D6C6;
color:#7a7a7a; color:#7a7a7a;
margin:20px 0 14px 0; margin:2em 0 1.4em 0;
} }
.debug.message:before { .debug.message:before {
content:"DEBUG » "; content:"DEBUG » ";
} }
/* Misc classes
-------------------------------------------------------------- */
.clearBoth {
clear:both;
}
/* ---------- Tags and Comments ---------- */ /* ---------- Tags and Comments ---------- */
.tags, .comment { .tags, .comment {
font-style:italic; font-style:italic;
color:#666666; color:#666666;
} }
/* ---------- Generic ---------- */
.clearBoth {
clear:both;
}
/* ---------- Hide the edit link for blogs hack ---------- */ /* ---------- Hide the edit link for blogs hack ---------- */
.manage { .manage {
display:none; display:none;