Updated both classic themes and moved some CSS from live edit to theme preview bar.

--HG--
branch : dev
This commit is contained in:
jowall
2010-03-10 10:51:15 -08:00
parent 0f57bfcfe1
commit a307588309
17 changed files with 40 additions and 13 deletions

View File

@@ -233,6 +233,9 @@
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.ascx" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.ascx" />
<Content Include="Dashboard\Views\Web.config" />
<Content Include="Themes\Styles\Images\toolBarActiveButtonBackground.gif" />
<Content Include="Themes\Styles\Images\toolBarBackground.gif" />
<Content Include="Themes\Styles\Images\toolBarHoverButtonBackground.gif" />
<Content Include="Themes\Content\orchard.ico" />
<Content Include="Themes\Scripts\base.js" />
<Content Include="Themes\Styles\special.css" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 B

View File

@@ -6,13 +6,23 @@
margin: 0; padding: 0; border:none; font-size: 1em; width:auto; color: #000;
font-family:Frutiger,"Frutiger Linotype",Univers,Calibri,"Gill Sans","Gill Sans MT","Myriad Pro",Myriad,"DejaVu Sans Condensed","Liberation Sans","Nimbus Sans L",Tahoma,Geneva,"Helvetica Neue",Helvetica,Arial,sans-serif;
}
#themepreview { background: #000; font-size:15px; padding:5px; }
/*#themepreview { background: #000; font-size:15px; padding:5px; }*/
#themepreview span { color: #ccc; padding-right:5px; }
#themepreview fieldset { margin: 0; padding: 3px; }
#themepreview button { font-size: 13px; padding:0 3px; margin-left:10px; }
/*#themepreview button { font-size: 13px; padding:0 3px; margin-left:10px; }*/
#themepreview button.preview { margin-left:0; }
html.dyn #themepreview button.preview { display:none; }
#themepreview button.cancel { float:right; }
/*Added styles below*/
#themepreview { background: #000 url('../../Styles/Images/toolBarBackground.gif') repeat-x left top; font-size:15px; padding:5px; }
/* Button styles */
#themepreview button { font-size: 13px; padding:1px 4px; margin: 0 0 0 10px; text-align:center; color:#f1f1f1; border:1px solid; border-top-color:#191d1d; border-right-color:#494d4d; border-bottom-color:#494d4d; border-left-color:#171c1c; background:#2a2626 url('../../Styles/Images/toolBarActiveButtonBackground.gif') repeat-x left center; }
/* Hover for buttons */
#themepreview button:hover { color:#fdcc64; border:1px #494d4d solid; cursor:pointer; background:#2a2626 url('../../Styles/Images/toolBarHoverButtonBackground.gif') repeat-x left center; }
</style>
<div id="themepreview">
<% using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Themes"}), FormMethod.Post, new { @class = "inline" })) { %>
@@ -26,3 +36,4 @@ html.dyn #themepreview button.preview { display:none; }
</fieldset>
<% } %>
</div>

View File

@@ -177,14 +177,7 @@
<Content Include="Themes\ClassicDark\Views\Footer.ascx" />
<Content Include="Themes\ClassicDark\Views\Layout.ascx" />
<Content Include="Themes\ClassicDark\Views\ZoneTest.ascx" />
<Content Include="Themes\Classic\Content\Images\bodyBackground.gif" />
<Content Include="Themes\Classic\Content\Images\bodyBackgroundgrey.gif" />
<Content Include="Themes\Classic\Content\Images\footerBackground.gif" />
<Content Include="Themes\Classic\Content\Images\mainBackground.gif" />
<Content Include="Themes\Classic\Content\Images\mainBackground.png" />
<Content Include="Themes\Classic\Content\Images\mainBackgroundgrey.gif" />
<Content Include="Themes\Classic\Content\Images\mainBackgroundgrey.png" />
<Content Include="Themes\Classic\Content\Images\navDivider.gif" />
<Content Include="Themes\ClassicDark\Zones\Sidebar.html" />
<Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
<Content Include="Themes\Classic\Zones\Sidebar.html" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 B

View File

@@ -1,8 +1,14 @@
<ul>
<li>
<h3>Heading</h3>
<h3>Curabitur sit amet</h3>
</li>
<li>
<p class="small">Paragraph - Small</p>
<p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec justo est, consectetur vel posuere quis, viverra eget risus. Curabitur sit amet est quis leo condimentum semper sed vitae nisi. Cras orci lorem, pulvinar id bibendum aliquet, facilisis ut diam. Sed elementum bibendum cursus.</p>
</li>
</ul>
<li>
<h3>Donec justo</h3>
</li>
<li>
<p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec justo est, consectetur vel posuere quis, viverra eget risus. Curabitur sit amet est quis leo condimentum semper sed vitae nisi. Cras orci lorem, pulvinar id bibendum aliquet, facilisis ut diam. Sed elementum bibendum cursus.</p>
</li>
</ul>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

@@ -0,0 +1,14 @@
<ul>
<li>
<h3>Curabitur sit amet</h3>
</li>
<li>
<p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec justo est, consectetur vel posuere quis, viverra eget risus. Curabitur sit amet est quis leo condimentum semper sed vitae nisi. Cras orci lorem, pulvinar id bibendum aliquet, facilisis ut diam. Sed elementum bibendum cursus.</p>
</li>
<li>
<h3>Donec justo</h3>
</li>
<li>
<p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec justo est, consectetur vel posuere quis, viverra eget risus. Curabitur sit amet est quis leo condimentum semper sed vitae nisi. Cras orci lorem, pulvinar id bibendum aliquet, facilisis ut diam. Sed elementum bibendum cursus.</p>
</li>
</ul>