diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-28 09:56:37 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-28 09:56:37 -0600 |
| commit | e5417ec123d62c414765341d98505213456d0b81 (patch) | |
| tree | 523de2481b921ec04038381b770bd2eb821ceb21 /phpBB/styles | |
| parent | f665a4b5cfc5db317e04ff387d24c8a7553a3849 (diff) | |
| parent | 18d85bfc118dc5a38867b2132ae9c78f7d18bbbf (diff) | |
| download | forums-e5417ec123d62c414765341d98505213456d0b81.tar forums-e5417ec123d62c414765341d98505213456d0b81.tar.gz forums-e5417ec123d62c414765341d98505213456d0b81.tar.bz2 forums-e5417ec123d62c414765341d98505213456d0b81.tar.xz forums-e5417ec123d62c414765341d98505213456d0b81.zip | |
Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/11103
# By Matt Friedman
# Via Matt Friedman
* remotes/VSE/ticket/11103-VSEphpbb:
[ticket/11103] Remove padding from notifications for now.
[ticket/11103] Add newlines to bottom of css file
[ticket/11103] HTML encode double arrow character
[ticket/11103] Update styling of UCP Notifications in subsilver2
[ticket/11103] Update styling of UCP Notifications in prosilver
[ticket/11103] Update styling of subsilver2 notification modal
[ticket/11103] Update styling of prosilver notification modal
[ticket/11103] Remove title attribute from notification link
Diffstat (limited to 'phpBB/styles')
6 files changed, 25 insertions, 9 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 85bce8a313..a53e0f8d60 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -138,7 +138,7 @@ <ul class="linklist leftside"> <!-- IF S_NOTIFICATIONS_DISPLAY --> <li> - [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] • + [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] • <div id="notification_list" class="notification_list"> <div class="pointer"><div class="pointer_inner"></div></div> <div class="header"> @@ -158,7 +158,7 @@ {notifications.AVATAR} <div> <p>{notifications.FORMATTED_TITLE}</p> - <p>{notifications.TIME}</p> + <p>» {notifications.TIME}</p> <!-- IF not notifications.URL and notifications.U_MARK_READ --> <p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 558bff7349..a2d558d0ca 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -83,9 +83,9 @@ <dt> <!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> {notification_list.AVATAR} - <div> - <p>{notification_list.FORMATTED_TITLE}</p> - <p>{notification_list.TIME}</p> + <div class="notifications"> + <p class="notifications_title">{notification_list.FORMATTED_TITLE}</p> + <p class="notifications_time">» {notification_list.TIME}</p> <!-- IF not notification_list.URL and notification_list.U_MARK_READ --> <p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p> diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 3eb09492d5..02d891ab6a 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -767,3 +767,16 @@ p.rules a { bottom: -11px; left: -10px; } + +.notification_list div.notifications { + padding: 5px; +} + +.notification_list p.notifications_title { + font-weight: bold; +} + +.notification_list p.notifications_time { + font-size: 11px; +} + diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 6ea9ba1442..0317d6e45c 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -153,7 +153,7 @@ function marklist(id, name, state) <tr> <td class="genmed"> <!-- IF S_NOTIFICATIONS_DISPLAY --> - [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] • + [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] • <div id="notification_list" class="notification_list"> <div class="row1 header"> {L_NOTIFICATIONS} @@ -176,7 +176,7 @@ 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 />{notifications.TIME} + <br />» {notifications.TIME} <!-- IF not notifications.URL and notifications.UNREAD --> <br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index c1ca795234..1a1fda4c17 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -97,10 +97,12 @@ <!-- ELSE --> <td colspan="2" valign="top" height="50px"> <!-- ENDIF --> + <span class="gen"> <!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> - {notification_list.FORMATTED_TITLE} + <strong>{notification_list.FORMATTED_TITLE}</strong> <!-- IF notification_list.URL --></a><!-- ENDIF --><br /> - {notification_list.TIME} + » {notification_list.TIME} + </span> </td> <td align="center"> <!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index a78a84ab63..df46c91d8d 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1147,6 +1147,7 @@ a.imageset { position: absolute; width: 310px; z-index: 1; + box-shadow: 3px 3px 5px darkgray; } #notification_list .notification_scroll { |