aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-162-0/+2
|\ | | | | | | | | * develop-olympus: [ticket/8636] Add resync option to topic_view moderation page
| * Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympusOleg Pudeyev2012-03-162-0/+2
| |\ | | | | | | | | | | | | * nickvergessen/ticket/8636: [ticket/8636] Add resync option to topic_view moderation page
| | * [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-232-0/+2
| | | | | | | | | | | | PHPBB3-8636
* | | [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queueJoas Schilling2012-03-142-2/+2
| | | | | | | | | | | | PHPBB3-10690
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-286-9/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9220] Remove margin on table.table1 so it's centered in the blue box. Conflicts: phpBB/styles/prosilver/template/memberlist_leaders.html
| * | Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympusAndreas Fischer2012-02-286-10/+18
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/9220: [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
| | * | [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.Joas Schilling2012-02-276-10/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here was, that we use width: 100% in combination with the negative margin. This causes the element to be just moved to the side, so it's not centered anymore. width: auto would fix this, but it causes strange behaviour on IE and looks even more ugly. So I decided to just remove the margin at all. The border is now 1px thicker for all sides. PHPBB3-9220
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-263-3/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10453] Fixing spacing
| * | [ticket/10453] Fixing spacingVjacheslav Trushkin2012-02-263-3/+3
| | | | | | | | | | | | | | | | | | Fixing spacing PHPBB3-10453
* | | Merge remote-tracking branch 'nickvergessen/ticket/10458' into developAndreas Fischer2012-02-251-5/+2
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10458: [ticket/10458] Fix xHTML errors when print-viewing PMs
| * | | [ticket/10458] Fix xHTML errors when print-viewing PMsJoas Schilling2012-02-231-5/+2
| | | | | | | | | | | | | | | | PHPBB3-10458
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-254-3/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10456] Add tabindex to subsilver2 captcha
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympusAndreas Fischer2012-02-254-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10456: [ticket/10456] Add tabindex to subsilver2 captcha
| | * | | [ticket/10456] Add tabindex to subsilver2 captchaJoas Schilling2012-02-214-3/+4
| | | |/ | | |/| | | | | | | | | | | | | | | | | Did not set tabindex on registration page, as the hole page does not have any. PHPBB3-10456
* | | | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-02-246-47/+35
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | * develop-olympus: [ticket/10453] PM viewmessage page is misplacing the online icon [ticket/10453] PM viewmessage page is misplacing the online icon
| * | Merge branch 'ticket/raimon/10453' into develop-olympusVjacheslav Trushkin2012-02-246-47/+35
| |\ \ | | |/ | |/| | | | | | | | | | * ticket/raimon/10453: [ticket/10453] PM viewmessage page is misplacing the online icon [ticket/10453] PM viewmessage page is misplacing the online icon
| | * [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-143-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the position: absolute value, and made it so that if the buttons are bigger the text move with it, also added support for bidi.css (text right to left). PHPBB3-10453 http://tracker.phpbb.com/browse/PHPBB3-10453
| | * [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-135-50/+24
| | | | | | | | | | | | | | | | | | PHPBB3-10453 http://tracker.phpbb.com/browse/PHPBB3-10453
* | | Merge remote-tracking branch 'cyberalien/ticket/10378' into developIgor Wiedler2012-02-171-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10378: [ticket/10378] Missing entries from imageset to css conversion [ticket/10378] Imageset to css convertor typo
| * | | [ticket/10378] Missing entries from imageset to css conversionVjacheslav Trushkin2012-01-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Adding missing entries from imageset to css conversion to prosilver/theme/en/stylesheet.css PHPBB3-10378
* | | | Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-1743-255/+148
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (325 commits) [ticket/10641] Update MCP template with new plurality forms [ticket/10637] Leftovers from implementation of extensions in convertor [ticket/10637] Leftovers from implementation of extensions in develop tools [ticket/10637] Leftovers from implementation of extensions in mcp_post [ticket/10637] Leftovers from implementation of extensions in mcp_main [ticket/10637] Leftovers from implementation of extensions [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header(). [ticket/10633] Stop leaking filename of attachments when thumbnail is requested [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators(). [ticket/10634] Specify module type when viewing profile [ticket/10634] Changing p_master::is_full_class [ticket/10569] Invalid string comparison in prosilver [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop [ticket/10512] Call startup.php from tests/bootstrap.php [ticket/10535] Delete no longer needed email confirm language entries. [ticket/9914] Add backup warning to updater. [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles ...
| * | | | [ticket/10641] Update MCP template with new plurality formsPatrick Webster2012-02-112-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the MCP template according to PHPBB3-10345 PHPBB3-10641
| * | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-102-4/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| | * | | Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympusOleg Pudeyev2012-02-102-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10569: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| | | * | | [ticket/10569] Invalid string comparison in prosilverVjacheslav Trushkin2012-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in prosilver PHPBB3-10569
| | | * | | [ticket/10569] Invalid string comparison in subsilver2Vjacheslav Trushkin2012-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in subsilver2 PHPBB3-10569
| * | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-072-0/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles
| | * | | | [ticket/10616] Add template inheritance to default stylesVjacheslav Trushkin2012-02-032-0/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Adding template inheritance field to prosilver and subsilver2 PHPBB3-10616
| * | | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-034-20/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| | * | | | [ticket/10535] Forgot a subsilver2 change. *doh*David King2011-12-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| | * | | | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| | * | | | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-152-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-026-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
| | * | | | [ticket/10542] Remove class="postlink" in subsilver2 faq_body.htmlRichard Foote2011-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class="postlink" is not defined in stylesheet.css so remove it from styles/subsilver2/template/faq_body.html PHPBB3-10542
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-165-35/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485 Conflicts: phpBB/styles/prosilver/template/forumlist_body.html phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/10504' into ↵Andreas Fischer2011-12-165-34/+20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10504: [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
| | | * | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632Joas Schilling2011-12-083-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/6632] Better viewing of topics for wide screen displays" This reverts commit bb733b0204aef71c40290a9c8db8ad0a7e3e3d0a. PHPBB3-6632 PHPBB3-10504
| | | * | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408Joas Schilling2011-12-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and MCP" This reverts commit 88aacd0f2cffdf75af71d749c6ea602ed3912651. PHPBB3-6632 PHPBB3-10408 PHPBB3-10504
| | | * | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485Joas Schilling2011-12-084-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632" This reverts commit c67633577f276727e1d15106a87517b97c8a4d1a. PHPBB3-6632 PHPBB3-10485 PHPBB3-10504
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-162-92/+85
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | | | | | | * develop-olympus: [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 [ticket/8996] Revert initial fix to keep old behaviour on empty selection
| | * | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2Joas Schilling2011-12-151-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey" This reverts commit 219bdbaf7044bd203755ed138d109cf39ccdb837. PHPBB3-8996
| | * | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selectionJoas Schilling2011-12-152-80/+77
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp" This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc. PHPBB3-8996
| | * | | [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-11-214-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1 PHPBB3-6632 PHPBB3-10485
| | * | | [develop-olympus] Bumping version numbers to final for 3.0.10 releases.Andreas Fischer2011-11-208-8/+8
| | | | |
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10344' into developOleg Pudeyev2011-11-204-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10344: [ticket/10344] Add attachment icons to list of reported and queued posts/topics
| | * | | | [ticket/10344] Add attachment icons to list of reported and queued posts/topicsJoas Schilling2011-08-274-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10344
| * | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-192-85/+92
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympusOleg Pudeyev2011-11-192-85/+92
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8996: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
| | | * | | | [ticket/8996] Also fix the BBCode bug in subsilver2 and acpJoas Schilling2011-11-182-77/+80
| | | | | | |