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

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

* PayBas/ticket/12662: (29 commits)
  [ticket/12662] Hide quick-links when empty
  [ticket/12662] Fix white-space issue to make dropdowns uniform
  [ticket/12662] Remove last remaining linklist outside navbars
  [ticket/12662] Use data-last-responsive attr instead of hardcoded list
  [ticket/12662] Remove <li> container from logged_out_content event
  [ticket/12662] Username <span> fix for list columns
  [ticket/12662] Fix notifications dropdown positioning for RTL
  [ticket/12662] Update tests that utilize get_username_string
  [ticket/12662] Update subsilver2 index template event names
  [ticket/12662] Update events docs from b5 to rc1/rc2
  [ticket/12662] Move dropdown container from <li> to new inner div
  [ticket/12662] Remove linklist container and update template events
  [ticket/12662] Add span containers to all usernames for consistency
  [ticket/12662] IE8 fixes
  [ticket/12662] Fix responsive positioning of notifications dropdown
  [ticket/12662] Remove inherited props from ddown-extendended
  [ticket/12662] Change CSS selectors to direct descendants for linklist
  [ticket/12662] Reorder icon CSS rules alphabetically
  [ticket/12662] Use slack variable to determine line-break sensitivity
  [ticket/12662] Change new event names and fix events.md
  ...
This commit is contained in:
Cesar G
2014-07-03 23:02:11 -07:00
29 changed files with 541 additions and 362 deletions

View File

