Merge "Bug 1648850: Fix title for notifications overlaping compose button...

Merge "Bug 1648850: Fix title for notifications overlaping compose button behatnotneeded: style change only Change-Id: If024c6ec5c8f5a707db12c9c4a6afb56d72dc8b6"

htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/indexin.tpl

@@ -3,7 +3,7 @@
     <span class="icon icon-edit icon-lg left" role="presentation" aria-hidden="true"></span>
     {str section='module.multirecipientnotification' tag='composemessage'}
 </a>
-
+<div id="notifications-page-header"/></div>
 
 {if $activitylist.count > 0}
 

htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/indexout.tpl

@@ -3,7 +3,7 @@
     <span class="icon icon-edit icon-lg left" role="presentation" aria-hidden="true"></span>
     {str section='module.multirecipientnotification' tag='composemessage'}
 </a>
-
+<div id="notifications-page-header"/></div>
 
 {if $activitylist.count > 0}
 

htdocs/theme/raw/sass/components/_btn.scss

@@ -344,9 +344,15 @@ td.action-list-copy {
     }
 }
 
-.btn-with-heading {
-    float: right;
-    margin-top:-75px;
+// Fix the compose button positionning in the inbox/sent notifications pages.
+.notifications + #messages + h1 {
+    border-bottom: none;
+    display: inline-block;
+    margin-bottom: 0;
+    padding-bottom: 6.5px;
+    + .btn-with-heading {
+        float: right;
+    }
 }
 
 .collapsible-group + .button {

htdocs/theme/raw/sass/typography/_typography.scss

@@ -18,6 +18,11 @@ h1 {
     }
 }
 
+#notifications-page-header {
+    @extend .page-header;
+    clear: both;
+}
+
 // Add padding if there is no navigation
 .header + .container h1 {
     padding-top: 20px;