[dw-free] Adult content div box colors hardcoded
[commit: http://hg.dwscoalition.org/dw-free/rev/759db912e36f]
http://bugs.dwscoalition.org/show_bug.cgi?id=2243
Do not hardcode adult content div styling.
Patch by
foxfirefey.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=2243
Do not hardcode adult content div styling.
Patch by
Files modified:
- htdocs/misc/adult_concepts.bml
- htdocs/misc/adult_explicit.bml
- htdocs/misc/adult_explicit_blocked.bml
- htdocs/stc/blueshift/blueshift.css
- htdocs/stc/celerity/celerity.css
- htdocs/stc/gradation/gradation-vertical.css
--------------------------------------------------------------------------------
diff -r 00e6eaf8e071 -r 759db912e36f htdocs/misc/adult_concepts.bml
--- a/htdocs/misc/adult_concepts.bml Wed Jan 06 02:08:20 2010 +0000
+++ b/htdocs/misc/adult_concepts.bml Wed Jan 06 02:14:11 2010 +0000
@@ -46,7 +46,7 @@ body<=
$markedby = $journal->adult_content_marker;
}
- $ret .= "<div style='background-color: #ffffd4; border: 1px solid black; padding: 0 10px;'>";
+ $ret .= "<div class='adult_warning adult_concepts'>";
$ret .= "<h1 style='text-align: center;'>$ML{'.title'}</h1>";
$ret .= "<p>" . BML::ml( '.message.concepts.by' . $markedby, { journal => $journal->ljuser_display, poster => $poster->ljuser_display } ) . "</p>";
$ret .= DW::Logic::AdultContent->interstitial_reason( $journal, $entry );
diff -r 00e6eaf8e071 -r 759db912e36f htdocs/misc/adult_explicit.bml
--- a/htdocs/misc/adult_explicit.bml Wed Jan 06 02:08:20 2010 +0000
+++ b/htdocs/misc/adult_explicit.bml Wed Jan 06 02:14:11 2010 +0000
@@ -48,7 +48,7 @@ body<=
my $extra_for_no_age = $remote && !$remote->best_guess_age ? BML::ml( '.setage', { aopts => "href='$LJ::SITEROOT/manage/profile/'" } ) : "";
- $ret .= "<div style='background-color: #ffffd4; border: 1px solid black; padding: 0 10px;'>";
+ $ret .= "<div class='adult_warning adult_explicit'>";
$ret .= "<h1 style='text-align: center;'>$ML{'.title'}</h1>";
if ( $remote && $remote->best_guess_age ) {
$ret .= "<p>" . BML::ml( '.message.explicit.18plus.by' . $markedby, { journal => $journal->ljuser_display, poster => $poster->ljuser_display } ) . "</p>";
diff -r 00e6eaf8e071 -r 759db912e36f htdocs/misc/adult_explicit_blocked.bml
--- a/htdocs/misc/adult_explicit_blocked.bml Wed Jan 06 02:08:20 2010 +0000
+++ b/htdocs/misc/adult_explicit_blocked.bml Wed Jan 06 02:14:11 2010 +0000
@@ -31,7 +31,7 @@ body<=
$markedby = $journal->adult_content_marker;
}
- $ret .= "<div style='background-color: #ffffd4; border: 1px solid black; padding: 0 10px;'>";
+ $ret .= "<div class="adult_warning adult_blocked">";
$ret .= "<h1 style='text-align: center;'>$ML{'.title'}</h1>";
$ret .= "<p>" . BML::ml( '.message.explicit.blocked.by' . $markedby, { journal => $journal->ljuser_display, poster => $poster->ljuser_display } ) . "</p>";
$ret .= DW::Logic::AdultContent->interstitial_reason( $journal, $entry );
diff -r 00e6eaf8e071 -r 759db912e36f htdocs/stc/blueshift/blueshift.css
--- a/htdocs/stc/blueshift/blueshift.css Wed Jan 06 02:08:20 2010 +0000
+++ b/htdocs/stc/blueshift/blueshift.css Wed Jan 06 02:14:11 2010 +0000
@@ -1188,3 +1188,11 @@ li.profile_trackuser_disabled, li.profil
{
background-color: #eee;
}
+
+/* Adult warning interstitals */
+
+div.adult_warning {
+ background-color: #E6ECF9;
+ border: 1px solid #3960A0;
+ padding: 0 10px;
+}
diff -r 00e6eaf8e071 -r 759db912e36f htdocs/stc/celerity/celerity.css
--- a/htdocs/stc/celerity/celerity.css Wed Jan 06 02:08:20 2010 +0000
+++ b/htdocs/stc/celerity/celerity.css Wed Jan 06 02:14:11 2010 +0000
@@ -1225,3 +1225,11 @@ li.profile_trackuser_disabled, li.profil
{
background-color: #eee;
}
+
+/* Adult warning interstitals */
+
+div.adult_warning {
+ background-color: #DDDDAA;
+ border: 1px solid #999966;
+ padding: 0 10px;
+}
diff -r 00e6eaf8e071 -r 759db912e36f htdocs/stc/gradation/gradation-vertical.css
--- a/htdocs/stc/gradation/gradation-vertical.css Wed Jan 06 02:08:20 2010 +0000
+++ b/htdocs/stc/gradation/gradation-vertical.css Wed Jan 06 02:14:11 2010 +0000
@@ -1276,6 +1276,12 @@ div.box {
color: #fff !important;
}
+div.adult_warning {
+ background-color: #333;
+ border: 1px solid #fff;
+ padding: 0 10px;
+}
+
/* This makes the FAQ header not overlap with itself */
.box h1 {
line-height: 1em;
--------------------------------------------------------------------------------
