From ba6af5ac4ebe7cf510f47bd0a7bca0c1711bfb92 Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 20 Nov 2009 16:30:23 +0000 Subject: [PATCH] More work on the admin UI overhaul (WIP @ /admin/pages) --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041563 --- src/Orchard.Web/Content/Admin/css/base.css | 78 ++++++++++++------ .../Admin/css/images/background_header.jpg | Bin 2700 -> 1500 bytes src/Orchard.Web/Views/Admin/Foot.aspx | 8 +- src/Orchard.Web/Views/Admin/Head.aspx | 13 +-- 4 files changed, 64 insertions(+), 35 deletions(-) diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index f0312c21d..e1d30e649 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -6,13 +6,15 @@ body { color:#5a5b32; 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; font-size:62.5%; /* 10px */ + max-width:120.4em; + margin:0 auto 1em; min-width:96em; /* 960px */ } body#preview { min-width:0; } -#main { - font-size:1.2em; /* 12px */ +#content { + background:#f9faf5; } /* Headings and defaults @@ -64,14 +66,14 @@ a.linkButton, a.linkButton:visited { /* Header - Branding and Login ----------------------------------------------------------*/ -#banner { +#header { background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right; height:60px; } -#banner h1 { +#header h1 { float:left; } -#banner h1 a { +#header h1 a { background:url(images/orchardLogo.jpg) no-repeat; display:block; height:60px; @@ -80,24 +82,56 @@ a.linkButton, a.linkButton:visited { width:105px; } -#hd a, #hd a:visited, #hd a:active { - display:block; +#site, #login { + font-size:1.5em; +} + +#site a, #site a:visited, #site a:active { + color:#e2e4dd; + float:left; + line-height:2.2em; + padding:14px 0 0 6px; position:relative; - padding:14px 0 0 12px; - color: #e2e4dd; } #login{ - float:right; - display:block; - margin:20px 20px 0 0; color:#1a1505; + display:block; + float:right; + margin:20px 20px 0 0; + white-space:nowrap; } -#login a, #login a:visited, #login a:active {color: #e2e4dd; display:inline; padding:0px;} +#login a, #login a:visited, #login a:active { + color:#e2e4dd; + padding:0; +} +#login a:hover, #login a:focus { + color:#ffea9b; +} -#login a:hover {color:#ffea9b;} +/* temp rough structure */ +#header, #footer { + width:100%; +} +#header { + overflow:hidden; +} +#content { + overflow:auto; + padding:1.4em; +} +#main { + display:inline; + float:right; + width:77.41%; +} +#navigation { + display:inline; + float:left; + width:20.93%; +} /* Left navigation pane ----------------------------------------------------------*/ @@ -386,17 +420,11 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho .separator {border-bottom:1px dashed #E4E7DC; margin-bottom:8px; padding-bottom:2px;} /*TODO - Remove roundCorners class*/ -table, textarea, #bd, .button, .inputText, .inputTextLarge, .inputTextPermalink, .linkButton, .leftNavMod, div.confirmation, div.warning, div.critical, .roundCorners { - - -moz-border-radius-bottomleft:4px; - -moz-border-radius-bottomright:4px; - -moz-border-radius-topleft:4px; - -moz-border-radius-topright:4px; - - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -webkit-border-bottom-right-radius: 4px; +table, textarea, #content, .button, .inputText, .inputTextLarge, +.inputTextPermalink, .linkButton, .leftNavMod, div.confirmation, +div.warning, div.critical, .roundCorners { + -moz-border-radius:4px; + -webkit-border-top-radius:4px; } diff --git a/src/Orchard.Web/Content/Admin/css/images/background_header.jpg b/src/Orchard.Web/Content/Admin/css/images/background_header.jpg index 4775b434c9be3fae911789630ec60768a1a95763..36dca4db7038e89bae994a595f54ce0fe1c58412 100644 GIT binary patch literal 1500 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 ql{Y^(gv%Z3tlk7k3HSqAw!9M}2k(uBC diff --git a/src/Orchard.Web/Views/Admin/Foot.aspx b/src/Orchard.Web/Views/Admin/Foot.aspx index 29f1c954c..7aa8b4903 100644 --- a/src/Orchard.Web/Views/Admin/Foot.aspx +++ b/src/Orchard.Web/Views/Admin/Foot.aspx @@ -1,8 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> - <%-- #content --%> - <%-- Navigation --%> - <%-- #main --%> + - <%-- #main --%> + <%-- #content --%> + <%-- #contentinfo --%> \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Head.aspx b/src/Orchard.Web/Views/Admin/Head.aspx index 5d17c25e6..3fc10ca34 100644 --- a/src/Orchard.Web/Views/Admin/Head.aspx +++ b/src/Orchard.Web/Views/Admin/Head.aspx @@ -19,13 +19,14 @@ todo: (heskew) rework how/what pages are assembled when we get into theming --%> -