Skip to content

Commit 76057bf

Browse files
zanileezanilee
committed
MAGETWO-32310: Pop-ups
1 parent 81abc20 commit 76057bf

File tree

7 files changed

+113
-18
lines changed

7 files changed

+113
-18
lines changed

‎app/code/Magento/AdminNotification/Block/System/Messages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function getSystemMessageDialogJson()
123123
'autoOpen' => false,
124124
'width' => '75%',
125125
'modal' => true,
126-
'dialogClass' => 'ui-dialog-active',
126+
'dialogClass' => 'ui-dialog-active ui-popup-message',
127127
'ajaxUrl' => $this->_getMessagesUrl()
128128
],
129129
]

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@ require([
3131
resizable: false,
3232
width: '75%',
3333
modal: true,
34-
dialogClass: 'ui-dialog-active',
34+
dialogClass: 'ui-popup-message',
3535
position: {
36-
my: 'center top',
36+
my: 'left+12.5% top',
3737
at: 'center top',
3838
of: 'body'
3939
},
4040
open: function() {
41-
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight();
41+
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
42+
43+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 10;
4244
$(this).closest('.ui-dialog').css('margin-top', topMargin);
4345
}
4446
});

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ var mageDialog = (function($) {
419419
self.dialog = $('[data-id="information-dialog-category"]').dialog({
420420
autoOpen: false,
421421
modal: true,
422-
dialogClass: 'popup-window',
422+
dialogClass: 'popup-window ui-popup-message',
423423
resizable: false,
424424
width: '75%',
425425
title: $.mage.__('Warning message'),

‎app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require([
3535
minHeight: 200,
3636
minWidth: 300,
3737
width: '75%',
38-
dialogClass: 'no-close',
38+
dialogClass: 'no-close ui-popup-message',
3939
position: {
4040
my: 'left top',
4141
at: 'center top',

‎app/design/adminhtml/Magento/backend/web/css/override.less

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,8 +2571,8 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
25712571
}
25722572
.ui-dialog .main-col .fileinput-button,
25732573
.ui-dialog .magento_message .fileinput-button {
2574-
display: inline-block;
25752574
cursor: pointer;
2575+
display: inline-block;
25762576
float: none;
25772577
vertical-align: middle;
25782578
}
@@ -2582,9 +2582,10 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
25822582
}
25832583
.ui-dialog .main-col .fileinput-button input,
25842584
.ui-dialog .magento_message .fileinput-button input {
2585-
position: static;
25862585
border: none;
2586+
-moz-transform: none;
25872587
opacity: 1;
2588+
position: static;
25882589
}
25892590
.ui-dialog .main-col .file-row,
25902591
.ui-dialog .magento_message .file-row {
@@ -2623,6 +2624,30 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
26232624
right: 0;
26242625
top: 0;
26252626
}
2627+
.ui-popup-message .ui-dialog-titlebar {
2628+
background: #fffbbb;
2629+
font-size: 1.6rem;
2630+
font-weight: 700;
2631+
padding: 2rem 2rem 0;
2632+
}
2633+
.ui-popup-message .ui-dialog-titlebar-close {
2634+
right: 1.5rem;
2635+
top: 1rem;
2636+
}
2637+
.ui-popup-message .ui-dialog-titlebar-close:before {
2638+
font-size: 1.4rem;
2639+
}
2640+
.ui-popup-message .ui-dialog-content {
2641+
background: #fffbbb;
2642+
padding: 0 2rem 2rem;
2643+
}
2644+
.ui-popup-message .ui-dialog-content .message:last-child {
2645+
margin-bottom: 0;
2646+
}
2647+
.ui-popup-message .ui-dialog-buttonpane {
2648+
background: #fffbbb;
2649+
padding: 0 2rem 2rem;
2650+
}
26262651
.insert-variable {
26272652
list-style: none;
26282653
margin: 0;
@@ -2711,34 +2736,52 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
27112736
.fade .popup-inner {
27122737
padding: 0;
27132738
}
2739+
.fade .popup-title {
2740+
background: #fffbbb;
2741+
font-size: 1.6rem;
2742+
font-weight: 700;
2743+
padding: 2rem 2rem 0;
2744+
}
2745+
.fade .popup-header .popup-title {
2746+
margin: 0;
2747+
}
27142748
.fade .popup-content {
2715-
padding: 0 3rem 3rem;
2749+
background: #fffbbb;
2750+
padding: 0 2rem 2rem;
27162751
}
27172752
.fade .popup-content p {
27182753
margin-top: 0;
27192754
}
2755+
.fade .popup-content .messages:last-child {
2756+
margin-bottom: 0;
2757+
}
27202758
.fade .fieldset {
2759+
background: #fffbbb;
27212760
border: 0;
2722-
margin: 0;
2761+
margin: 1.5rem 0 1.5rem 1.5rem;
27232762
padding: 0;
27242763
}
27252764
.fade .maintenance-checkbox-container {
27262765
padding-left: 20%;
27272766
}
27282767
.fade .messages {
2729-
margin-top: 0 !important;
2768+
margin: 0 !important;
27302769
}
27312770
.fade .actions {
2732-
margin: 3rem 0 0;
2771+
margin: 0;
27332772
text-align: right;
27342773
}
27352774
.fade .actions .primary {
2775+
font-size: 1.4rem;
27362776
float: right;
27372777
margin: 0 0 0 3rem;
27382778
}
27392779
.fade .actions .primary:hover {
27402780
box-shadow: none;
27412781
}
2782+
.fade .actions .cancel {
2783+
font-size: 1.4rem;
2784+
}
27422785
.fade .actions .cancel:hover {
27432786
box-shadow: none;
27442787
}

‎app/design/adminhtml/Magento/backend/web/css/source/_popups.less

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,17 +266,18 @@
266266
}
267267

268268
.fileinput-button {
269-
display: inline-block;
270269
cursor: pointer;
270+
display: inline-block;
271271
float: none;
272272
vertical-align: middle;
273273
span {
274274
display: none;
275275
}
276276
input {
277-
position: static;
278277
border: none;
278+
-moz-transform: none;
279279
opacity: 1;
280+
position: static;
280281
}
281282
}
282283

@@ -320,6 +321,34 @@
320321
top: 0;
321322
}
322323

324+
.ui-popup-message {
325+
.ui-dialog-titlebar {
326+
background: @color-lazy-sun;
327+
font-size: 1.6rem;
328+
font-weight: @font-weight__bold;
329+
padding: 2rem 2rem 0;
330+
}
331+
.ui-dialog-titlebar-close {
332+
right: 1.5rem;
333+
top: 1rem;
334+
&:before {
335+
font-size: 1.4rem;
336+
}
337+
}
338+
.ui-dialog-content {
339+
background: @color-lazy-sun;
340+
padding: 0 2rem 2rem;
341+
.message {
342+
&:last-child {
343+
margin-bottom: 0;
344+
}
345+
}
346+
}
347+
.ui-dialog-buttonpane {
348+
background: @color-lazy-sun;
349+
padding: 0 2rem 2rem;
350+
}
351+
}
323352

324353
//
325354
// Block 'Insert Variable'
@@ -472,19 +501,36 @@
472501

473502
.popup-title {
474503
&:extend(.ui-dialog .ui-dialog-titlebar all);
504+
background: @color-lazy-sun;
505+
font-size: 1.6rem;
506+
font-weight: @font-weight__bold;
507+
padding: 2rem 2rem 0;
508+
}
509+
510+
.popup-header {
511+
.popup-title {
512+
margin: 0;
513+
}
475514
}
476515

477516
.popup-content {
517+
background: @color-lazy-sun;
478518
.extend__clearfix();
479-
padding: 0 @popup__padding__horizontal @popup__padding__vertical;
519+
padding: 0 2rem 2rem;
480520
p {
481521
margin-top: 0;
482522
}
523+
.messages {
524+
&:last-child {
525+
margin-bottom: 0;
526+
}
527+
}
483528
}
484529

485530
.fieldset {
531+
background: @color-lazy-sun;
486532
border: 0;
487-
margin: 0;
533+
margin: 1.5rem 0 1.5rem 1.5rem;
488534
padding: 0;
489535
}
490536

@@ -493,16 +539,17 @@
493539
}
494540

495541
.messages {
496-
margin-top: 0 !important;
542+
margin: 0 !important;
497543
}
498544

499545
.actions {
500-
margin: @popup__padding__vertical 0 0;
546+
margin: 0;
501547
text-align: right;
502548
.extend__clearfix();
503549

504550
.primary {
505551
&:extend(.ui-dialog .action-primary all);
552+
font-size: 1.4rem;
506553
float: right;
507554
margin: 0 0 0 @popup__padding__horizontal;
508555
&:hover {
@@ -512,6 +559,7 @@
512559

513560
.cancel {
514561
&:extend(.ui-dialog .action-close all);
562+
font-size: 1.4rem;
515563
&:hover {
516564
box-shadow: none;
517565
}

‎app/design/adminhtml/Magento/backend/web/css/styles-migration.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
.magento_message:extend(.magento_message all) {}
3030

31+
.ui-popup-message:extend(.ui-popup-message all) {}
32+
3133
}
3234

3335
#html-body[class][data-container="body"] .admin__scope {

0 commit comments

Comments
 (0)