From 9693f31404037cce3067f249d1cbbb93ef705cab Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 12 Jun 2007 21:29:16 +0000 Subject: [PATCH] add bidi.css for RTL support - we still use .rtl to be able to put special rules within the parsed stylesheet. since bidi.css is included after colours.css we ommit any colours there too. Still a lot to do here - i saw a lot of areas in need of some love (jumpbox, top links, topic/post icons, forum pagination) git-svn-id: file:///svn/phpbb/trunk@7754 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 + .../prosilver/template/overall_footer.html | 12 +- .../prosilver/template/overall_header.html | 22 +- phpBB/styles/prosilver/theme/bidi.css | 714 ++++++++++++++++++ phpBB/styles/prosilver/theme/buttons.css | 24 +- phpBB/styles/prosilver/theme/colours.css | 52 +- phpBB/styles/prosilver/theme/common.css | 11 - phpBB/styles/prosilver/theme/tweaks.css | 4 - 8 files changed, 784 insertions(+), 57 deletions(-) create mode 100644 phpBB/styles/prosilver/theme/bidi.css diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2f4bc5b848..b50e1de896 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -188,6 +188,7 @@ p a {
  • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
  • [Fix] Tiny language and grammar changes
  • [Fix] Several style related fixes, mainly fixing cross-browser issues
    • +
  • [Fix] Several RTL fixes within prosilver
  • [Fix] MCP looses forum_id in some panels (Bug #11255)
  • [Fix] Moderation queue used unfriendly notification of no posts/topics (Bug #11291)
  • [Fix] Array in Oracle DBAL not always set (Bug #11475)
    • @@ -270,6 +271,7 @@ p a {
  • [Fix] Unread flag for multipage topic wrongly set under some conditions (Bug #12127) - fix provided by asinshesq
  • [Fix] Able to delete posts within user prune panel (Bug #11849)
  • [Feature] Allow to specify dimensions of images manually on imageset config (Bug #11675)
    • +
  • [Fix] Correctly re-assign query result id after seeking rows (MSSQL/Firebird) (Bug #12369)
    • diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 19fd7ad3eb..a1da979548 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -6,15 +6,13 @@
    diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index bb5ca7e35b..30640453f3 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -89,6 +89,9 @@ {T_THEME_DATA} + + + @@ -125,7 +128,8 @@
    diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css new file mode 100644 index 0000000000..23bfdc45f3 --- /dev/null +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -0,0 +1,714 @@ +/* proSilver RTL definitions +---------------------------------------- */ + +/** +* common.css +*/ +.rtl h1 { + margin-right: 0; + margin-left: 200px; +} + +.rtl p.right { + text-align: left; +} + +/* Main blocks +---------------------------------------- */ +.rtl #logo { + float: right; + padding: 10px 10px 0 13px; +} + +/* Search box +--------------------------------------------- */ +.rtl #search-box { + float: left; + text-align: left; + margin-right: 0; + margin-left: 5px; +} + +.rtl #search-box li { + text-align: left; +} + +.rtl #search-box img { + margin-right: 0; + margin-left: 3px; +} + +.rtl #site-description { + float: right; +} + +.rtl #site-description h1 { + margin-left: 0; +} + +/* Round cornered boxes and backgrounds +---------------------------------------- */ +.rtl .post { + background-position: 0 0; +} + +/* Horizontal lists +----------------------------------------*/ +.rtl ul.linklist li { + float: right; + margin-right: 0; + margin-left: 5px; +} + +.rtl ul.linklist li.rightside, .rtl p.rightside { + float: left; + margin-right: 5px; + margin-left: 0; + text-align: left; +} + +/* Table styles +----------------------------------------*/ +.rtl table.table1 thead th { + padding: 0 3px 4px 0; +} + +.rtl table.table1 thead th span { + padding-left: 0; + padding-right: 7px; +} + +.rtl table.table1 tbody th { + text-align: right; +} + +/* Specific column styles */ +.rtl table.table1 .name { text-align: right; } +.rtl table.table1 .joined { text-align: right; } +.rtl table.table1 .active { text-align: right; } +.rtl table.table1 .info { text-align: right; } +.rtl table.table1 thead .autocol { padding-left: 0; padding-right: 1em; } + +.rtl table.table1 span.rank-img { + float: left; +} + +.rtl table.info tbody th { + text-align: left; +} + +.rtl .forumbg table.table1 { + margin: 0 -1px -1px -2px; +} + +/* Misc layout styles +---------------------------------------- */ +/* column[1-2] styles are containers for two column layouts + Also see tweaks.css */ +.rtl .column1 { + float: right; + clear: right; +} + +.rtl .column2 { + float: left; + clear: left; +} + +/* General classes for placing floating blocks */ +.rtl .left-box { + float: right; + text-align: right; +} + +.rtl .right-box { + float: left; + text-align: left; +} + +.rtl dl.details dt { + float: right; + text-align: left; +} + +.rtl dl.details dd { + margin-right: 16em; + margin-left: 0; + padding-right: 5px; + padding-left: 0; +} + +/* Pagination +---------------------------------------- */ +.rtl .pagination { + text-align: left; + float: left; +} + +/* Pagination in viewforum for multipage topics */ +.rtl .row .pagination { + float: left; + padding: 1px 0 1px 15px; +} + +/* Miscellaneous styles +---------------------------------------- */ +.rtl #forum-permissions { + float: left; + padding-right: 5px; + padding-left: 0; + margin-right: 5px; + margin-left: 0; + text-align: left; +} + +/** +* links.css +*/ + +/* Back to top of page */ +.rtl .back2top { + text-align: left; +} + +.rtl a.top { + float: left; +} + +.rtl a.top2 { + padding-left: 0; + padding-right: 15px; +} + +/* Arrow links */ +/* +a.up { background: none no-repeat left center; } +a.down { background: none no-repeat right center; } +a.left { background: none no-repeat 3px 60%; } +a.right { background: none no-repeat 95% 60%; } + +a.up, a.up:link, a.up:active, a.up:visited { + padding-left: 10px; +} + +a.up:hover { + background-position: left top; + background-color: transparent; +} + +a.down, a.down:link, a.down:active, a.down:visited { + padding-right: 10px; +} + +a.down:hover { + background-position: right bottom; +} +*/ + +.rtl a.left, .rtl a.left:active, .rtl a.left:visited { + padding-left: 0; + padding-right: 12px; +} + +/* +a.left:hover { + background-position: 0 60%; +} +*/ + +.rtl a.right, .rtl a.right:active, .rtl a.right:visited { + padding-left: 12px; + padding-right: 0; +} +/* +a.right:hover { + background-position: 100% 60%; +} +*/ + +/** +* content.css +*/ +.rtl ul.topiclist dt { + float: right; +} + +.rtl ul.topiclist dd { + float: right; + border-right-width: 1px; + border-right-style: solid; + border-left: none; +} + +.rtl ul.topiclist li.row dt a.subforum { + padding: 0 12px 0 0; + background-position: 100% 100%; +} + +.rtl .forum-image { + float: right; + margin-right: 0; + margin-left: 5px; +} + +.rtl li.header dt, .rtl li.header dd { + border-right-width: 0; +} + +.rtl li.header dd { + margin-left: 0; + margin-right: 1px; +} + +.rtl dl.icon { + background-position: 99.5% 50%; +} + +.rtl li.header dl.icon dt { + /* Tweak for headers alignment when folder icon used */ + padding-right: 0; + padding-left: 44px; +} + +.rtl dl.icon dt { + padding-left: 0; + padding-right: 45px; /* Space for folder icon */ +} + +.rtl dd.lastpost span, .rtl ul.topiclist dd.searchby span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span { + padding-left: 0; + padding-right: 5px; +} + +.rtl dd.mark { + float: left !important; +} + +.rtl ul.topiclist dd.searchextra { + margin-left: 0; + margin-right: 5px; + border-right: none; +} + +/* Post body styles +----------------------------------------*/ +.rtl .postbody { + float: right; +} + +/* Topic review panel +----------------------------------------*/ +.rtl #topicreview { + padding-right: 0; + padding-left: 5px; +} + +/* Content container styles +----------------------------------------*/ +.rtl .content ul, .rtl .content ol { + margin-right: 3em; + margin-left: 0; +} + +/* Post author */ +.rtl p.author { + margin: 0 0 0.6em 15em; +} + +.rtl .signature { + clear: right; +} + +.rtl .notice { + clear: right; +} + +/* Jump to post link for now */ +.rtl ul.searchresults { + text-align: left; +} + +/* BB Code styles +----------------------------------------*/ +/* Quote block */ +.rtl blockquote { + margin: 0.5em 25px 0 1px; +} + +.rtl blockquote blockquote { + /* Nested quotes */ + margin: 0.5em 15px 0 1px; +} + +.rtl blockquote cite { + /* Username/source of quoter */ + margin-right: 20px; + margin-left: 0; +} + +.rtl blockquote dl.codebox { + margin-right: 0; +} + +/* Attachments +----------------------------------------*/ +.rtl .attachbox { + float: right; + margin: 5px 0 5px 5px; + clear: right; +} + +.rtl .attachbox dd { + clear: right; +} + +.rtl .attachbox p { + clear: right; +} + +.rtl .attachbox p.stats { + clear: right; +} + +/* Post poll styles +----------------------------------------*/ +.rtl fieldset.polls dt { + text-align: right; + float: right; + border-left: none; +} + +.rtl fieldset.polls dd { + float: right; + border-right: none; + margin-right: 0; +} + +.rtl fieldset.polls dd div { + text-align: left; +} + +.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 { + border-left-width: 1px; + border-left-style: solid; + border-right: none; +} + +/* Poster profile block +----------------------------------------*/ +.rtl .postprofile { + border-left: none; + border-right-width: 1px; + border-right-style: solid; + float: left; +/* text-align: right; */ +} + +.rtl .pm .postprofile { + border-right-width: 1px; + border-right-style: solid; + border-left: none; +} + +.rtl .postprofile dd, .rtl .postprofile dt { + margin-left: 0; + margin-right: 8px; +} + +.rtl .online { + background-position: 0 0; +} + +.rtl dl.pmlist dd { + margin-right: 61% !important; + margin-left: 0 !important; +} + +/** +* buttons.css +*/ +/* Rollover buttons + Based on: http://wellstyled.com/css-nopreload-rollovers.html +----------------------------------------*/ +.rtl .buttons { + float: right; +} + +/* Rollover state */ +.rtl .buttons div { + float: right; + margin: 0 0 0 5px; +} + +/* Sub-header (navigation bar) +--------------------------------------------- */ +.rtl a.print, .rtl a.sendemail, .rtl a.fontsize { + text-align: right; +} + +/* Icon images +---------------------------------------- */ +.rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, +.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search { + background-position: 100% 50%; + padding: 1px 17px 0 0; +} + +/* Poster profile icons +----------------------------------------*/ +/* Rollover state */ +.rtl ul.profile-icons li { + float: right; + margin: 0 0 3px 6px; +} + +/* Positioning of moderator icons */ +.rtl .postbody ul.profile-icons { + float: left; +} + +/* Fix profile icon default margins */ +.rtl ul.profile-icons li.edit-icon { margin: 0 3px 0 0; } +.rtl ul.profile-icons li.quote-icon { margin: 0 10px 0 0; } +.rtl ul.profile-icons li.info-icon, .rtl ul.profile-icons li.report-icon { margin: 0 0 0 3px; } + +/** +* cp.css +*/ +/* proSilver Control Panel Styles +---------------------------------------- */ + + +/* Main CP box +----------------------------------------*/ +.rtl #cp-menu { + float: right; +} + +.rtl #cp-main { + float: right; +} + +.rtl #cp-main .panel ol { + margin-right: 2em; + margin-left: 0; +} + +.rtl #cp-main .pagination { + float: left; +} + +.rtl #cp-main .buttons { + margin-right: 0; + margin-left: 0; +} + +/* CP tabbed menu +----------------------------------------*/ +.rtl #tabs { + margin: 20px 7px -1px 0; +} + +.rtl #tabs a { + float: right; +} + +/*.rtl #tabs a span { + float: right; +}*/ + +/* Mini tabbed menu used in MCP +----------------------------------------*/ +.rtl #minitabs { + margin: -20px 0 0 7px; +} + +.rtl #minitabs li { + float: left; + margin-right: 2px; + margin-left: 0; +} + +/* UCP navigation menu +----------------------------------------*/ + +/* Preferences pane layout +----------------------------------------*/ +.rtl #cp-main h2 { + margin-left: 0; + margin-right: 10px; +} + +/* Friends list */ +.rtl .cp-mini { + margin: 10px 5px 10px 15px; +} + +/* PM Styles +----------------------------------------*/ + +/* Defined rules list for PM options */ +.rtl ol.def-rules { + padding-right: 0; +} + +/* PM marking colours */ +.rtl .pm-legend { + border-right-width: 10px; + border-right-style: solid; + border-left-width: 0; + padding-left: 0; + padding-right: 3px; +} + +/* Avatar gallery */ +.rtl #gallery label { + float: right; +} + +/** +* forms.css +*/ + +/* General form styles +----------------------------------------*/ + +.rtl option { + padding-right: 0; + padding-left: 1em; +} + +.rtl label { + padding-right: 0; + padding-left: 5px; +} + +/* Definition list layout for forms +---------------------------------------- */ +.rtl fieldset dt { + float: right; + text-align: right; +} + +.rtl fieldset dd { + margin-left: 0; + margin-right: 41%; +} + +/* Specific layout 1 */ +.rtl fieldset.fields1 dt { + border-left-width: 0; + border-right-width: 1px; +} + +.rtl fieldset.fields1 dd { + margin-right: 10em; + margin-left: 0; + border-right-width: 0; + border-left-width: 1px; +} + +/* Specific layout 2 */ +.rtl fieldset.fields2 dt { + border-right-width: 1px; + border-left-width: 0; +} + +.rtl fieldset.fields2 dd { + margin-right: 16em; + margin-left: 0; + border-left-width: 1px; + border-right-width: 0; +} + +/* Form elements */ +.rtl dt label { + text-align: right; +} + +.rtl dd input, .rtl dd textarea { + margin-left: 3px; + margin-right: 0; +} + +/* Quick-login on index page */ +.rtl fieldset.quick-login input.inputbox { + margin-left: 5px; + margin-right: 0; +} + +.rtl fieldset.quick-login label { + padding-left: 2px; + padding-right: 0; +} + +/* Display options on viewtopic/viewforum pages */ +.rtl fieldset.display-options label { + padding-left: 2px; + padding-right: 0; +} + +/* Display actions for ucp and mcp pages */ +.rtl fieldset.display-actions { + text-align: left; + padding-left: 1em; + padding-right: 0; +} + +.rtl fieldset.display-actions label { + padding-left: 2px; + padding-right: 0; +} + +/* MCP forum selection*/ +.rtl fieldset.forum-selection { + float: left; +} + +.rtl fieldset.forum-selection2 { + float: left; +} + +/* Jumpbox */ +.rtl fieldset.jumpbox { + text-align: left; +} + +.rtl fieldset.quickmod { + float: left; + text-align: left; +} + +/* Posting page styles +----------------------------------------*/ + +/* Emoticons panel */ +.rtl #smiley-box { + float: left; +} + +/* Form button styles +---------------------------------------- */ + +/* Topic and forum Search */ +.rtl .search-box { + margin-right: 5px; + margin-left: 0; + float: right; +} + +.rtl input.search { + background-position: right 1px; + padding-right: 17px; + padding-left: 0; +} + +/** +* tweaks.css +*/ + +* html .rtl #search-box { + margin-left: 35px; + margin-right: 0; +} + diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 7e402f4b16..b3a4e68705 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -10,10 +10,6 @@ height: auto; } -.rtl .button { - float: right; -} - /* Rollover state */ .buttons div { float: left; @@ -21,11 +17,6 @@ background-position: 0 100%; } -.rtl .button div { - float: right; - margin: 0 0 0 5px; -} - /* Rolloff state */ .buttons div a { display: block; @@ -93,19 +84,13 @@ a.fontsize:hover { /* Icon images ---------------------------------------- */ .sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout, -.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search{ +.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search { background-position: 0 50%; background-repeat: no-repeat; background-image: none; padding: 1px 0 0 17px; } -.rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, -.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search{ - background-position: 100% 50%; - padding: 1px 17px 0 0; -} - /* Poster profile icons ----------------------------------------*/ ul.profile-icons { @@ -120,10 +105,6 @@ ul.profile-icons li { background-position: 0 100%; } -.rtl ul.profile-icons li { - margin: 0 0 3px 6px; -} - /* Rolloff state */ ul.profile-icons li a { display: block; @@ -186,6 +167,3 @@ ul.profile-icons li.edit-icon { margin: 0 0 0 3px; } ul.profile-icons li.quote-icon { margin: 0 0 0 10px; } ul.profile-icons li.info-icon, ul.profile-icons li.report-icon { margin: 0 3px 0 0; } -.rtl ul.profile-icons li.edit-icon { margin: 0 3px 0 0; } -.rtl ul.profile-icons li.quote-icon { margin: 0 10px 0 0; } -.rtl ul.profile-icons li.info-icon, .rtl ul.profile-icons li.report-icon { margin: 0 0 0 3px; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index e533b8f070..104ada6185 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -372,6 +372,11 @@ ul.topiclist dd { border-left-color: #FFFFFF; } +.rtl ul.topiclist dd { + border-right-color: #fff; + border-left-color: none; +} + ul.topiclist li.row dt a.subforum.read { background-image: url("{IMG_SUBFORUM_READ_SRC}"); } @@ -397,6 +402,11 @@ li.row:hover dd { border-left-color: #CCCCCC; } +.rtl li.row:hover dd { + border-right-color: #CCCCCC; + border-left-color: none; +} + li.header dt, li.header dd { color: #FFFFFF; } @@ -507,8 +517,7 @@ dl.codebox code { color: #666666; } -.attachbox p.stats -{ +.attachbox p.stats { color: #666666; } @@ -555,36 +564,60 @@ fieldset.polls dd div { color: #FFFFFF; } +.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 { + border-right-color: none; +} + .pollbar1 { background-color: #AA2346; border-bottom-color: #74162C; border-right-color: #74162C; } +.rtl .pollbar1 { + border-left-color: #74162C; +} + .pollbar2 { background-color: #BE1E4A; border-bottom-color: #8C1C38; border-right-color: #8C1C38; } +.rtl .pollbar2 { + border-left-color: #8C1C38; +} + .pollbar3 { background-color: #D11A4E; border-bottom-color: #AA2346; border-right-color: #AA2346; } +.rtl .pollbar3 { + border-left-color: #AA2346; +} + .pollbar4 { background-color: #E41653; border-bottom-color: #BE1E4A; border-right-color: #BE1E4A; } +.rtl .pollbar4 { + border-left-color: #BE1E4A; +} + .pollbar5 { background-color: #F81157; border-bottom-color: #D11A4E; border-right-color: #D11A4E; } +.rtl .pollbar5 { + border-left-color: #D11A4E; +} + /* Poster profile block ----------------------------------------*/ .postprofile { @@ -592,10 +625,20 @@ fieldset.polls dd div { border-left-color: #FFFFFF; } +.rtl .postprofile { + border-right-color: #FFFFFF; + border-left-color: none; +} + .pm .postprofile { border-left-color: #DDDDDD; } +.rtl .pm .postprofile { + border-right-color: #DDDDDD; + border-left-color: none; +} + .postprofile strong { color: #000000; } @@ -604,6 +647,11 @@ fieldset.polls dd div { background-image: url("{T_IMAGESET_LANG_PATH}/icon_user_online.gif"); } +.rtl .online { + background-image: url("{T_IMAGESET_LANG_PATH}/icon_user_online_rtl.gif"); +} + + /* -------------------------------------------------------------- Colours and backgrounds for buttons.css diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index f870a87d3c..5ee56f2f0d 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -147,13 +147,6 @@ a#logo:hover { white-space: nowrap; /* For Opera */ } -.rtl #search-box { - float: left; - text-align: left; - margin-right: 0; - margin-left: 5px; -} - #search-box #keywords { width: 95px; background-color: #FFF; @@ -184,10 +177,6 @@ a#logo:hover { width: 70%; } -.rtl #site-description { - float: right; -} - #site-description h1 { margin-right: 0; } diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index e3a2557fc5..15ef6450f6 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -58,7 +58,3 @@ dl.icon { margin-right: 35px; } -* html .rtl #search-box { - margin-right: 0; - margin-left: 35px; -} \ No newline at end of file