mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-02 12:53:37 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colors

Browse Source 
* develop: (117 commits)
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
  [ticket/10704] minor typo in a comment
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
  [ticket/10691] Fixed the speed of creating search index
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
  [ticket/10689] Fix "First character"-option in "Find a member"-search
  ...

Conflicts:
	phpBB/styles/prosilver/theme/cp.css
This commit is contained in:
Vjacheslav Trushkin
2012-03-24 11:45:53 +02:00
parent f17449e5ff cc13bac412
commit 583da4274f
103 changed files with 1194 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/styles/prosilver/theme/colours.css
View File

@@ -933,12 +933,6 @@ dl.mini dt {
color: #000000 !important;
}
/* PM panel adjustments */
.pm-panel-header,
#cp-main .pm-message-nav {
border-bottom-color: #A4B3BF;
}
/* PM marking colours */
.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
border-left-color: #BC2A4D;