1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 07:21:30 +02:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander
2016-11-12 19:41:10 +01:00
5 changed files with 26 additions and 9 deletions

View File

@@ -1168,3 +1168,8 @@ input.disabled {
li.notification-reported strong, li.notification-disapproved strong {
color: #D31141;
}
.badge {
background-color: #D31141;
color: #ffffff;
}

View File

@@ -1205,6 +1205,22 @@ ul.linklist:after,
margin-left: 58px;
}
.badge {
border-radius: 10px;
opacity: 0.8;
text-align: center;
white-space: nowrap;
font-size: 10px;
line-height: 1;
float: right;
display: inline-block;
margin-left: 3px;
vertical-align: baseline;
position: relative;
top: 3px;
padding: 4px 6px;
}
/* Navbar specific list items
----------------------------------------*/
@@ -1216,10 +1232,6 @@ ul.linklist:after,
display: none;
}
.linklist.compact .rightside > a strong {
padding-left: 2px;
}
.dropdown-page-jump .dropdown {
top: 20px;
}