diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-29 13:00:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-29 13:00:54 +0000 |
| commit | 6f37638caee649060dc9f933af6773652a813035 (patch) | |
| tree | 897c7056941c2fc3452bd46053ee56115a6a82fc /phpBB/styles | |
| parent | 1c22e7a40728fde76b9b9e5afd168f8eb0313268 (diff) | |
| download | forums-6f37638caee649060dc9f933af6773652a813035.tar forums-6f37638caee649060dc9f933af6773652a813035.tar.gz forums-6f37638caee649060dc9f933af6773652a813035.tar.bz2 forums-6f37638caee649060dc9f933af6773652a813035.tar.xz forums-6f37638caee649060dc9f933af6773652a813035.zip | |
- fixing some very very nasty opera bugs by changing the clearing method we use.
- also properly apply preg_quote to some strings.
git-svn-id: file:///svn/phpbb/trunk@7808 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
5 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 38dd77bdbe..500ea91c51 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -74,7 +74,7 @@ function bbstyle(bbnumber) function bbfontstyle(bbopen, bbclose) { theSelection = false; - + var textarea = document.forms[form_name].elements[text_name]; textarea.focus(); @@ -325,7 +325,7 @@ function colorPalette(dir, width, height) for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write('<td bgcolor="#' + color + '">'); + document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">'); document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); document.writeln('</td>'); } diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 5f1f061532..56f8cdf709 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -62,7 +62,8 @@ <div id="colour_palette" style="display: none;"> <dl style="clear: left;"> <dt><label>{L_FONT_COLOR}:</label></dt> - <dd><script type="text/javascript"> + <dd> + <script type="text/javascript"> <!-- function change_palette() { @@ -79,7 +80,7 @@ } } - colorPalette('h', 15, 5); + colorPalette('h', 15, 10); //--> </script> </dd> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index f10cbd518b..9aba7614d2 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -6,7 +6,7 @@ </div> <!-- IF S_DISPLAY_HISTORY --> - <fieldset class="display-options"> + <fieldset class="display-options clearfix"> <a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a> <a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a> </fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index fea21f9693..6ffe6f69c3 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -107,7 +107,7 @@ <script type="text/javascript"> <!-- - var date_format = '{DATE_FORMAT}'; + var date_format = '{A_DATE_FORMAT}'; function customDates() { diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 15ef6450f6..6eb8761b62 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -33,17 +33,18 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra * html .column1, * html .column2 { width: 45%; } /* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above) - From http://www.positioniseverything.net/easyclearing.html */ + From http://www.positioniseverything.net/easyclearing.html #tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; -} +}*/ -#tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls { +.clearfix, #tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls { height: 1%; + overflow: auto; } /* Simple fix so forum and topic lists always have a min-height set, even in IE6 |