1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 05:34:01 +02:00

Merge remote-tracking branch 'PayBas/ticket/12535' into develop-ascraeus

* PayBas/ticket/12535:
  [ticket/12535] Combine inner clearing CSS rules
  [ticket/12535] Update events.md to RC3
  [ticket/12535] Add events to subsilver2
  [ticket/12535] Make <a> adjust to the image width
This commit is contained in:
Cesar G
2014-08-08 13:46:58 +02:00
10 changed files with 96 additions and 48 deletions

View File

@@ -582,6 +582,10 @@ li.breadcrumbs span:first-child > a {
margin-right: 8px;
}
.rtl .postprofile .avatar {
float: right;
}
.rtl .online {
background-position: 0 0;
}
@@ -1074,8 +1078,11 @@ li.breadcrumbs span:first-child > a {
border-width: 0 0 1px 0;
}
.rtl .postprofile dt, .rtl .postprofile dd.profile-rank, .rtl .search .postprofile dd {
margin: 0;
}
.rtl .postprofile .avatar {
float: right;
margin-left: 5px;
margin-right: 0;
}

View File

@@ -305,12 +305,6 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
border-radius: 7px;
}
.inner:after {
content: '';
clear: both;
display: block;
}
.rowbg {
margin: 5px 5px 2px 5px;
}
@@ -326,12 +320,6 @@ ul.linklist {
margin: 0;
}
ul.linklist:after {
content: '';
display: block;
clear: both;
}
#cp-main .panel {
padding: 5px 10px;
}
@@ -856,12 +844,6 @@ fieldset.fields1 dl.pmlist dd.recipients {
margin-top: 2em;
}
.action-bar:after {
clear: both;
content: '';
display: block;
}
/* Pagination
---------------------------------------- */
.pagination {
@@ -1130,6 +1112,20 @@ form > p.post-notice strong {
background: transparent;
}
/* Inner box-model clearing */
.inner:after,
ul.linklist:after,
.action-bar:after,
.notification_text:after,
.tabs-container:after,
#tabs > ul:after,
#minitabs > ul:after,
.postprofile .avatar-container:after {
clear: both;
content: '';
display: block;
}
.hidden {
display: none;
}
@@ -1285,12 +1281,6 @@ form > p.post-notice strong {
margin-left: 58px;
}
.notification_text:after {
content: '';
clear: both;
display: block;
}
/* Navbar specific list items
----------------------------------------*/

View File

@@ -710,15 +710,22 @@ fieldset.polls dd div {
margin-bottom: 10px;
}
/* Post-profile avatars */
.postprofile .has-avatar .avatar-container {
margin-bottom: 3px;
overflow: hidden;
}
.postprofile .avatar {
display: block;
border: none;
margin-bottom: 3px;
float: left;
max-width: 100%;
}
.postprofile .avatar img {
max-width: 90%;
display: block;
height: auto !important;
max-width: 100%;
}
dd.profile-warnings {

View File

@@ -96,12 +96,6 @@ ul.cplist {
margin-bottom: 0px;
}
.tabs-container:after {
clear: both;
content: '';
display: block;
}
/* CP tabs shared
----------------------------------------*/
#tabs, #minitabs {
@@ -115,12 +109,6 @@ ul.cplist {
position: relative;
}
#tabs > ul:after, #minitabs > ul:after {
clear: both;
content: '';
display: block;
}
#tabs .tab, #minitabs .tab {
display: inline-block;
float: left;

View File

@@ -424,16 +424,22 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
margin: 0;
}
.postprofile .has-avatar .avatar-container {
margin: 0;
overflow: inherit;
}
.postprofile .avatar-container:after {
clear: none;
}
.postprofile .avatar {
display: block;
float: left;
margin-right: 5px;
}
.postprofile .avatar img {
width: auto !important;
height: auto !important;
display: block;
max-height: 32px;
}

View File

@@ -71,3 +71,8 @@ dd.option {
.header-avatar img {
height: 20px;
}
/* IE8 often can't handle max-width in %, so we use px instead */
.postprofile .avatar img {
max-width: 150px;
}