@@ -59,20 +59,20 @@
/* Horizontal lists
----------------------------------------*/
.rtl ul.linklist li {
.rtl ul.linklist > li {
float: right;
margin-right: 0;
margin-left: 5px;
margin-left: 7px;
}
.rtl ul.linklist li.rightside, .rtl p.rightside {
.rtl ul.linklist > li.rightside, .rtl p.rightside, .rtl a.rightside {
float: left;
margin-right: 5px;
margin-right: 7px;
margin-left: 0;
text-align: left;
}
.rtl ul.leftside li, .rtl ul.rightside li {
.rtl ul.leftside > li, .rtl ul.rightside > li {
float: left;
}
@@ -92,11 +92,16 @@
/* Bulletin icons for list items
----------------------------------------*/
.rtl ul.linklist.bulletin li:before {
.rtl ul.linklist.bulletin > li:before {
padding-left: 4px;
padding-right: 0;
}
.rtl ul.linklist li.responsive-menu a.responsive-menu-link:before {
left: auto;
right: 0;
}
/* Dropdown menu
---------------------------------------- */
.rtl .dropdown-container.topic-tools {
@@ -112,6 +117,10 @@
padding-right: 10px;
}
.rtl .dropdown-extended .header {
text-align: right;
}
.rtl .dropdown-extended .header .header_settings {
float: left;
}
@@ -276,12 +285,15 @@
text-align: left;
}
.rtl .forabg {
width: 99%; /* fix for IE6 */
.rtl #quick-links {
margin-left: 7px;
margin-right: 0;
}
.rtl .forumbg {
width: 99%; /* fix for IE6 */
.rtl .header-avatar span:after {
float: left;
margin-left: 0;
margin-right: 2px;
}
.rtl .member-search {
@@ -436,7 +448,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
margin-right: 2px;
}
.rtl dd.lastpost span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span {
.rtl dd.lastpost > span, .rtl ul.topiclist dd.info > span, .rtl ul.topiclist dd.time > span, .rtl dd.redirect > span, .rtl dd.moderation > span {
padding-left: 0;
padding-right: 5px;
}
@@ -616,7 +628,8 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
---------------------------------------- */
.rtl .small-icon {
background-position: 100% 50%;
padding: 0 19px 0 0;
padding-left: 0;
padding-right: 19px;
}
.rtl ul.linklist li.small-icon {

View File

@@ -96,7 +96,7 @@ ul.linklist li.small-icon {
padding-left: 0;
}
ul.linklist.bulletin li.small-icon:before {
ul.linklist.bulletin > li.small-icon:before {
display: none;
}
@@ -157,7 +157,7 @@ ul.linklist.bulletin li.small-icon:before {
margin-top: 2px;
}
.post-buttons li {
.post-buttons > li {
float: left;
margin-right: 3px;
}

View File

@@ -111,7 +111,7 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) {
----------------------------------------*/
ul.navlinks {
border-bottom-color: #FFFFFF;
border-top-color: #FFFFFF;
}
/* Table styles
@@ -374,7 +374,6 @@ a.arrow-right:hover {
color: #368AD2;
}
/*
--------------------------------------------------------------
Colours and backgrounds for content.css
@@ -699,24 +698,37 @@ Colours and backgrounds for buttons.css
/* Icon images
---------------------------------------- */
.icon-faq { background-image: url("./images/icon_faq.gif"); }
.icon-members { background-image: url("./images/icon_members.gif"); }
.icon-home { background-image: url("./images/icon_home.gif"); }
.icon-ucp { background-image: url("./images/icon_ucp.gif"); }
.icon-register { background-image: url("./images/icon_register.gif"); }
.icon-logout { background-image: url("./images/icon_logout.gif"); }
.icon-bookmark { background-image: url("./images/icon_bookmark.gif"); }
.icon-bump { background-image: url("./images/icon_bump.gif"); }
.icon-subscribe { background-image: url("./images/icon_subscribe.gif"); }
.icon-unsubscribe { background-image: url("./images/icon_unsubscribe.gif"); }
.icon-pages { background-image: url("./images/icon_pages.gif"); }
.icon-acp { background-image: url("./images/icon_acp.gif"); }
.icon-bookmark { background-image: url("./images/icon_bookmark.gif"); }
.icon-bump { background-image: url("./images/icon_bump.gif"); }
.icon-contact { background-image: url("./images/icon_pm.gif"); }
.icon-delete-cookies { background-image: url("./images/icon_delete_cookies.gif"); }
.icon-download { background-image: url("./images/icon_download.gif"); }
.icon-faq { background-image: url("./images/icon_faq.gif"); }
.icon-home { background-image: url("./images/icon_home.gif"); }
.icon-logout { background-image: url("./images/icon_logout.gif"); }
.icon-mark { background-image: url("./images/icon_mark.gif"); }
.icon-mcp { background-image: url("./images/icon_mcp.gif"); }
.icon-members { background-image: url("./images/icon_members.gif"); }
.icon-notification { background-image: url("./images/icon_notification.gif"); }
.icon-pages { background-image: url("./images/icon_pages.gif"); }
.icon-pm { background-image: url("./images/icon_pm.gif"); }
.icon-print { background-image: url("./images/icon_print.gif"); }
.icon-profile { background-image: url("./images/icon_profile.gif"); }
.icon-quick-links { background-image: url("./images/icon_quick_links.gif"); }
.icon-register { background-image: url("./images/icon_register.gif"); }
.icon-search, .responsive-search a { background-image: url("./images/icon_search.gif"); }
.icon-notification { background-image: url("./images/icon_notification.gif"); }
.icon-pm { background-image: url("./images/icon_pm.gif"); }
.icon-download { background-image: url("./images/icon_download.gif"); }
.icon-mark { background-image: url("./images/icon_mark.gif"); }
.icon-sendemail { background-image: url("./images/icon_sendemail.gif"); }
.icon-print { background-image: url("./images/icon_print.gif"); }
.icon-search-active { background-image: url("./images/subforum_read.gif"); }
.icon-search-advanced { background-image: url("./images/icon_search_adv.gif"); }
.icon-search-new { background-image: url("./images/subforum_unread.gif"); }
.icon-search-self { background-image: url("./images/icon_topic_latest.gif"); }
.icon-search-unanswered { background-image: url("./images/icon_post_target.gif"); }
.icon-search-unread { background-image: url("./images/subforum_unread.gif"); }
.icon-sendemail { background-image: url("./images/icon_sendemail.gif"); }
.icon-subscribe { background-image: url("./images/icon_subscribe.gif"); }
.icon-team { background-image: url("./images/icon_team.gif"); }
.icon-ucp { background-image: url("./images/icon_ucp.gif"); }
.icon-unsubscribe { background-image: url("./images/icon_unsubscribe.gif"); }
/* Profile & navigation icons */
.contact-icon { background-image: url("./images/icons_contact.png"); }
@@ -1127,7 +1139,7 @@ input.disabled {
}
.dropdown-extended ul li {
border-bottom-color: #B9B9B9;
border-top-color: #B9B9B9;
}
.dropdown-extended ul li:hover {
@@ -1189,6 +1201,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
border-color: #DCDCDC;
}
.dropdown li.separator {
border-color: #DCDCDC;
}
/* Notifications
---------------------------------------- */

View File

@@ -271,7 +271,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
}
.navbar {
padding: 5px 10px 5px 10px;
padding: 3px 10px;
border-radius: 7px;
}
@@ -317,6 +317,10 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
/* Horizontal lists
----------------------------------------*/
.navbar ul.linklist {
padding: 2px 0;
}
ul.linklist {
display: block;
margin: 0;
@@ -332,29 +336,25 @@ ul.linklist:after {
padding: 5px 10px;
}
ul.linklist li {
display: block;
list-style-type: none;
ul.linklist > li {
float: left;
width: auto;
margin-right: 5px;
font-size: 1.1em;
line-height: 2.2em;
list-style-type: none;
margin-right: 7px;
padding-top: 1px;
width: auto;
}
ul.linklist li.rightside, p.rightside {
ul.linklist > li.rightside, p.rightside, a.rightside {
float: right;
margin-right: 0;
margin-left: 5px;
margin-left: 7px;
text-align: right;
}
ul.navlinks {
padding-bottom: 1px;
margin-bottom: 1px;
border-bottom: 1px solid transparent;
font-weight: bold;
border-top: 1px solid transparent;
}
ul.leftside {
@@ -382,7 +382,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link {
font-size: 16px;
position: relative;
width: 16px;
line-height: 16.5px;
line-height: 20px;
text-decoration: none;
}
@@ -413,27 +413,18 @@ li.responsive-menu.dropdown-left .dropdown {
right: -6px;
}
li.responsive-menu .dropdown .dropdown-contents {
padding: 0 5px;
}
ul.linklist .dropdown-down .dropdown {
ul.linklist .dropdown {
top: 22px;
}
ul.linklist .dropdown-up .dropdown {
bottom: 18px;
top: auto;
}
ul.linklist .dropdown li {
clear: both;
}
/* Bulletin icons for list items
----------------------------------------*/
ul.linklist.bulletin li:before {
ul.linklist.bulletin > li:before {
display: inline-block;
content: "\2022";
font-size: inherit;
@@ -441,11 +432,12 @@ ul.linklist.bulletin li:before {
padding-right: 4px;
}
ul.linklist.bulletin li:first-child:before, ul.linklist.bulletin li.rightside:last-child:before {
ul.linklist.bulletin > li:first-child:before,
ul.linklist.bulletin > li.rightside:last-child:before {
content: none;
}
ul.linklist.bulletin li.no-bulletin:before {
ul.linklist.bulletin > li.no-bulletin:before {
content: none;
}
@@ -453,14 +445,32 @@ ul.linklist.bulletin li.no-bulletin:before {
display: none !important;
}
/* Avatar in overall_header.html */
/* Profile in overall_header.html */
.header-profile {
display: inline-block;
vertical-align: top;
}
.header-avatar:hover {
text-decoration: none;
}
.header-avatar img {
margin-bottom: 2px;
max-height: 25px;
max-height: 20px;
vertical-align: middle;
width: auto;
}
.header-avatar span:after {
content: '\25BC';
display: inline-block;
font-size: 9px;
float: right;
margin-left: 2px;
opacity: 0.7;
}
/* Dropdown menu
----------------------------------------*/
.dropdown-container {
@@ -566,14 +576,14 @@ ul.linklist.bulletin li.no-bulletin:before {
padding: 5px;
position: relative;
min-width: 40px;
max-height: 200px;
max-height: 300px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.dropdown li {
border-bottom: 1px dotted transparent;
border-top: 1px dotted transparent;
float: none !important;
line-height: normal !important;
font-size: 1em !important;
@@ -585,8 +595,8 @@ ul.linklist.bulletin li.no-bulletin:before {
text-align: left;
}
.dropdown li:last-child, .dropdown li li {
border-bottom: 0;
.dropdown li:first-child, .dropdown li.separator + li, .dropdown li li {
border-top: 0;
}
.dropdown li li:first-child {
@@ -606,7 +616,13 @@ ul.linklist.bulletin li.no-bulletin:before {
white-space: normal;
}
.dropdown li:before, .dropdown li:after {
.dropdown li.separator {
border-top: 1px solid transparent;
margin: 4px 0;
padding: 0;
}
.dropdown li.separator:first-child, .dropdown li.separator:last-child {
display: none !important;
}
@@ -614,6 +630,7 @@ ul.linklist.bulletin li.no-bulletin:before {
----------------------------------------*/
.breadcrumbs .crumb {
float: left;
font-weight: bold;
word-wrap: normal;
}
@@ -1109,11 +1126,7 @@ form > p.post-notice strong {
.dropdown-extended {
display: none;
position: absolute;
left: 0;
width: 340px;
z-index: 1;
top: 22px;
}
.dropdown-extended ul {
@@ -1127,24 +1140,30 @@ form > p.post-notice strong {
padding: 0;
margin: 0 !important;
float: none;
border-bottom: 1px solid;
border-top: 1px solid;
list-style-type: none;
font-size: 0.95em;
clear: both;
position: relative;
}
.dropdown-extended ul li.no_notifications {
padding: 10px;
.dropdown-extended ul li:first-child {
border-top: none;
}
.dropdown-extended ul li:before, .dropdown-extended ul li:after {
display: none;
.dropdown-extended ul li.no_notifications {
padding: 10px;
}
.dropdown-extended .dropdown-contents {
max-height: none;
padding: 0;
position: absolute;
width: 340px;
}
.nojs .dropdown-extended .dropdown-contents {
position: relative;
}
.dropdown-extended .header {
@@ -1152,6 +1171,7 @@ form > p.post-notice strong {
font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 11px;
font-weight: bold;
text-align: left;
text-shadow: 1px 1px 1px white;
text-transform: uppercase;
line-height: 30px;
@@ -1243,6 +1263,30 @@ form > p.post-notice strong {
display: block;
}
/* Navbar specific list items
----------------------------------------*/
#quick-links {
margin: 0 7px 0 0;
}
#quick-links a.responsive-menu-link {
display: block;
font-size: inherit;
line-height: inherit;
margin: 0;
width: auto;
}
#quick-links a.responsive-menu-link:before {
font-size: 16px;
line-height: 16.5px;
}
.compact #quick-links a.responsive-menu-link {
font-size: 0;
}
.compact .icon-notification > a > span, .compact .icon-pm > a > span {
display: none;
}
@@ -1262,3 +1306,19 @@ form > p.post-notice strong {
.dropdown-page-jump input.tiny {
width: 50px;
}
.dropdown .clone {
display: none;
}
.responsive .dropdown .clone {
display: inherit;
}
.dropdown .clone + li.separator {
display: none;
}
.responsive .dropdown .clone + li.separator {
display: inherit;
}

View File

@@ -210,7 +210,7 @@ dd.time {
line-height: 200%;
}
dd.lastpost span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span {
dd.lastpost > span, ul.topiclist dd.info > span, ul.topiclist dd.time > span, dd.redirect > span, dd.moderation > span {
display: block;
padding-left: 5px;
}
@@ -351,10 +351,6 @@ dd.option {
line-height: 1.4em;
}
span.corners-top, span.corners-bottom {
display: none;
}
dl.faq {
font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 1.1em;

Binary file not shown.

After

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1009 B

View File

@@ -72,7 +72,7 @@ html {
.responsive-search a {
display: block;
width: 16px;
height: 18px;
height: 22px;
text-indent: 99px;
overflow: hidden;
background-position: 50% 50%;
@@ -189,8 +189,8 @@ ul.topiclist li.row dt a.subforum {
----------------------------------------*/
@media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
{
.dropdown-extended {
width: 250px;
.dropdown-extended .dropdown-contents {
width: auto;
}
}

View File

@@ -69,5 +69,5 @@ dd.option {
/* Fixes header-avatar aspect-ratio in IE8 */
.header-avatar img {
height: 25px;
height: 20px;
}