From fdb7bbb1d7221cc99a347c453b4c0c183000c507 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Mon, 26 Jul 2010 15:39:50 -0700 Subject: [PATCH] Updating TheAdmin theme's style to let it scale down (1) and getting the features UI to behave better in smaller widths (2) - (1) to within an 800x600. will need make use of media queries in the not too distant future - (2) in the summary view, feature blocks would stack two-wide at the low end --HG-- branch : dev --- .../Orchard.Modules/Views/Admin/Features.ascx | 2 +- .../Modules/Orchard.Modules/styles/admin.css | 21 ++++++++++++------- .../Themes/TheAdmin/Styles/site.css | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx index a8c3472b7..1cbcb1233 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx @@ -35,7 +35,7 @@
  • ">
    -

    <%:feature.Descriptor.Name%>

    +

    <%=string.Join(".​", feature.Descriptor.Name.Split('.').Select(s => Html.Encode(s)))%>

    <%:feature.Descriptor.Description%>

    <% if (feature.Descriptor.Dependencies != null && feature.Descriptor.Dependencies.Any()) {%>
    diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css index 3ceabbae5..9500ca651 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css +++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css @@ -2,7 +2,7 @@ margin-top:0; } #main .features h3 { - padding:0; + padding:0 3em 0 0; } .features.detail-view .category > ul { border:1px solid #EAEAEA; @@ -19,25 +19,22 @@ -webkit-box-shadow: 0px 1px 2px #d6d6d6; display:block; float:left; - height:5em; + height:6em; margin:0 .5% 1% .5%; position:relative; - width:32.1%; + width:31.95%; } .features.summary-view .feature:nth-child(3n+1), .features.summary-view .feature:nth-child(3n+2), .features.summary-view .feature:nth-child(3n) { - width:32.55%; + width:32.3%; } .features.summary-view .feature:nth-child(3n+1) { margin-left:0; } .features.summary-view .feature:nth-child(3n+2) { - margin-right:0; } .features.summary-view .feature:nth-child(3n) { - float:right; - margin-left:0; margin-right:0; } @@ -74,10 +71,17 @@ padding:.4em .5em; position:relative; } +.features.detail-view .feature .summary { + overflow:visible; +} +#main .features.detail-view .feature { + padding-right:5.5em; +} #main .features.detail-view h3 { display:inline; font-size:1.4em; font-weight:bold; + padding-right:0; } #main .features.summary-view .description { display:none; @@ -115,6 +119,9 @@ right:.4em; top:.4em; } +.features.detail-view .feature .actions { + right:-3.5em; +} .features .feature .actions form.inline.link, .features .feature .actions a { margin-left:.5em; diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 0616e88dc..27180db97 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -52,7 +52,7 @@ body { font-size:62.5%; /* 10px */ line-height:1.6em; margin:0 auto 1em; - min-width:94.6em; /* 946px */ + min-width:74em; /* 946px */ padding:0; } button {