Merge pull request phpbb#5234 from hanakin/ticket/15679

[ticket/15679] notifications ucp front-page looks poor due to cp styling inheritance * github.com:/phpbb/phpbb: [ticket/15679] Overide css inheritance in cp.css [ticket/15679] assign proper classes to html
fededj · Jul 8, 2018 · 4a2d417 · 4a2d417
2 parents 1c2e0aa + 8b3fa91
commit 4a2d417
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -2,11 +2,11 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
-<h2>{TITLE}</h2>
+<h2 class="cp-title">{TITLE}</h2>
 <div class="panel">
 	<div class="inner">
 
-		<p>{TITLE_EXPLAIN}</p>
+		<p class="cp-desc">{TITLE_EXPLAIN}</p>
 
 		<!-- IF MODE == 'notification_options' -->
 			<table class="table1">
@@ -66,15 +66,15 @@ <h2>{TITLE}</h2>
 						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF --><!-- IF notification_list.STYLING --> {notification_list.STYLING}<!-- ENDIF -->">
 							<dl>
 								<dt>
-									<div class="list-inner">
-										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
-										<div class="notifications">
+									<div class="list-inner notification-item">
+										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img class="avatar notification-avatar" src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+										<div class="notification-text">
 											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-											<p class="notifications_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p>
+												<p class="notification-title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p>
 											<!-- IF notification_list.URL --></a><!-- ENDIF -->
-											<!-- IF notification_list.FORUM --><p class="notifications_forum">{notification_list.FORUM}</p><!-- ENDIF -->
-											<!-- IF notification_list.REASON --><p class="notifications_reason">{notification_list.REASON}</p><!-- ENDIF -->
-											<p class="notifications_time">{notification_list.TIME}</p>
+											<!-- IF notification_list.FORUM --><p class="notifications-forum">{notification_list.FORUM}</p><!-- ENDIF -->
+											<!-- IF notification_list.REASON --><p class="notifications-reason">{notification_list.REASON}</p><!-- ENDIF -->
+											<p class="notifications-time">{notification_list.TIME}</p>
 										</div>
 									</div>
 								</dt>

diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
@@ -357,5 +357,17 @@ ol.def-rules li {
 	line-height: 30px;
 }
 
+p.notification-title,
+p.notification-forum,
+p.notification-reason,
+p.notification-time {
+	line-height: 14px;
+	margin-bottom: 4px;
+}
+
+p.notification-time {
+	margin-bottom: 0;
+}
+
 /* stylelint-enable selector-max-compound-selectors */
 /* stylelint-enable selector-no-qualifying-type */