mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 11:44:08 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
* PayBas/ticket/12608:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
This commit is contained in:
Cesar G
2014-06-22 15:44:06 -07:00
parent 4f2acbaed2 1a3c1d5b9a
commit 74a37259f7
22 changed files with 430 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/styles/subsilver2/template/overall_header.html
View File

@@ -169,7 +169,7 @@ function marklist(id, name, state)
</div>
<div class="notification_scroll">
<table class="tablebg" width="310" cellspacing="1">
<table class="tablebg" cellspacing="1">
<!-- BEGIN notifications -->
<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
<td width="50">
@@ -180,7 +180,11 @@ function marklist(id, name, state)
<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
{notifications.FORMATTED_TITLE}
<!-- IF notifications.URL --></a><!-- ENDIF -->
<br />&raquo; {notifications.TIME}
<!-- IF notifications.REFERENCE --><br /><span class="notification-reference">{notifications.REFERENCE}</span><!-- ENDIF -->
<!-- IF notifications.FORUM --><br /><span class="notification-forum">{notifications.FORUM}</span><!-- ENDIF -->
<!-- IF notifications.REASON --><br /><span class="notification-reason">{notifications.REASON}</span><!-- ENDIF -->
<br /><span class="notification-time">{notifications.TIME}</span>
<!-- IF not notifications.URL and notifications.UNREAD -->
<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
<!-- ENDIF -->

6
phpBB/styles/subsilver2/template/ucp_notifications.html
View File

@@ -92,9 +92,11 @@
<td valign="top">
<span class="gen">
<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
<strong>{notification_list.FORMATTED_TITLE}</strong>
{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF -->
<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
{notification_list.TIME}
<!-- IF notification_list.FORUM --><span class="notifications_forum">{notification_list.FORUM}</span><br /><!-- ENDIF -->
<!-- IF notification_list.REASON --><span class="notifications_reason">{notification_list.REASON}</span><br /><!-- ENDIF -->
<span class="notifications_time">{notification_list.TIME}</span>
</span>
</td>
<td align="center">

23
phpBB/styles/subsilver2/theme/stylesheet.css
View File

@@ -1189,12 +1189,21 @@ a.imageset {
overflow-x: hidden;
}
#notification_list table {
width: 100%;
}
#notification_list .notification_title {
padding: 5px;
padding: 3px;
}
#notification_list .notification_title:after {
clear: both;
content: '';
display: block;
}
#notification_list .header {
width: 298px;
padding: 5px;
font-weight: bold;
border: 1px solid #A9B8C2;
@@ -1208,7 +1217,6 @@ a.imageset {
}
#notification_list .footer {
width: 300px;
text-align: center;
font-size: 1.2em;
border: 1px solid #A9B8C2;
@@ -1223,3 +1231,12 @@ a.imageset {
#notification_list .footer > a {
display: block;
}
#notification_list .notification-time {
font-size: 0.9em;
float: right;
}
.notification_list .notifications_time {
font-size: 0.8em;
}