diff --git a/ext/setup/style.css b/ext/setup/style.css index 6e758563..66a7abfc 100644 --- a/ext/setup/style.css +++ b/ext/setup/style.css @@ -5,15 +5,13 @@ max-width: 1200px; margin: auto; } -.setupblocks .rr { +.setupblock { break-inside: avoid; -moz-break-inside: avoid; -webkit-break-inside: avoid; column-break-inside: avoid; -moz-column-break-inside: avoid; -webkit-column-break-inside: avoid; -} -.setupblock { text-align: center; width: 100%; } @@ -34,4 +32,10 @@ background: #FAA; } - +#Setupmain .blockbody { + background: none; + border: none; + box-shadow: none; + margin: 0px; + padding: 0px; +} diff --git a/ext/setup/theme.php b/ext/setup/theme.php index c416c5e0..c42442b4 100644 --- a/ext/setup/theme.php +++ b/ext/setup/theme.php @@ -91,11 +91,10 @@ class SetupTheme extends Themelet { $b = $block->body; $i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup"; $html = " -
+
$h
$b
-
- + "; return $html; } diff --git a/themes/default/style.css b/themes/default/style.css index 966b431f..5402aabd 100644 --- a/themes/default/style.css +++ b/themes/default/style.css @@ -25,11 +25,11 @@ SECTION>H3 { background: #CCC; border: 1px solid #BBB; } -SECTION>.blockbody, .comment { +SECTION>.blockbody, .comment, .setupblock { background: #DDD; border: 1px solid #CCC; } -SECTION>.blockbody, H1, SECTION>H3, FOOTER, .comment { +SECTION>.blockbody, H1, SECTION>H3, FOOTER, .comment, .setupblock { margin: 8px; padding: 8px; border-radius: 12px; /* standard, webkit, opera */ diff --git a/themes/futaba/style.css b/themes/futaba/style.css index 4501343b..10259612 100644 --- a/themes/futaba/style.css +++ b/themes/futaba/style.css @@ -75,7 +75,7 @@ TD { float: left; } .comment { - background: #FFFFEE; + /*background: #FFFFEE;*/ border-width: 0px; } .reply, .paginator { diff --git a/themes/warm/comment.theme.php b/themes/warm/comment.theme.php deleted file mode 100644 index 40c93637..00000000 --- a/themes/warm/comment.theme.php +++ /dev/null @@ -1,12 +0,0 @@ -box(parent::comment_to_html($comment, $trim)); - } - - protected function build_postbox($image_id) { - return $this->box(parent::build_postbox($image_id)); - } -} -?> diff --git a/themes/warm/style.css b/themes/warm/style.css index a48cbe33..19a110ff 100644 --- a/themes/warm/style.css +++ b/themes/warm/style.css @@ -51,6 +51,7 @@ CODE { background: #DDD; } ARTICLE SELECT {width: 150px;} +INPUT, TEXTAREA {box-sizing: border-box;} TD>INPUT[type="submit"] {width: 100%;} TD>INPUT[type="text"] {width: 100%;} TD>INPUT[type="password"] {width: 100%;} @@ -64,6 +65,10 @@ TABLE.zebra TD {border-top: 1px solid #B89F7C;} TABLE.zebra TR:nth-child(odd) {background: #FCD9A9;} TABLE.zebra TR:nth-child(even) {background: #DABC92;} +TABLE.form TD, TABLE.form TH {vertical-align: middle;} +TABLE.form TBODY TD {text-align: left;} +TABLE.form TBODY TH {text-align: right; padding-right: 4px;} + FOOTER { clear: both; padding: 8px; @@ -91,6 +96,11 @@ UL { text-align: left; } +SECTION>H3, SECTION>.blockbody, .comment {margin: 8px; padding: 8px; border: 1px solid #B89F7C;} +SECTION>.blockbody, .comment {background: #FCD9A9;} +SECTION>H3 {background: #DABC92;} + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * the navigation bar, and all its blocks * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -120,16 +130,6 @@ NAV SELECT { padding: 0px; } -#comments P { - text-align: left; - width: 150px; - max-width: 150px; - overflow: hidden; -} -.comment { - text-align: left; -} - .more:after { content: " >>>"; } @@ -141,10 +141,10 @@ NAV SELECT { content: ")"; } -.paginator { - clear: both; - padding: 4px; - margin-bottom: 32px; +#paginator .blockbody { + background: none; + border: none; + box-shadow: none; } @@ -172,50 +172,16 @@ ARTICLE TABLE { margin-top: 32px; } -.rr {text-align: left; background: #FCD9A9; margin: 8px; border: 1px solid #B89F7C;} -.rrtop, .rrtop div, .rrbot, .rrbot div {height: 8px; width: 100%;} -.rrcontent {margin: 0px 8px; text-align: center;} - -.hrr {text-align: left; background: #DABC92; margin: 8px; border: 1px solid #B89F7C;} -.hrrtop, .hrrtop div, .hrrbot, .hrrbot div {height: 8px; width: 100%;} -.hrrcontent {margin: 0px 8px;} - -.setupblock { - text-align: center; - width: 350px; -} -.setupblock TEXTAREA { - width: 300px; - font-size: 0.75em; -} - -.helpable { - border-bottom: 1px dashed gray; -} - -.ok { - background: #AFA; -} -.bad { - background: #FAA; -} - -NAV .thumbblock { - float: none; - height: auto; -} -NAV .thumb { - margin-bottom: 0px; -} -.thumbblock { - width: 220px; - height: 220px; - display: inline-block; - float: left; -} .thumb { + width: 226px; display: inline-block; + zoom: 1; /* ie6 */ + *display: inline; /* ie6 */ text-align: center; - margin-bottom: 32px; + margin: 8px; +} +.thumb IMG { + border: 1px solid #B89F7C; + background: #FCD9A9; + padding: 8px; } - diff --git a/themes/warm/themelet.class.php b/themes/warm/themelet.class.php index fe585cba..d13596ce 100644 --- a/themes/warm/themelet.class.php +++ b/themes/warm/themelet.class.php @@ -1,55 +1,3 @@ id); - $h_view_link = make_link("post/view/$i_id", $query); - $h_image_link = $image->get_image_link(); - $h_thumb_link = $image->get_thumb_link(); - $h_tip = html_escape($image->get_tooltip()); - - // If file is flash or svg then sets thumbnail to max size. - if($image->ext == 'swf' || $image->ext == 'svg') { - $tsize = get_thumbnail_size($config->get_int('thumb_width'), $config->get_int('thumb_height')); - } - else{ - $tsize = get_thumbnail_size($image->width, $image->height); - } - - return " -
-
-
-
- - $h_tip - -
-
-
-
- "; - } - - - /** - * Put something in a box; specific to the default theme - */ - public function box($html) { - return " -
-
-
$html
-
-
- "; - } -} +class Themelet extends BaseThemelet {} ?>