From 30800e7a02cb5da78524aefa45642fc7e05d4f1a Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 20 Nov 2009 18:13:57 +0000 Subject: [PATCH] Admin UI "frame" in a pretty good state including some rough font sizing and a hacked faux grid. Need a real elastigrid and markup/CSS work on the content. --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041577 --- src/Orchard.Web/Content/Admin/css/base.css | 98 ++++++++++-------- .../Admin/css/images/background_header.jpg | Bin 1500 -> 1493 bytes .../Admin/images/background_header.jpg | Bin 2700 -> 0 bytes .../Content/Admin/images/orchardLogo.jpg | Bin 2646 -> 0 bytes .../Admin/images/tableHeaderBackground.gif | Bin 500 -> 0 bytes .../Orchard.CmsPages/Views/Admin/Index.aspx | 6 +- src/Orchard.Web/Views/Admin/Foot.aspx | 12 +-- 7 files changed, 63 insertions(+), 53 deletions(-) delete mode 100644 src/Orchard.Web/Content/Admin/images/background_header.jpg delete mode 100644 src/Orchard.Web/Content/Admin/images/orchardLogo.jpg delete mode 100644 src/Orchard.Web/Content/Admin/images/tableHeaderBackground.gif diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index e1d30e649..384297120 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -6,9 +6,10 @@ 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; + /*max-width:120.4em;*/ margin:0 auto 1em; min-width:96em; /* 960px */ + padding:0 .4em; } body#preview { min-width:0; @@ -26,15 +27,15 @@ h1, h2, h3, h4, h5, h6, legend { font-weight:normal; } -h1 { font-size:2.4em; } /* 24px */ -h2 { font-size:2.1em; } /* 21px */ -h3 { font-size:1.8em; } /* 18px */ -h4 { font-size:1.6em; } /* 16px */ -h5 { font-size:1.5em; } /* 15px */ -h6 { font-size:1.4em; } /* 14px */ +h1 { font-size:2.8em; } /* 28px */ +h2 { font-size:2.4em; } /* 24px */ +h3 { font-size:2em; } /* 20px */ +h4 { font-size:1.8em; } /* 18px */ +h5 { font-size:1.6em; } /* 16px */ +h6, p, label, input, select, th, td { font-size:1.5em; } /* 15px */ p { - margin:4em; + margin:4px; } strong { font-weight:700; @@ -47,6 +48,7 @@ a, a:link, a:visited { } a:hover, a:active, a:focus { color:#1e5d7d; + outline:0; text-decoration:underline; } @@ -77,7 +79,7 @@ a.linkButton, a.linkButton:visited { background:url(images/orchardLogo.jpg) no-repeat; display:block; height:60px; - margin:-10px 0 0 18px; + margin:-10px 0 0 14px; text-indent:-9999px; width:105px; } @@ -90,7 +92,7 @@ a.linkButton, a.linkButton:visited { color:#e2e4dd; float:left; line-height:2.2em; - padding:14px 0 0 6px; + padding:14px 0 0 12px; position:relative; } @@ -101,7 +103,6 @@ a.linkButton, a.linkButton:visited { margin:20px 20px 0 0; white-space:nowrap; } - #login a, #login a:visited, #login a:active { color:#e2e4dd; padding:0; @@ -125,52 +126,65 @@ a.linkButton, a.linkButton:visited { #main { display:inline; float:right; - width:77.41%; + width:83.06%; } #navigation { display:inline; float:left; - width:20.93%; + width:15.28%; } -/* Left navigation pane +/* Navigation ----------------------------------------------------------*/ +#navshortcut { + height:0; + overflow:hidden; + width:0; +} -.leftNavMod { - /*border:1px #bdb791 solid; Old border color*/ +#navigation li { + background:#fff; border:1px solid #d2d6c6; - margin: 10px 0 14px 0; - background:#FFF; - } - -.leftNavMod h4 { - padding: 4px 4px 6px 8px; - background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; - cursor:pointer; - } - -/* Unordered list links in left navigation pane -----------------------------------------------------------*/ - -.leftNavMod ul a { + margin:10px 0 14px 0; +} +#navigation ul li { + border:0; + margin:0; +} +#navigation li h4 { + background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left; + padding:4px 4px 6px 8px; +} +#navigation ul a { color:#5a5b32; display:block; + font-size:1.5em; height:28px; line-height:28px; - padding:0px 0px 0px 12px; + padding:0 0 0 12px; text-decoration:none; } - -.leftNavMod ul a:visited{ +/* todo: (heskew) what's the point of a :visited color for an admin nav? +#navigation ul a:visited{ color: #2b2b2b; -} - -.leftNavMod ul a:hover { - color: #3e4301; +} */ +#navigation ul a:hover, #navigation ul a:focus { background:#f0ecd2; + color: #3e4301; + outline:0; text-decoration:underline; } +/* Content +----------------------------------------------------------*/ +#content h2 { + border-bottom:1px dashed #e4e7dc; + margin:3px 0 8px; + padding:0 0 2px; +} + + + /* Confirmations; ----------------------------------------------------------*/ @@ -225,8 +239,7 @@ legend { select, textarea, #PublishLaterDate, .inputText{ 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:102%; - margin:4px 4px 4px 0; + margin:4px; padding:2px; border:1px solid #d2d6c6; color:#5a5b32; @@ -291,7 +304,6 @@ ol.actions .button {margin:4px 4px 4px -8px;} ol.actions label { margin:6px 0 0 0; - font-size:112%; } .filterActions { @@ -318,7 +330,6 @@ tbody } thead, th { - font-size:100%; /*13px*/ font-weight:700; text-align:left; background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb; @@ -420,8 +431,9 @@ 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, #content, .button, .inputText, .inputTextLarge, -.inputTextPermalink, .linkButton, .leftNavMod, div.confirmation, +#content, #navigation li, +table, textarea, .button, .inputText, .inputTextLarge, +.inputTextPermalink, .linkButton, 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 36dca4db7038e89bae994a595f54ce0fe1c58412..df404f6058471496fd128cb577a423aace89d9ff 100644 GIT binary patch delta 1183 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 E*}vTzIsgCw diff --git a/src/Orchard.Web/Content/Admin/images/background_header.jpg b/src/Orchard.Web/Content/Admin/images/background_header.jpg deleted file mode 100644 index 4775b434c9be3fae911789630ec60768a1a95763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2700 zcma)8c{tST7yr(TB}{5$6hh3%GO~{Oz~DEkr@m+_0MxpBF-dw>7l&-=X3InO!oS>E%!?{m)Pr_E7d_ep{U0RVvk zfU>oK&3OQ35!{<3a3UCppV-jbV(=3n6r0i*Q4!bL5qbeyX2#z?Gzs-nFrMf2Bai`*^CX`ZQI-0SbZq5+Fod{mTh1`JG0o z69pSb@61^zPnM8hhZ>(joq1BrP!6oSV}3{zcN?0x=89E)HT*bo?%&9Qf)bO>yQa-c zc&V16>9r&SQC8U-F}mC2N(l{PDl_FZ*3yJg>*>m}7Ivnfm9+U5$O8Mg)Wfeo%5YPP zAJnBR3Pf79oc%=_X;ynJKo45_m=j1_@ti_WRw2YRElrj4z57+5OpPzNqFV$NJNHy+ zEzUw?a&W*)?$kSO!S?kPl|*27f2RqgxTR(Xz81oIY_$0qswar&pqE=Z!>h*rcsj50 zcbT@b#*dA9V^#+dvn~(YBXp@~d0bY{$wBe7%2UazsZki}y%)sYTGH6MQuh6eT|b_q z$R53_YIg{hR^P@u>@%>!@#>?ruJZ`ba4`=eze-;vccuH`DK)9 zsz^QD;fz1XsGE;@v2prAf|B=$XY8tK*9la~rSc?AX`*Z-MyaArbAN@Wc6yzF3qf2` zznqZYde-$n$vAe7csQcwUX= zg}8%QpXt`#bU$n`S@ob^TUN}gyVo61K01eW4{;_~0PZw(noF@MEswi)l{0be%yI4& z+Svn7d8_ZIOa6XB_^H+fYB(y9UwkCr#t!~0#C9(^{R8s;=>Bh#Bm(=_x0!z#^NeyV%}<5g&+yI z7UrE9)coi`T7`*xH&b$KAng7opcC`Q<-Bi0feIs=0BsXMtcF{8@sAd-yMC#fya9a( zITc;YB!70xST{q2cCS(F+qqBTp_kTuvpeTpPld#6z%!H&uKSb7EwV{zn$8AVK0iA0 zN!GiJDPqdCpQ*N#|dXGhGrR9YCR9@6Zw{ox;22BG{w-pd}kM-I+NV*G0@&w_T_sjuP<{+ot@wI^@i=bfbwP!nF%u%k{N| zs?L6ul;*jlX(L>C9o>>@<2>_bm?O8R$u2a`RkgoH3!!ku@IzM*WSND;j(8!0kI9gRriBd`JJQ-u#SxQ)EgPVLC}oTQIV54%(n-pU`@pl`Tot%Yip{86Lu_=#U`6cqg?e$eW+Jm!I2 z%YI5}Qt{g?QNvPy!YL4niv2*hsA@I!@X9sKLz8g~(Kal@RFv*QqG>bpv3o1(&)Z!@ zrte8BJs`KEmT^GDd>yTFCSDBP$}X&(=T>E=J0)pY!xbNqzul$pUYkRv){BkT^(KKW z-LHF@2+MnF&Uo3&+>h_LMMcEu&MBomT5=Cp3dm-1B9rGAlE;t4Xi@r5!?xy*RBA@#51I@50Qd11G>tZgq!i(;dy;-@*b%s)ag?H#B*++n_f*-%Dje{HI3olmJ`fYLLTs@R4kRw3^o|c zknrP)%<#;|8?F>u3VkdLbOisP2%k8{A#%G`9;jze}$gHL*6 ql{Y^(gv%Z3tlk7k3HSqAw!9M}2k(uBC diff --git a/src/Orchard.Web/Content/Admin/images/orchardLogo.jpg b/src/Orchard.Web/Content/Admin/images/orchardLogo.jpg deleted file mode 100644 index e378d549f9641a7fce52dde62814d720974382c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2646 zcma)8cTm$w8~!Ds9V#XCCJG3G0unF?0!r^-0Fh9S5-<=t5m7)6!B9f)(ZJC|5u^%A zi&CU1pi&Z=h!`{hDWV8Rj=QBW8F4>7ry6rf4@CO4x;>pZ_dNYEj4iw0~6thr1d zn3w#T>h`U6%jQ%U!`46#BsJL;CJf8R8@UKfcJAC~0_k_FvDPkKoy6*6ZAvk1oJq0? zdR1TS+;FNl#lLeweo-zMrC_!dz2$vur>47IbjY~+vt- z&4{d5Z-srx?+?^3EhBY2rz*-mQM+!Fdiqs7OeP}_i3UddGf|Pvf^VoogcB!%#ITLl z%|E@>oHbXiIwDyP@IQT`ZsneZtu|6S6!S< zTE0z4H`*Mp$pcLhE1&L&LNa8vp!s{&aEkmMjHB0r%A@E>b#s$r&?(^x4CKKYYYtaz ztdrG1fs_O>D&9FCDh5Xl5;jO-T$7aZh|SGrXtFFdG(= z+)N2>f)}F3WDDI_26ZQ0(Y->V5v2l9r~$%`)-jqdQKy?Q**fzyDa8=-X!>bcb{+Ym zB>Kz)Q;Vl;&gRev+Gu+!?}rM_BxUAo zSZ(<{SDIAHvlZ-`UZ!yb$Ome4Y0hIgB&m*4BK5D4^GTy=V2gos3PqD?|Gc=_XHU|q?sZp`S_lY7m zx3+`SSV`VX`lsC7WcgH_sujAD7vv{G%uK~}?U;an*Ze~4*X<5u@SN z^sW>BSbg*IgE{O`&AfTFZ4IbcCt)it%JQSLv};*hhhHe8Wl!4iCdH|_(1~mwYXxf! zUHb3kmZv0W)Qp_K7}>wsl&mZ+DR6(Kp)K0hUUk zEf?i2+T9c)XBrF99?pseaJIATs0(z1Jn4n(!3+~Qz}Z0U$ihLW-{MBj>7W*SAvIy= zv~}cFyKo}CYdWBly{LxWZp>Nr#Q=}fO(GU_Q=WTC4Dbi@qH5BRb z0?BQ9SAvv4KADtffRs~5YQ$X$fHkLg+&tLxEbqppbWcqC1oP5D8@yMWvB7f|qvpEc;fyRi{Qu^y5uyMfnjNq+aQQSt>o$01?Jp3ck?w>s&a(YQ)ym)q9wPtZYEa6#q z;5j%oT_if4Dq&uwLjdHR)TkE?Zyru&v!TrOJ z1c=m^27bD=d-0t_Yw^aJtn=4q?#NrTD9Q|r`O@z@IJI&$4y}Ik(o_xfc?`bDpZ-zD z>NJZFDlTlN@9{C7p_Pq-v7!a4N0*`OSmQG0 zV6Pnxc8ykeS(>3V_zNR7uu51#XF_GRoETbH*u=;T+oQo96qQpuN@I!3RVK^7nIC>l z_{B9st*46ULE%#Jshmp8$#c&Iczo~i;N$DiZs)@p?6-#_?psz4Xzgm%+#1$$c@-aY zfs^r8jiDs#>?BW@y^TFCQPSk}E1qsv@VXI!M9O@9bmMGx>cmcFMp`9uaw;%C)xPz+ zvdm4#y8}N){SGwWxD)X$q2jNc7p5o;E>Kh`%WJI4f^9$)=8e$hl*;?L6T-#k-wJ*v zhVMKW>W)jx{W|?{Hc-;RdpmRm`SHvt-2#N1s;A4?*_q1q5R27-qefo6ntgiyvH3G+ z3RAZQuJ-0R53i)4MsT2>X9;=5oX|*8^7fYtrT%H87^(f(#QioA1e6J!OWLO$@*Gl$ z<1C0vu~K1+?qdErz)xEom79y&tp|(Iyg%Bw{kz*F<8|sF)W9|Ncak+RMr7?PAfaXc qA8jI6z~5u)t#Js$AGR@<`M+~ijwBQrL-PJzzx-c0^Y;?MocSHfKbwvK diff --git a/src/Orchard.Web/Content/Admin/images/tableHeaderBackground.gif b/src/Orchard.Web/Content/Admin/images/tableHeaderBackground.gif deleted file mode 100644 index 2a92ab80cf1c96231fea5c97c9e053e750c4db4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 zcmdUsM^eH7002X8_TCkH!QMdZ2OV$v1b?D_MFe}tf(;c?fh45UAtV8R;LXurxQ9LO z%&u>&*&W*|U=xr5pzsw#LMORA8Bc<#3?>)2FmaX1MS}1F7CDEpV+cKDxEF?hjU|FY z{8K3kN`cRcxTG*4`~r`9N%}rQUh}bcit$Cr8!qM#B5p}xLBvh5J|PhZz%G)02tcl^ zNQhFDpzc`yjT8LoY>1$|eEdU_8Jc^}%e1Vp$uycsL4~3KBAzJon9hbpiAtss7(2?# z6o`5P&^{VIQ;Iwuy`|Zw5Pq3R!D#pt_@7w6wSVEZU;jP<3|l+E-bBShrA{~6T5TI~ z%=D<$-Bkv|^ng}7HoG#e(Uf(R4>dIR_m!3mFSR#Lb=LI`)-E>H>-EbuCe!??N@X_N REta{-wict&+U48@oIgmhvM~Sv diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx index 5e0ec5441..9a09cb3b1 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx @@ -29,7 +29,7 @@ string SplitDateTime(DateTime dt)
  1. + Actions:
- <%=Html.ActionLink("Add a page", "Create", new {}, new {@class="floatRight topSpacer"}) %> +

<%=Html.ActionLink("Add a page", "Create", new {}, new {@class="floatRight topSpacer"}) %>

@@ -121,7 +121,7 @@ string SplitDateTime(DateTime dt) <% pageIndex++; }%>
- <%=Html.ActionLink("Add a page", "Create", new {}, new {@class="floatRight bottomSpacer"}) %> +

<%=Html.ActionLink("Add a page", "Create", new {}, new {@class="floatRight bottomSpacer"}) %>

<% Html.EndForm(); %> <% Html.Include("Foot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Foot.aspx b/src/Orchard.Web/Views/Admin/Foot.aspx index 7aa8b4903..fe55950a3 100644 --- a/src/Orchard.Web/Views/Admin/Foot.aspx +++ b/src/Orchard.Web/Views/Admin/Foot.aspx @@ -1,19 +1,17 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%-- #main --%> - + <%-- #content --%> <%-- #contentinfo --%>