1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-01 20:33:16 +02:00

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

* 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
103 changed files with 1194 additions and 411 deletions

View File

@@ -306,31 +306,17 @@ dl.mini dd {
}
/* PM panel adjustments */
.pm-panel-header {
margin: 0;
padding-bottom: 10px;
border-bottom: 1px dashed transparent;
.reply-all a.left {
background-position: 3px 60%;
}
.reply-all a.left:hover {
background-position: 0px 60%;
}
.reply-all {
display: block;
padding-top: 4px;
clear: both;
float: left;
}
.pm-panel-message {
padding-top: 10px;
}
.pm-return-to {
padding-top: 23px;
}
#cp-main .pm-message-nav {
margin: 0;
padding: 2px 10px 5px 10px;
border-bottom: 1px dashed transparent;
font-size: 11px;
padding-top: 5px;
}
/* Defined rules list for PM options */