MAGETWO-56826: Notification messages area. Bug fixing activities

omiroshnichenko · omiroshnichenko · commit 747d409e688b · 2016-08-22T19:27:27.000+03:00
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area.xml b/app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area.xml
@@ -44,7 +44,7 @@
                     <item name="label" xsi:type="string" translate="true"/>
                     <item name="dataType" xsi:type="string">text</item>
                     <item name="sorting" xsi:type="string">asc</item>
-                    <item name="sortOrder" xsi:type="number">10</item>
+                    <item name="sortOrder" xsi:type="number">30</item>
                 </item>
             </argument>
         </column>
diff --git a/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
@@ -35,7 +35,7 @@
     }
 
     .message {
-        display: inline-block;
+        background: none;
         margin: 0 0 -3px;
         overflow: hidden;
         padding: @message-system-short-message__padding-vertical 0 @message-system-short-message__padding-vertical 3.3rem;
@@ -46,13 +46,17 @@
     }
 
     .action-menu-item {
-        &.action-close {
+        &.action-close-wrapper {
+            width: 3.5rem;
+        }
+
+        .action-close {
             float: right;
         }
 
-        display: inline-block;
-        vertical-align: top;
+        float: right;
         padding: @message-system-short-message__padding-vertical 0 0;
+        vertical-align: top;
     }
 }
 
@@ -72,7 +76,7 @@
 .message-system-short {
     min-height: @message-system-short-wrapper__height;
 
-    .action-close {
+    .action-close-wrapper {
         display: none;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`.message {`
`38`		`- display: inline-block;`
	`38`	`+ background: none;`
`39`	`39`	`margin: 0 0 -3px;`
`40`	`40`	`overflow: hidden;`
`41`	`41`	`padding: @message-system-short-message__padding-vertical 0 @message-system-short-message__padding-vertical 3.3rem;`
`@@ -46,13 +46,17 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`.action-menu-item {`
`49`		`- &.action-close {`
	`49`	`+ &.action-close-wrapper {`
	`50`	`+ width: 3.5rem;`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ .action-close {`
`50`	`54`	`float: right;`
`51`	`55`	`}`
`52`	`56`
`53`		`- display: inline-block;`
`54`		`- vertical-align: top;`
	`57`	`+ float: right;`
`55`	`58`	`padding: @message-system-short-message__padding-vertical 0 0;`
	`59`	`+ vertical-align: top;`
`56`	`60`	`}`
`57`	`61`	`}`
`58`	`62`
`@@ -72,7 +76,7 @@`
`72`	`76`	`.message-system-short {`
`73`	`77`	`min-height: @message-system-short-wrapper__height;`
`74`	`78`
`75`		`- .action-close {`
	`79`	`+ .action-close-wrapper {`
`76`	`80`	`display: none;`
`77`	`81`	`}`
`78`	`82`	`}`