Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rollback of #197425 following on Steven Witten's discontent on how it looks in Garland

6.x
Gábor Hojtsy 2007-12-17 15:05:10 +00:00
parent 29f443761f
commit 5272329fbc
5 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/filter/filter.module
View File

@ -167,7 +167,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) {
switch ($delta) { switch ($delta) {
case 0: case 0:
if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) { if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) {
if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <blockquote> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) { if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) {
switch ($long) { switch ($long) {
case 0: case 0:
return t('Allowed HTML tags: @tags', array('@tags' => $allowed_html)); return t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
@ -662,7 +662,7 @@ function _filter_html_settings($format) {
$form['filter_html']["allowed_html_$format"] = array( $form['filter_html']["allowed_html_$format"] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Allowed HTML tags'), '#title' => t('Allowed HTML tags'),
'#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <blockquote> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
'#size' => 64, '#size' => 64,
'#maxlength' => 255, '#maxlength' => 255,
'#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'), '#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'),
@ -687,7 +687,7 @@ function _filter_html_settings($format) {
*/ */
function _filter_html($text, $format) { function _filter_html($text, $format) {
if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) { if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) {
$allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '<a> <em> <strong> <blockquote> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), -1, PREG_SPLIT_NO_EMPTY); $allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), -1, PREG_SPLIT_NO_EMPTY);
$text = filter_xss($text, $allowed_tags); $text = filter_xss($text, $allowed_tags);
} }

7
themes/bluemarine/style-rtl.css
View File

@ -2,13 +2,6 @@
body { body {
direction: rtl; direction: rtl;
} }
blockquote {
padding: 0 15px 0 0;
margin: 1.1em 35px 1.1em 40px;
border-left-style: none;
border-right-style: solid;
border-right-width: 4px;
}
#logo img { #logo img {
float: right; float: right;
} }

8
themes/bluemarine/style.css
View File

@ -29,14 +29,6 @@ p {
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 0.9em; margin-bottom: 0.9em;
} }
blockquote {
padding: 0 0 0 15px; /* LTR */
margin: 1.1em 40px 1.1em 35px; /* LTR */
border-left-style: solid; /* LTR */
border-left-width: 4px; /* LTR */
border-color: #69c;
font-style: italic;
}
a { a {
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;

8
themes/garland/style-rtl.css
View File

@ -11,14 +11,6 @@ body {
direction: rtl; direction: rtl;
} }
blockquote {
padding: 0 15px 0 0;
margin: 1.1em 35px 1.1em 40px;
border-left-style: none;
border-right-style: solid;
border-right-width: 4px;
}
ol li, ul li { ol li, ul li {
margin: 0.4em .5em 0.4em 0; margin: 0.4em .5em 0.4em 0;
} }

10
themes/garland/style.css
View File

@ -71,16 +71,6 @@ p {
padding: 0; padding: 0;
} }
blockquote {
padding: 0 0 0 15px; /* LTR */
margin: 1.1em 40px 1.1em 35px; /* LTR */
border-left-style: solid; /* LTR */
border-left-width: 4px; /* LTR */
/* Same as link color, keeps this colorable. */
border-color: #027AC6;
font-style: italic;
}
a:link, a:visited { a:link, a:visited {
color: #027AC6; color: #027AC6;
text-decoration: none; text-decoration: none;