From 4b03080e68fd1a62d1f9813874e584be56152969 Mon Sep 17 00:00:00 2001 From: ErikPorter Date: Thu, 7 Jan 2010 01:35:10 +0000 Subject: [PATCH] Cleaning up a few things --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045087 --- src/Orchard.Web/Content/Site2.css | 325 ------------------ src/Orchard.Web/Content/Site3.css | 114 ------ .../Content/images/headerBackground.gif | Bin 295 -> 0 bytes .../Content/images/header_background.gif | Bin 44 -> 0 bytes .../Content/images/innerheader_background.gif | Bin 287 -> 0 bytes .../Content/images/nav_background.gif | Bin 54 -> 0 bytes .../Content/images/title_background.gif | Bin 374 -> 0 bytes src/Orchard.Web/Core/Themes/Views/menu.ascx | 1 - src/Orchard.Web/Orchard.Web.csproj | 10 - src/Orchard.Web/Views/Home/About.ascx | 3 - src/Orchard.Web/Views/Home/Index.ascx | 2 +- .../Views/Templates/ThreeColumns.aspx | 40 --- .../Views/Templates/TwoColumns.aspx | 56 --- 13 files changed, 1 insertion(+), 550 deletions(-) delete mode 100644 src/Orchard.Web/Content/Site2.css delete mode 100644 src/Orchard.Web/Content/Site3.css delete mode 100644 src/Orchard.Web/Content/images/headerBackground.gif delete mode 100644 src/Orchard.Web/Content/images/header_background.gif delete mode 100644 src/Orchard.Web/Content/images/innerheader_background.gif delete mode 100644 src/Orchard.Web/Content/images/nav_background.gif delete mode 100644 src/Orchard.Web/Content/images/title_background.gif delete mode 100644 src/Orchard.Web/Views/Home/About.ascx delete mode 100644 src/Orchard.Web/Views/Templates/ThreeColumns.aspx delete mode 100644 src/Orchard.Web/Views/Templates/TwoColumns.aspx diff --git a/src/Orchard.Web/Content/Site2.css b/src/Orchard.Web/Content/Site2.css deleted file mode 100644 index 09d40a3fd..000000000 --- a/src/Orchard.Web/Content/Site2.css +++ /dev/null @@ -1,325 +0,0 @@ -/*---------------------------------------------------------- -The base color for this template is #696969. If you'd like -to use a different color start by replacing all instances of -#696969 with your new color. -----------------------------------------------------------*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p, -blockquote,th,td {margin:0; padding:0; } -table { border-collapse:collapse; border-spacing:0; } -fieldset,img { border:0; } -address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; } -ol,ul { list-style:none; } -caption,th { text-align:left; } -h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; } -q:before,q:after { content:”; } -abbr,acronym { border:0; } - -body -{ - background-color: #edebd5; - font-size: .80em; - font-family:"Helvetica Neue", "Lucida Grande", Segoe UI, Arial, Helvetica, Verdana, 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 -{ - line-height: 1.9em; - margin: 1em .5em .5em .8em; - -} - - -/* HEADINGS -----------------------------------------------------------*/ -h1, h2, h3, h4, h5, h6 -{ - font-size: 1.5em; - font-family:Georgia,serif; - color:#666; - font-variant: small-caps; text-transform: none; font-weight: 200; margin-bottom: 0; - -} - -h1 -{ - font-size: 1.6em; - padding-bottom: 0; - margin-bottom: 0; -} -h2 -{ - font-size: 1.5em; - padding: 10px 10px 0px 0px; - border-bottom:1px dotted #999; -} -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 pixel width for the -page. */ - -#header -{ - width: 100%; - height: 75px; - border-bottom:1px #d0ceb3 solid; - background: #fff url('/Content/Images/header_background.gif') repeat top left; -} - -#innerheader -{ - width: 960px; - height: 74px; - margin: 0px auto 0px auto; - border:1px #d0ceb3 solid; - background: #fff url('/Content/Images/innerheader_background.gif') repeat top left; -} - -#innerheader h1 -{ - font-weight:400; - border: none; - margin:10px 0px 0px 12px; - padding:4px 8px 8px 8px; - font-size: 22px !important; -} - - -#page -{ - width: 960px; - margin-left: auto; - margin-right: auto; - border:1px #d0ceb3 solid; - border-top:1px #edebd5 solid; - background: #fff url('/Content/Images/nav_background.gif') repeat-y top left; -} - - -#main -{ - background-color: #fff; - min-height: 420px; - width: 700px; - margin:10px 10px 30px 22px; - float:left; - height: auto; -} - -#sideBar { - float:left; - width:198px; - } - -#footer -{ - clear: both; -} - -/* NAV -----------------------------------------------------------*/ - -#menucontainer -{ - border-top:1px dotted #999; - border-bottom:1px dotted #999; - display:block; - margin:43px 6px 0 6px; -} - - -ul#menu -{ - list-style:none; -} - - -ul#menu li a -{ - display: block; - padding: 0 1.5em; - line-height: 2.25em; - text-decoration:none; - border:1px #FFF solid; - } - - -ul#menu li a:hover -{ - display: block; - padding: 0 1.5em; - line-height: 2.25em; - text-decoration:none; - background-color:#EEE; - border:1px #DDD solid; - - -} - -/* Form LAYOUT ELEMENTS -----------------------------------------------------------*/ - -fieldset { -margin: 1em 0; -margin: 1em .5em .5em .8em; -padding: 1em; -border:1px #d0ceb3 solid; -width: 520px; -} - -legend { -font-size: 1.1em; -font-weight: 600; -color: #666; -padding: 2px 4px 8px 4px; -} - -label { -display: block; -} - -p.formEntry{ -margin: 2px 12px 2px 10px; -} - -input.confirmPassword, input.password, input.textbox { -width: 200px; -border:1px #d0ceb3 solid; -} - - -input[type="radio"] { -} - -input[type="checkbox"] { -} - -input[type="submit"] { -font-weight: 600; -padding: 2px 6px 2px 6px; -margin: 10px 0px 0px 0px; -color: #666; -border-top: 1px solid #CCC; -border-right: 1px solid #a8aeb6; -border-bottom: 1px solid #a8aeb6; -border-left: 1px solid #CCC; -background: #dcdfe2; -cursor:pointer; -} - - -.field-validation-error -{ - color: #ff0000; - margin: 0px 0px 0px 10px; -} - -.input-validation-error.textbox -{ - border: 1px solid #ff0000; - background-color: #ffeeee; -} - -.input-validation-error.password -{ - border: 1px solid #ff0000; - background-color: #ffeeee; -} - -.input-validation-error.confirmPassword -{ - border: 1px solid #ff0000; - background-color: #ffeeee; -} - -.validation-summary-errors -{ - font-weight: bold; - color: #ff0000; -} - -/* MISC -----------------------------------------------------------*/ -.clear -{ - clear: both; -} - -.error -{ - color:Red; -} - - -#title -{ - float:left; - text-align:left; - margin:8px 0px; - background: url('/Content/Images/title_background.gif') no-repeat; - height:55px; - width:329px; - -} - -#logindisplay -{ - font-size:1.1em; - display:block; - text-align:right; - margin:10px; -} - -#logindisplay a:link -{ - text-decoration: underline; -} - -#logindisplay a:visited -{ - text-decoration: underline; -} - - diff --git a/src/Orchard.Web/Content/Site3.css b/src/Orchard.Web/Content/Site3.css deleted file mode 100644 index ba9b52cfc..000000000 --- a/src/Orchard.Web/Content/Site3.css +++ /dev/null @@ -1,114 +0,0 @@ -body { -background-color:#000; -font-size:0.85em; -min-width:900px; -color: #ebe6e6; -font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif; -} - -h1, h2, h3, h4, h5, h6 { -color: #eee; -font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif; -} - -#header { - background: #000 url('/Content/Images/HeaderBackground.gif') repeat-x top left; - border: 1px solid #151313; -} - -#header h1 { -border:medium none; -color:#fff; -font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif; -font-size:24px !important; -font-weight:bold; -line-height:2em; -margin:0px; -padding:8px 0px 0px 10px; -} - -#page -{ - width: 90%; - margin-left: auto; - margin-right: auto; -} - -#main { - margin:0px; - padding:10px 0px 0px 0px; - background-color:#151313; -} - -#main li { - list-style:none; -} - -#sideBar1, #sideBar2, #contentMain { -float:left; -} - -#sideBar2 { -float:right; -} - -#sideBar1, #sideBar2 { -width:20%; -padding:8px; -} - -#contentMain { -width:54%; -padding:8px 4px 0px 4px; -} - -#menu -{ - background: #000 url('/Content/Images/HeaderBackground.gif') repeat-x bottom left; - border: 1px #312e2e solid; -} - -/* TAB MENU -----------------------------------------------------------*/ -ul#menu -{ - border-bottom: none; - padding:2px; - position: relative; - margin: 0; - text-align: right; -} - -ul#menu li -{ - display: inline; - list-style: none; -} - -ul#menu li a -{ - padding: 6px 16px; - font-weight: bold; - text-decoration: none; - line-height: 2.8em; - background: #333 url('/Content/Images/HeaderBackground.gif') repeat-x top left; - color: #fff; -} - -ul#menu li a:hover -{ - background-color: #333; - text-decoration: none; -} - -ul#menu li a:active -{ - background-color: #333; - text-decoration: none; -} - -ul#menu li.selected a -{ - background-color: #333; - color: #fff; -} \ No newline at end of file diff --git a/src/Orchard.Web/Content/images/headerBackground.gif b/src/Orchard.Web/Content/images/headerBackground.gif deleted file mode 100644 index be3bb0c9d7cc93c195a302587d8489b0d08fa0de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmZ?wbhEHbWMqh9xXQqwp`oFvsj056uBxi4siC2+rlzQ2}}S0 diff --git a/src/Orchard.Web/Content/images/innerheader_background.gif b/src/Orchard.Web/Content/images/innerheader_background.gif deleted file mode 100644 index b049ecc9f0c8906208d7e59d949df9fa1f35be59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmZvXy)Q#i0L5<;sl~w7QDaeIujo*TXqd3DS~`hX>_vo`(IUj?e;^XUC|VyaqNKF% z-Fx4=_uY5j{nnbD;Vi%8xd*Eq-m@+#)S9{`Zene^lDNuYYj$qYaJzDEc&6O$zxwBE+ys6i)bsr zuTl_3zmo)8tDUtmYX_*#W2jUt1PM@slFuk=i3DT#Vzfv&Lfvseq2D$AKUvZD2gZBd z`vlU3Vr3)$a6Fc|%^eI6miMpsHWw>v6Za$Klk-Bh)VauA&KxcGFO6mf4u`JJ?rzdM QyTygmmG#ut_B5FK1@Ah%D*ylh diff --git a/src/Orchard.Web/Content/images/nav_background.gif b/src/Orchard.Web/Content/images/nav_background.gif deleted file mode 100644 index 1b8c0d3b307f87ea788cdd54f752527b4ae4cbd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHbJi)-o(7?d(|NsBTkIpInWMKdS9S{MMVPN8I>0f#JE&t* zm`GHp*y#AE#|Sw|SxF{onW?$ygvt2{8rtJ2T538;daAlQn9BMJd*>QUTZ=Ypo2whv zw(I-bg$q1P+}B%-oO~p#+&s+e9IXp2T^&npovn(k-5tv99j*y3UXFTfo?c3>-fqb5 z9{&d~Uyny`pC5;>-=D_sFW@C~0t-eWXfWX%fC?K*Vdya88iW!n5~64^BQK3d9KS&9 z2$ILgkR3;o)M)ag#gr-~vTW(_B}|1fXBw<&Qy|Wq{lxJ6S%(ddp+t)sJ&H7`(xo(X Ucz6mms?@1et6II9Aw&THJA4PQ*#H0l diff --git a/src/Orchard.Web/Core/Themes/Views/menu.ascx b/src/Orchard.Web/Core/Themes/Views/menu.ascx index 6d4a10f68..16b29cf4f 100644 --- a/src/Orchard.Web/Core/Themes/Views/menu.ascx +++ b/src/Orchard.Web/Core/Themes/Views/menu.ascx @@ -2,7 +2,6 @@