From d7f048d098b300d82f82a254de8e24ecc16c2e97 Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 18 Dec 2009 17:18:11 +0000 Subject: [PATCH] Cleaned up themes (the themes, not the module) in general --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044292 --- src/Orchard.Web/Core/Orchard.Core.csproj | 1 - src/Orchard.Web/Core/Themes/Theme.txt | 5 - src/Orchard.Web/Themes/OxiteClassic/Theme.txt | 1 - .../OxiteClassic/Views/Shared/document.aspx | 17 - .../OxiteClassic/Views/Shared/layout.ascx | 15 - .../Themes/OxiteClassic/styles/site.css | 449 ------------------ src/Orchard.Web/Themes/TheAdmin/Theme.gif | Bin 0 -> 43 bytes src/Orchard.Web/Themes/TheAdmin/Theme.txt | 6 +- 8 files changed, 5 insertions(+), 489 deletions(-) delete mode 100644 src/Orchard.Web/Core/Themes/Theme.txt delete mode 100644 src/Orchard.Web/Themes/OxiteClassic/Theme.txt delete mode 100644 src/Orchard.Web/Themes/OxiteClassic/Views/Shared/document.aspx delete mode 100644 src/Orchard.Web/Themes/OxiteClassic/Views/Shared/layout.ascx delete mode 100644 src/Orchard.Web/Themes/OxiteClassic/styles/site.css create mode 100644 src/Orchard.Web/Themes/TheAdmin/Theme.gif diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 60ff1a9be..f6d20d6eb 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -140,7 +140,6 @@ - diff --git a/src/Orchard.Web/Core/Themes/Theme.txt b/src/Orchard.Web/Core/Themes/Theme.txt deleted file mode 100644 index e7b47931e..000000000 --- a/src/Orchard.Web/Core/Themes/Theme.txt +++ /dev/null @@ -1,5 +0,0 @@ -name: Safe Mode -description: This is the default theme for the Themes extension. -version: 1.0 -tags: safe, default -homepage: http://www.orchardproject.net \ No newline at end of file diff --git a/src/Orchard.Web/Themes/OxiteClassic/Theme.txt b/src/Orchard.Web/Themes/OxiteClassic/Theme.txt deleted file mode 100644 index 196a6119c..000000000 --- a/src/Orchard.Web/Themes/OxiteClassic/Theme.txt +++ /dev/null @@ -1 +0,0 @@ -name: OxiteClassic \ No newline at end of file diff --git a/src/Orchard.Web/Themes/OxiteClassic/Views/Shared/document.aspx b/src/Orchard.Web/Themes/OxiteClassic/Views/Shared/document.aspx deleted file mode 100644 index 5f62a2fad..000000000 --- a/src/Orchard.Web/Themes/OxiteClassic/Views/Shared/document.aspx +++ /dev/null @@ -1,17 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Mvc.Html"%> - - - - - <%=Html.Title() %> - Safe Mode! - <% Html.RenderZone("metas"); %> - <% Html.RenderZone("styles"); %> - <% Html.RenderZone("scripts"); %> - - - <% Html.RenderZone("document-first"); %> - <% Html.RenderBody(); %> - <% Html.RenderZone("document-last"); %> - - diff --git a/src/Orchard.Web/Themes/OxiteClassic/Views/Shared/layout.ascx b/src/Orchard.Web/Themes/OxiteClassic/Views/Shared/layout.ascx deleted file mode 100644 index a9c781997..000000000 --- a/src/Orchard.Web/Themes/OxiteClassic/Views/Shared/layout.ascx +++ /dev/null @@ -1,15 +0,0 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.RegisterStyle("site.css"); %> -
- -
- <% Html.RenderBody(); %> - -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Themes/OxiteClassic/styles/site.css b/src/Orchard.Web/Themes/OxiteClassic/styles/site.css deleted file mode 100644 index e10e1d33e..000000000 --- a/src/Orchard.Web/Themes/OxiteClassic/styles/site.css +++ /dev/null @@ -1,449 +0,0 @@ -/*---------------------------------------------------------- -The base color for this template is #5c87b2. If you'd like -to use a different color start by replacing all instances of -#5c87b2 with your new color. -----------------------------------------------------------*/ -body -{ - background-color: #5c87b2; - font-size: .75em; - font-family: Verdana, Helvetica, Sans-Serif; - margin: 0; - padding: 0; - color: #696969; -} - -a:link -{ - color: #034af3; - text-decoration: underline; -} -a:visited -{ - color: #505abc; -} -a:hover -{ - color: #1d60ff; - text-decoration: none; -} -a:active -{ - color: #12eb87; -} - -p, ul -{ - margin-bottom: 20px; - line-height: 1.6em; -} - -/* HEADINGS -----------------------------------------------------------*/ -h1, h2, h3, h4, h5, h6 -{ - font-size: 1.5em; - color: #000; - font-family: Arial, Helvetica, sans-serif; -} - -h1 -{ - font-size: 2em; - padding-bottom: 0; - margin-bottom: 0; -} -h2 -{ - padding: 0 0 10px 0; -} -h3 -{ - font-size: 1.2em; -} -h4 -{ - font-size: 1.1em; -} -h5, h6 -{ - font-size: 1em; -} - -/* this rule styles

tags that are the -first child of the left and right table columns */ -.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2 -{ - margin-top: 0; -} - -/* PRIMARY LAYOUT ELEMENTS -----------------------------------------------------------*/ - -/* you can specify a greater or lesser percentage for the -page width. Or, you can specify an exact pixel width. */ -.page -{ - width: 90%; - margin-left: auto; - margin-right: auto; -} - -#header -{ - position: relative; - margin-bottom: 0px; - color: #000; - padding: 0; -} - -#header h1 -{ - font-weight: bold; - padding: 5px 0; - margin: 0; - color: #fff; - border: none; - line-height: 2em; - font-family: Arial, Helvetica, sans-serif; - font-size: 32px !important; -} - -#main -{ - padding: 30px 30px 15px 30px; - background-color: #fff; - margin-bottom: 30px; - _height: 1px; /* only IE6 applies CSS properties starting with an underscrore */ -} - -#footer -{ - color: #999; - padding: 10px 0; - text-align: center; - line-height: normal; - margin: 0; - font-size: .9em; -} - -/* TAB MENU -----------------------------------------------------------*/ -ul#menu -{ - border-bottom: 1px #5C87B2 solid; - padding: 0 0 2px; - position: relative; - margin: 0; - text-align: right; -} - -ul#menu li -{ - display: inline; - list-style: none; -} - -ul#menu li#greeting -{ - padding: 10px 20px; - font-weight: bold; - text-decoration: none; - line-height: 2.8em; - color: #fff; -} - -ul#menu li a -{ - padding: 10px 20px; - font-weight: bold; - text-decoration: none; - line-height: 2.8em; - background-color: #e8eef4; - color: #034af3; -} - -ul#menu li a:hover -{ - background-color: #fff; - text-decoration: none; -} - -ul#menu li a:active -{ - background-color: #a6e2a6; - text-decoration: none; -} - -ul#menu li.selected a -{ - background-color: #fff; - color: #000; -} - -/* FORM LAYOUT ELEMENTS -----------------------------------------------------------*/ - -fieldset -{ - margin: 1em 0; - padding: 1em; - border: 1px solid #CCC; -} - -fieldset p -{ - margin: 2px 12px 10px 10px; -} - -fieldset label -{ - display: block; -} - -fieldset label.inline -{ - display: inline; -} - -legend -{ - font-size: 1.1em; - font-weight: 600; - padding: 2px 4px 8px 4px; -} - -input[type="text"] -{ - width: 200px; - border: 1px solid #CCC; -} - -input[type="password"] -{ - width: 200px; - border: 1px solid #CCC; -} - -/* TABLE -----------------------------------------------------------*/ - -table -{ - border: solid 1px #e8eef4; - border-collapse: collapse; -} - -table td -{ - padding: 5px; - border: solid 1px #e8eef4; -} - -table th -{ - padding: 6px 5px; - text-align: left; - background-color: #e8eef4; - border: solid 1px #e8eef4; -} - -/* MISC -----------------------------------------------------------*/ -.clear -{ - clear: both; -} - -.error -{ - color:Red; -} - -#menucontainer -{ - margin-top:40px; -} - -div#title -{ - display:block; - float:left; - text-align:left; -} - -#logindisplay -{ - font-size:1.1em; - display:block; - text-align:right; - margin:10px; - color:White; -} - -#logindisplay a:link -{ - color: white; - text-decoration: underline; -} - -#logindisplay a:visited -{ - color: white; - text-decoration: underline; -} - -#logindisplay a:hover -{ - color: white; - text-decoration: none; -} - -.field-validation-error -{ - color: #ff0000; -} - -.input-validation-error -{ - border: 1px solid #ff0000; - background-color: #ffeeee; -} - -.validation-summary-errors -{ - font-weight: bold; - color: #ff0000; -} - - -/* ALL THAT IS BELOW IS TEMPORARY TO MAKE THINGS LOOK DECENT IN THIS SKIN */ -.manage { - float:right; -} -.metadata { - color:#999; - margin-top:-2em; -} -.blog.metadata { - margin-top:-1.5em; -} -.metadata, p.tags { - font-size:95%; -} - -/* Icon buttons -----------------------------------------------------------*/ -a.ibutton, a.ibutton:link, a.ibutton:visited { - background:url(Admin/css/images/icons.png) 0 -20px; - border:none; - display:inline; - float:left; - height:17px; - overflow:hidden; - padding:0 0 0 17px; - width:0; -} -a.ibutton:hover, a.ibutton:active, a.ibutton:focus { background-position:0 0; } -a.ibutton.remove, -a.ibutton.remove:link, -a.ibutton.remove:visited { background-position:-20px -20px; } -a.ibutton.remove:hover, a.ibutton.remove:active, a.ibutton.remove:focus { background-position:-20px 0; } -a.ibutton.view, -a.ibutton.view:link, -a.ibutton.view:visited { background-position:-40px -20px; } -a.ibutton.view:hover, a.ibutton.view:active, a.ibutton.view:focus { background-position:-40px 0; } -a.ibutton.add.page, -a.ibutton.add.page:link, -a.ibutton.add.page:visited { background-position:-60px -20px; } -a.ibutton.add.page:hover, a.ibutton.add.page:active, a.ibutton.add.page:focus { background-position:-60px 0; } -a.ibutton.edit, -a.ibutton.edit:link, -a.ibutton.edit:visited { background-position:-80px -20px; } -a.ibutton.edit:hover, a.ibutton.edit:active, a.ibutton.edit:focus { background-position:-80px 0; } -a.ibutton.publish, -a.ibutton.publish:link, -a.ibutton.publish:visited { background-position:-100px -20px; } -a.ibutton.publish:hover, a.ibutton.publish:active, a.ibutton.publish:focus { background-position:-100px 0; } -a.ibutton.blog, -a.ibutton.blog:link, -a.ibutton.blog:visited { background-position:-120px -20px; } -a.ibutton.blog:hover, a.ibutton.blog:active, a.ibutton.blog:focus { background-position:-120px 0; } - -/* Forms -----------------------------------------------------------*/ -fieldset { - border:0; - margin:0 0 1em; - padding:0; -} -form.comments { - overflow:hidden; -} -form.comments fieldset.who, form.comments fieldset.what { - float:left; - margin-right:15px; -} -form.comments label { - font-weight:bold; - margin-top:15px; -} -form.comments .button { - margin-top:15px; - -} - -/* Tag cloud -----------------------------------------------------------*/ -ul.tagCloud { - padding:0; -} -ul.tagCloud li { - display:inline; - list-style-type:none; - padding:5px 15px 5px 0; -} - -/* Content item lists -----------------------------------------------------------*/ -.contentItems { - background:#FFF; - margin:1.4em 0; - padding:2px; -} -.contentItems li { - background:#FFF; - border-bottom:1px solid #E0E8EF; - margin:0; - overflow:hidden; - padding:.7em 0; -} -.contentItems li.last { - border-bottom:0; -} -.contentItems li h3 { - border-bottom:0; -} -.contentItems li.first h3 { - margin-top:0; -} -.contentItems li .actions { - color:#EAE9D9; - height:auto; - margin:-1.3em 0 0; - padding:0 0 .1em; -} -.contentItems li .actions .ibutton { - margin-right:6px; -} -.contentItems li .actions .destruct .ibutton { - margin-left:8px; - margin-right:0; -} -.contentItems li:hover a.ibutton { background-position:0 0; } -.contentItems li:hover a.ibutton.remove { background-position:-20px 0; } -.contentItems li:hover a.ibutton.view { background-position:-40px 0; } -.contentItems li:hover a.ibutton.add.page { background-position:-60px 0; } -.contentItems li:hover a.ibutton.edit { background-position:-80px 0; } -.contentItems li:hover a.ibutton.publish { background-position:-100px 0; } -.contentItems li:hover a.ibutton.blog { background-position:-120px 0; } diff --git a/src/Orchard.Web/Themes/TheAdmin/Theme.gif b/src/Orchard.Web/Themes/TheAdmin/Theme.gif new file mode 100644 index 0000000000000000000000000000000000000000..330b8e7992511aceb9f358d05114a4316d68006d GIT binary patch literal 43 scmZ?wbhEHbWMp7uXkcKtee)m#1B2pE79h#MpaUX6G7L;iE{qJ;0J%p7Z~y=R literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Themes/TheAdmin/Theme.txt b/src/Orchard.Web/Themes/TheAdmin/Theme.txt index 6d4dba2d2..33c63a180 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Theme.txt +++ b/src/Orchard.Web/Themes/TheAdmin/Theme.txt @@ -1 +1,5 @@ -name: The Admin \ No newline at end of file +name: The Admin +version: 1.0 +author: Jon Wall +description: An admin theme not to be used for the site so don't click "Activate" (or "Uninstall"). In the near future admin themes won't be mixed in with site themes. +homepage: http://www.orchardproject.net \ No newline at end of file