diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php index 6477068d..b95ca089 100644 --- a/themes/danbooru/layout.class.php +++ b/themes/danbooru/layout.class.php @@ -183,7 +183,7 @@ class Layout { $title_link = "

$site_name

"; if($page->left_enabled) { - $left = ""; + $left = ""; $withleft = "withleft"; } else { @@ -204,23 +204,22 @@ $header_html - +
+ $title_link + + +
$subheading $sub_block_html - $left -
$main_block_html
- - + EOD; diff --git a/themes/danbooru/style.css b/themes/danbooru/style.css index 93d2f806..d827981c 100644 --- a/themes/danbooru/style.css +++ b/themes/danbooru/style.css @@ -1,36 +1,36 @@ .noleft{ padding-left:20px; } -div#header { +HEADER { margin-bottom:1em; } -div#header #site-title { +HEADER #site-title { padding:10px 20px 0; } -div#header ul#navbar { +HEADER ul#navbar { margin:0; padding:5px 20px 2px 10px; } -div#header ul#navbar li { +HEADER ul#navbar li { font-size:120%; margin:0; padding:0 10px 2px; } -div#header ul#navbar li.current-page { +HEADER ul#navbar li.current-page { background-color:#F7F7FF; } -div#header ul#navbar li.current-page a { +HEADER ul#navbar li.current-page a { font-weight:bold; } -div#header ul#subnavbar { +HEADER ul#subnavbar { background-color:#F7F7FF; margin:0 0 1em; padding:5px 20px 5px 15px; } -div#header ul#subnavbar li { +HEADER ul#subnavbar li { padding:0 5px; } -div#header #site-title { +HEADER #site-title { padding:10px 20px 0; } body { @@ -87,13 +87,13 @@ margin:auto; text-align:center; width:256px; } -#body select { +ARTICLE select { width:150px; } td > input[type="submit"] {width: 100%;} td > input[type="text"] {width: 100%;} td > input[type="password"] {width: 100%;} -#footer { +FOOTER { clear:both; color:#CCCCCC; font-size:0.9em; @@ -115,27 +115,27 @@ text-decoration:none; a:hover { text-decoration:underline; } -#nav { +NAV { float:left; text-align:left; width:150px; padding:5px 20px 2px 10px; } -#nav table { +NAV table { width:150px; } -#nav td { +NAV td { vertical-align:middle; } -#nav input { +NAV input { padding:0; width:100%; } -#nav select { +NAV select { padding:0; width:100%; } -#nav h3 { +NAV h3 { text-align:left; } #comments p { @@ -233,10 +233,10 @@ background:#FFAAAA none repeat scroll 0 0; font-size:1.5em; font-weight:bold; } -div#header { +HEADER { text-align:left; } -div#header h1 { +HEADER h1 { text-align:left; } * { diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php index 0673cdf5..aec83590 100644 --- a/themes/default/layout.class.php +++ b/themes/default/layout.class.php @@ -61,14 +61,17 @@ $header_html - {$page->heading} - - $sub_block_html - - -
$main_block_html
- - + EOD; diff --git a/themes/default/style.css b/themes/default/style.css index 0e23659a..76446d82 100644 --- a/themes/default/style.css +++ b/themes/default/style.css @@ -29,7 +29,7 @@ H3 { background: #DDD; border: 1px solid #CCC; } -.brr, .hrr, H1, #footer, .thumb { +.brr, .hrr, H1, FOOTER, .thumb { margin: 8px; padding: 8px; border-radius: 12px; /* standard, webkit, opera */ @@ -45,7 +45,7 @@ TD { vertical-align: top; text-align: center; } -#body SELECT {width: 150px;} +ARTICLE SELECT {width: 150px;} INPUT, TEXTAREA {box-sizing: border-box;} TD>INPUT[type="button"] {width: 100%;} TD>INPUT[type="submit"] {width: 100%;} @@ -67,7 +67,7 @@ TABLE.form TD, TABLE.form TH {vertical-align: center;} TABLE.form TBODY TD {text-align: left;} TABLE.form TBODY TH {text-align: right; padding-right: 4px;} -#footer { +FOOTER { clear: both; font-size: 0.7em; text-align: center; @@ -89,28 +89,28 @@ UL { * the navigation bar, and all its blocks * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#nav { +NAV { width: 200px; float: left; text-align: center; margin-left: 16px; } -#nav .blockbody { +NAV .blockbody { font-size: 0.85em; text-align: center; overflow: hidden; } -#nav TABLE { +NAV TABLE { width: 150px; } -#nav TD { +NAV TD { vertical-align: middle; } -#nav INPUT { +NAV INPUT { width: 100%; padding: 0px; } -#nav SELECT { +NAV SELECT { width: 100%; padding: 0px; } @@ -143,14 +143,14 @@ UL { * the main part of each page * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#body { +ARTICLE { margin-left: 226px; margin-right: 16px; margin-top: 16px; text-align: center; height: 1%; } -#body TABLE { +ARTICLE TABLE { width: 90%; margin: auto; } @@ -168,11 +168,11 @@ UL { padding: 8px 4px 8px 4px; } -#nav .thumbblock { +NAV .thumbblock { float: none; height: auto; } -#nav .thumb { +NAV .thumb { margin-bottom: 0px; } .thumbblock { diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php index 406bec43..09751549 100644 --- a/themes/futaba/layout.class.php +++ b/themes/futaba/layout.class.php @@ -47,7 +47,7 @@ class Layout { } if($page->left_enabled) { - $left = ""; + $left = ""; $withleft = "withleft"; } else { @@ -68,14 +68,16 @@ $header_html -

{$page->heading}

- $subheading - $sub_block_html - +
+

{$page->heading}

+ $subheading + $sub_block_html +
$left -
$main_block_html
- - + EOD; diff --git a/themes/futaba/style.css b/themes/futaba/style.css index d6aba334..4501343b 100644 --- a/themes/futaba/style.css +++ b/themes/futaba/style.css @@ -21,7 +21,7 @@ H1 { display: none; } -#footer { +FOOTER { clear: both; padding-top: 8px; font-size: 0.7em; @@ -35,26 +35,26 @@ A, A:visited {text-decoration: none; color: #0000EE;} A:hover {text-decoration: underline; color: #DD0000;} HR {border: none; border-top: 1px solid #D9BFB7; height: 0px; clear: both;} -#nav { +NAV { width: 150px; float: left; text-align:left; } -#nav TABLE { +NAV TABLE { width: 150px; } -#nav TD { +NAV TD { vertical-align: middle; } -#nav INPUT { +NAV INPUT { width: 100%; padding: 0px; } -#nav SELECT { +NAV SELECT { width: 100%; padding: 0px; } -#nav H3 { +NAV H3 { text-align: left; } .withleft { diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php index 838c41d3..cf7a8d89 100644 --- a/themes/lite/layout.class.php +++ b/themes/lite/layout.class.php @@ -153,10 +153,10 @@ class Layout { } if($page->left_enabled==false) { $left_block_html = ""; - $main_block_html = "
$main_block_html
"; + $main_block_html = "
$main_block_html
"; } else { - $left_block_html = ""; - $main_block_html = "
$main_block_html
"; + $left_block_html = ""; + $main_block_html = "
$main_block_html
"; } print << - - $menu - $custom_sublinks - - $sub_block_html - +
+ $menu + $custom_sublinks + $sub_block_html +
$left_block_html $main_block_html - - - + EOD; diff --git a/themes/lite/style.css b/themes/lite/style.css index 50b7e18f..dc6bd75c 100644 --- a/themes/lite/style.css +++ b/themes/lite/style.css @@ -133,7 +133,7 @@ CODE { border-top: none; background: #DDD; } -#body SELECT {width: 150px;} +ARTICLE SELECT {width: 150px;} TD>INPUT[type="submit"] {width: 100%;} TD>INPUT[type="text"] {width: 100%;} TD>INPUT[type="password"] {width: 100%;} @@ -164,7 +164,7 @@ INPUT:hover, TEXTAREA:hover { text-decoration:none; } -#footer { +FOOTER { clear: both; padding: 8px; font-size: 0.7em; @@ -193,27 +193,27 @@ UL { * the navigation bar, and all its blocks * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#nav { +NAV { width: 200px; float: left; text-align: center; margin-left: 16px; } -#nav .blockbody { +NAV .blockbody { font-size: 0.85em; text-align: center; } -#nav TABLE { +NAV TABLE { width: 190px; } -#nav TD { +NAV TD { vertical-align: middle; } -#nav INPUT { +NAV INPUT { width: 95%; padding: 0px; } -#nav SELECT { +NAV SELECT { width: 100%; padding: 0px; } @@ -264,13 +264,13 @@ UL { * the main part of each page * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#body { +ARTICLE { margin-left: 226px; margin-right: 16px; text-align: left; height: 1%; } -#body_noleft { +ARTICLE_noleft { margin-left: 4px; margin-right: 16px; margin-bottom:16px; @@ -279,7 +279,7 @@ UL { text-align: left; height: 1%; } -#body TABLE { +ARTICLE TABLE { width: 90%; } @@ -332,11 +332,11 @@ UL { background: #FAA; } -#nav .thumbblock { +NAV .thumbblock { float: none; height: auto; } -#nav .thumb { +NAV .thumb { margin-bottom: 0px; } .thumbblock { diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php index 7fbcc682..e3552489 100644 --- a/themes/warm/layout.class.php +++ b/themes/warm/layout.class.php @@ -67,23 +67,25 @@ $header_html - - - - $head_block_html - - - - $sub_block_html - - - -
$main_block_html
- - + EOD; diff --git a/themes/warm/style.css b/themes/warm/style.css index 3ee3e99a..ca835103 100644 --- a/themes/warm/style.css +++ b/themes/warm/style.css @@ -9,7 +9,7 @@ BODY { font-size: 14px; margin: 0px; } -#header { +HEADER { border-bottom: 1px solid #B89F7C; margin-top: 0px; margin-bottom: 16px; @@ -50,7 +50,7 @@ CODE { border-top: none; background: #DDD; } -#body SELECT {width: 150px;} +ARTICLE SELECT {width: 150px;} TD>INPUT[type="submit"] {width: 100%;} TD>INPUT[type="text"] {width: 100%;} TD>INPUT[type="password"] {width: 100%;} @@ -64,7 +64,7 @@ TABLE.zebra TD {border-top: 1px solid #B89F7C;} TABLE.zebra TR:nth-child(odd) {background: #FCD9A9;} TABLE.zebra TR:nth-child(even) {background: #DABC92;} -#footer { +FOOTER { clear: both; padding: 8px; font-size: 0.7em; @@ -95,27 +95,27 @@ UL { * the navigation bar, and all its blocks * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#nav { +NAV { width: 250px; float: left; text-align: center; margin-left: 16px; } -#nav .blockbody { +NAV .blockbody { font-size: 0.85em; text-align: center; } -#nav TABLE { +NAV TABLE { width: 150px; } -#nav TD { +NAV TD { vertical-align: middle; } -#nav INPUT { +NAV INPUT { width: 100%; padding: 0px; } -#nav SELECT { +NAV SELECT { width: 100%; padding: 0px; } @@ -152,13 +152,13 @@ UL { * the main part of each page * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#body { +ARTICLE { margin-left: 276px; margin-right: 16px; text-align: center; height: 1%; } -#body TABLE { +ARTICLE TABLE { width: 90%; margin: auto; } @@ -204,11 +204,11 @@ UL { background: #FAA; } -#nav .thumbblock { +NAV .thumbblock { float: none; height: auto; } -#nav .thumb { +NAV .thumb { margin-bottom: 0px; } .thumbblock {