mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +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
@@ -591,6 +591,19 @@
|
||||
/* PM Styles
|
||||
----------------------------------------*/
|
||||
|
||||
/* PM panel adjustments */
|
||||
.rtl .reply-all a.right {
|
||||
background-position: 5% 60%;
|
||||
}
|
||||
|
||||
.rtl .reply-all a.right:hover {
|
||||
background-position: 3% 60%;
|
||||
}
|
||||
|
||||
.rtl .reply-all {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
/* Defined rules list for PM options */
|
||||
.rtl ol.def-rules {
|
||||
padding-right: 0;
|
||||
@@ -755,3 +768,33 @@
|
||||
.rtl #wrap, .rtl .headerbar, .rtl #site-description, .rtl .navbar {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* Former imageset */
|
||||
.rtl .imageset.site_logo {
|
||||
padding-right: 139px;
|
||||
padding-left: 0;
|
||||
}
|
||||
.rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum, .rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread {
|
||||
padding-right: 27px;
|
||||
padding-left: 0;
|
||||
}
|
||||
.rtl .imageset.subforum_read, .rtl .imageset.subforum_unread, .rtl .imageset.icon_post_target, .rtl .imageset.icon_post_target_unread, .rtl .imageset.icon_topic_latest, .rtl .imageset.icon_topic_newest {
|
||||
padding-right: 11px;
|
||||
padding-left: 0;
|
||||
}
|
||||
.rtl .imageset.icon_back_top {
|
||||
padding-right: 11px;
|
||||
padding-left: 0;
|
||||
}
|
||||
.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
|
||||
padding-right: 20px;
|
||||
padding-left: 0;
|
||||
}
|
||||
.rtl .imageset.icon_topic_attach {
|
||||
padding-right: 7px;
|
||||
padding-left: 0;
|
||||
}
|
||||
.rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved {
|
||||
padding-right: 16px;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -376,7 +376,19 @@ table.info tbody th {
|
||||
}
|
||||
|
||||
.forumbg table.table1 {
|
||||
margin: 0 -2px -1px -1px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.forumbg-table > .inner {
|
||||
margin: 0 -1px;
|
||||
}
|
||||
|
||||
.forumbg-table > .inner > span.corners-top {
|
||||
margin: 0 -4px -1px -4px;
|
||||
}
|
||||
|
||||
.forumbg-table > .inner > span.corners-bottom {
|
||||
margin: -1px -4px 0 -4px;
|
||||
}
|
||||
|
||||
/* Misc layout styles
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -11,6 +11,22 @@ ul.profile-icons li.pm-icon { width: 28px; height: 20px; }
|
||||
ul.profile-icons li.quote-icon { width: 54px; height: 20px; }
|
||||
ul.profile-icons li.edit-icon { width: 42px; height: 20px; }
|
||||
|
||||
/* Online image */
|
||||
.online { background-image: url("./icon_user_online.gif"); }
|
||||
|
||||
/* Big button images */
|
||||
.reply-icon span { background-image: url("./button_topic_reply.gif"); }
|
||||
.post-icon span { background-image: url("./button_topic_new.gif"); }
|
||||
.locked-icon span { background-image: url("./button_topic_locked.gif"); }
|
||||
.pmreply-icon span { background-image: url("./button_pm_reply.gif") ;}
|
||||
.newpm-icon span { background-image: url("./button_pm_new.gif") ;}
|
||||
.forwardpm-icon span { background-image: url("./button_pm_forward.gif") ;}
|
||||
|
||||
/* Icon images */
|
||||
.pm-icon, .pm-icon a { background-image: url("./icon_contact_pm.gif"); }
|
||||
.quote-icon, .quote-icon a { background-image: url("./icon_post_quote.gif"); }
|
||||
.edit-icon, .edit-icon a { background-image: url("./icon_post_edit.gif"); }
|
||||
|
||||
/* EN Language Pack */
|
||||
.imageset.icon_contact_pm {
|
||||
background-image: url("./icon_contact_pm.gif");
|
||||
|
||||
@@ -4,7 +4,6 @@ span.imageset {
|
||||
background: transparent none 0 0 no-repeat;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-right: 0 !important;
|
||||
width: 0;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
|
||||
@@ -87,10 +87,6 @@ dl.icon {
|
||||
float: none;
|
||||
}
|
||||
|
||||
* html .forumbg table.table1 {
|
||||
margin: 0 -2px 0px -1px;
|
||||
}
|
||||
|
||||
/* Headerbar height fix for IE7 and below */
|
||||
* html #site-description p {
|
||||
margin-bottom: 1.0em;
|
||||
|
||||
Reference in New Issue
Block a user