diff --git a/p.php b/p.php index 0e3489c0..45af23b7 100644 --- a/p.php +++ b/p.php @@ -7,7 +7,7 @@ - + @@ -50,7 +50,9 @@ if (is_file("p/$page/$lang-rss")) diff --git a/site/site.php b/site/site.php index 8b76ffa0..fd521cc5 100644 --- a/site/site.php +++ b/site/site.php @@ -178,7 +178,6 @@ if (file_exists("p/$p/subs")) { $handle = fopen("p/$p/subs", "r"); if ($handle) { - echo(""); } } } diff --git a/theme/css/alternative.css b/theme/css/alternative.css index f0176764..ce6b1c87 100644 --- a/theme/css/alternative.css +++ b/theme/css/alternative.css @@ -1,4 +1,4 @@ -#header { /* CSS Reset */ /* http://meyerweb.com/eric/tools/css/reset/ */ /* v1.0 | 20080212 */ /* remember to define focus styles! */ /* remember to highlight inserts somehow! */ /* tables still need 'cellspacing="0"' in the markup */ } +#header { /* CSS Reset */ /* http://meyerweb.com/eric/tools/css/reset/ */ /* v1.0 | 20080212 */ /* remember to define focus styles! */ /* remember to highlight inserts somehow! */ /* tables still need 'cellspacing="0"' in the markup */ height: 90px; } #header html, #header body, #header div, #header span, #header applet, #header object, #header iframe, #header h1, #header h2, #header h3, #header h4, #header h5, #header h6, #header p, #header blockquote, #header pre, #header a, #header abbr, #header acronym, #header address, #header big, #header cite, #header code, #header del, #header dfn, #header em, #header font, #header img, #header ins, #header kbd, #header q, #header s, #header samp, #header small, #header strike, #header strong, #header sub, #header sup, #header tt, #header var, #header b, #header u, #header i, #header center, #header dl, #header dt, #header dd, #header ol, #header ul, #header li, #header fieldset, #header form, #header label, #header legend, #header table, #header caption, #header tbody, #header tfoot, #header thead, #header tr, #header th, #header td { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; } #header body { line-height: 1; } #header ol, #header ul { list-style: none; } @@ -12,29 +12,26 @@ #header ul.menu { text-align: right; list-style: none inside none; white-space: nowrap; letter-spacing: -5px; } #header ul.menu li { display: inline-block; letter-spacing: normal; } #header ul.menu li a { display: inline-block; vertical-align: top; text-align: center; } -#header ul.menu li a span { display: inline-block; height: 54px; line-height: 52px; text-transform: uppercase; font-size: 13px; color: #333333; margin: 0 8px; word-spacing: -0.1em; } -#header ul.menu li a:hover { background: #ccc; } -#header ul.menu li.current { position: relative; z-index: 1; margin: 0 -8px; } -#header ul.menu li.current a { background: black; } -#header ul.menu li.current a span { color: white; width: 104px; } -#header ul.menu li.current a:hover { background: black; } -#header ul.menu li.index { float: left; height: 72px; margin: 0; } -#header ul.menu li.index a { height: 72px; } -#header ul.menu li.index a span { width: 120px !important; height: 72px; line-height: 72px; color: white; background-color: black; margin: 0; } +#header ul.menu li { margin-left: 16px; } +#header ul.menu a { text-decoration: none; } +#header ul.menu span { display: inline-block; height: 54px; line-height: 54px; color: #333333; font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; font-size: 12px; letter-spacing: -1px; text-transform: uppercase; } +#header ul.menu li.index { float: left; position: relative; margin-left: 0; } +#header ul.menu li.index span { background: black; height: 72px; line-height: 72px; width: 110px; color: #f3f3f3; } #header ul.submenu { text-align: right; list-style: none inside none; white-space: nowrap; letter-spacing: -5px; } #header ul.submenu li { display: inline-block; letter-spacing: normal; } #header ul.submenu li a { display: inline-block; vertical-align: top; text-align: center; } #header ul.submenu li { margin-left: 16px; } -#header ul.submenu li a span { line-height: 36px; text-transform: capitalize; font-size: 11px; color: #333333; } -#header div.menu { height: 54px; } -#header div.submenu { height: 36px; margin-bottom: 36px; } +#header ul.submenu a { text-decoration: none; } +#header ul.submenu span { line-height: 36px; color: #333333; font-size: 11px; text-transform: capitalize; } /* ******************* Changes to the Original Stylesheet ****************** */ body { background: #f3f3f3; } #content { margin: 0 -8px; } -.layout { margin: 0 auto; /* min-width: $page; */ width: 90%; width: 996px; } +#middle { margin-top: 18px; } + +.layout { margin: 0 auto; width: 90%; } table.main h1, td.main { margin-top: 0; padding-top: 0; } diff --git a/theme/css/ie-lt8.css b/theme/css/ie-lt8.css new file mode 100644 index 00000000..aecff8f3 --- /dev/null +++ b/theme/css/ie-lt8.css @@ -0,0 +1,8 @@ +/* Transparent PNGs. Use specific selectors (id, classes) to avoid slowdowns */ +img { behavior: url("/theme/img/ie/iepngfix.htc"); } + +/* IE6 and 7 do not support inline-block for block elements like
  • */ +#header ul.menu li, #header ul.submenu li { display: inline; } + +/* Move submenu 1 line in IE6 */ +* html #header div.submenu { margin-top: -18px; } diff --git a/theme/ie/ie-lt8.css b/theme/ie/ie-lt8.css deleted file mode 100644 index 5529b69d..00000000 --- a/theme/ie/ie-lt8.css +++ /dev/null @@ -1,8 +0,0 @@ -/* Transparent PNGs. Use specific selectors (id, classes) to avoid slowdowns */ -img -{ - behavior: url('/theme/ie/iepngfix.htc') -} - -/* IE6 and 7 do not support inline-block for block elements like
  • */ -#header ul.menu li { display: inline } \ No newline at end of file diff --git a/theme/ie/blank.gif b/theme/img/ie/blank.gif similarity index 100% rename from theme/ie/blank.gif rename to theme/img/ie/blank.gif diff --git a/theme/ie/iepngfix.htc b/theme/img/ie/iepngfix.htc similarity index 100% rename from theme/ie/iepngfix.htc rename to theme/img/ie/iepngfix.htc