Skip to content

Commit 926aef7

Browse files
aplapanaaplapana
committed
ACP2E-3864: Update copyrights for PB and fix static failures
1 parent 0370022 commit 926aef7

File tree

6 files changed

+28
-112
lines changed

6 files changed

+28
-112
lines changed

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_buttons.less

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,22 @@
1515
.pagebuilder-button-primary {
1616
.lib-link-as-button();
1717
.lib-button-primary(@_button-margin: @pagebuilder-button__margin);
18-
.lib-button-l(
19-
@_button-l-font-size: @pagebuilder-button__font-size, @_button-l-height: @pagebuilder-button__line-height
20-
);
18+
.lib-button-l(@_button-l-font-size: @pagebuilder-button__font-size, @_button-l-height: @pagebuilder-button__line-height);
2119
.lib-css(border-radius, @button__border-radius);
2220
.lib-css(font-weight, @font-weight__semibold);
2321
}
2422

2523
.pagebuilder-button-secondary {
2624
.lib-link-as-button();
2725
.lib-button(@_button-margin: @pagebuilder-button__margin);
28-
.lib-button-l(
29-
@_button-l-font-size: @pagebuilder-button__font-size, @_button-l-height: @pagebuilder-button__line-height
30-
);
26+
.lib-button-l(@_button-l-font-size: @pagebuilder-button__font-size, @_button-l-height: @pagebuilder-button__line-height);
3127
.lib-css(border-radius, @button__border-radius);
3228
.lib-css(font-weight, @font-weight__semibold);
3329
}
3430

3531
.pagebuilder-button-link {
3632
.lib-button-l(@_button-l-font-size: @pagebuilder-button__font-size);
37-
.lib-button-as-link(
38-
@_margin: @pagebuilder-button__margin, @_padding: @button__padding__l, @_line-height: @pagebuilder-button__line-height
39-
);
33+
.lib-button-as-link(@_margin: @pagebuilder-button__margin, @_padding: @button__padding__l, @_line-height: @pagebuilder-button__line-height);
4034
.lib-css(font-weight, @font-weight__semibold);
4135
display: inline-block;
4236
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
}
1010

1111
[data-role='modal'] {
12-
.action-pagebuilder-cancel, .action-pagebuilder-cancel:hover {
13-
color: @color-black;
12+
.action-pagebuilder-cancel,
13+
.action-pagebuilder-cancel:hover {color: @color-black;
1414
}
15-
1615
.pagebuilder-modal-content-body li {
1716
list-style-position: inside;
1817
margin-bottom: 15px;
@@ -47,11 +46,14 @@
4746

4847
//
4948
// Page Builder full width field
49+
5050
// _____________________________________________
5151

52+
// @phpcs:ignoreFile
53+
5254
.admin__fieldset {
53-
> .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option), .admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder {
54-
> .admin__field-label {
55+
> .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option), // @phpcs:ignore Generic.Commenting.DocComment
56+
.admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder { > .admin__field-label {
5557
margin-bottom: @indent__xs;
5658
margin-top: @indent__xs;
5759
min-height: 32px;

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_fonts.less

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
font-style: normal;
1313
font-weight: normal;
1414
src: url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.eot');
15-
src: url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.eot?#iefix') format('embedded-opentype'),
16-
url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.woff') format('woff'),
17-
url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.ttf') format('truetype'),
18-
url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.svg#pagebuilder-icons') format('svg');
15+
src: url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.eot?#iefix') format('embedded-opentype'), url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.woff') format('woff'), url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.ttf') format('truetype'), url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.svg#pagebuilder-icons') format('svg');
1916
}
2017

21-
.lib-font-face(
22-
@family-name: 'luma-icons',
23-
@font-path: '@{baseDir}Magento_PageBuilder/fonts/luma-icons/Luma-Icons',
24-
@font-weight: normal,
25-
@font-style: normal
26-
);
18+
.lib-font-face(@family-name: 'luma-icons', @font-path: '@{baseDir}Magento_PageBuilder/fonts/luma-icons/Luma-Icons', @font-weight: normal, @font-style: normal);
2719

2820
.pagebuilder-icon {
2921
/* Better Font Rendering =========== */

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// * All Rights Reserved.
44
// */
55

6-
76
//
87
// Replace box-shadow with borders when capturing a screenshot for template manager
98
// ______________________________________________________________________
@@ -133,3 +132,4 @@
133132
font-size: inherit;
134133
}
135134
}
135+

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_typography.less

Lines changed: 14 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,16 @@
33
// * All Rights Reserved.
44
// */
55

6-
.lib-font-face(
7-
@family-name: @font-family-name__base,
8-
@font-path: '@{baseDir}fonts/opensans/light/opensans-300',
9-
@font-style: normal,
10-
@font-weight: @font-weight__light
11-
);
12-
13-
.lib-font-face(
14-
@family-name: @font-family-name__base,
15-
@font-path: '@{baseDir}fonts/opensans/regular/opensans-400',
16-
@font-style: normal,
17-
@font-weight: @font-weight__regular
18-
);
19-
20-
.lib-font-face(
21-
@family-name: @font-family-name__base,
22-
@font-path: '@{baseDir}fonts/opensans/semibold/opensans-600',
23-
@font-style: normal,
24-
@font-weight: @font-weight__semibold
25-
);
26-
27-
.lib-font-face(
28-
@family-name: @font-family-name__base,
29-
@font-path: '@{baseDir}fonts/opensans/bold/opensans-700',
30-
@font-style: normal,
31-
@font-weight: @font-weight__bold
32-
);
6+
.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/light/opensans-300', @font-style: normal, @font-weight: @font-weight__light);
7+
8+
.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/regular/opensans-400', @font-style: normal, @font-weight: @font-weight__regular);
9+
10+
.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/semibold/opensans-600', @font-style: normal, @font-weight: @font-weight__semibold);
11+
12+
.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/bold/opensans-700', @font-style: normal, @font-weight: @font-weight__bold);
3313

3414
body {
35-
.lib-typography(
36-
@_color: @text__color,
37-
@_font-family: @font-family__base,
38-
@_font-size: @font-size__base,
39-
@_font-style: @font-style__base,
40-
@_font-weight: @font-weight__regular,
41-
@_line-height: @line-height__base
42-
);
15+
.lib-typography(@_color: @text__color, @_font-family: @font-family__base, @_font-size: @font-size__base, @_font-style: @font-style__base, @_font-weight: @font-weight__regular, @_line-height: @line-height__base);
4316
}
4417

4518
.pagebuilder-stage {
@@ -50,79 +23,37 @@ body {
5023
h1 {
5124
margin: 0 0 40px;
5225

53-
.lib-typography(
54-
@_color: @color-gray20,
55-
@_font-family: false,
56-
@_font-size: 40px,
57-
@_font-style: false,
58-
@_font-weight: @font-weight__light,
59-
@_line-height: 44px
60-
);
26+
.lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 40px, @_font-style: false, @_font-weight: @font-weight__light,@_line-height: 44px);
6127
}
6228

6329
h2 {
6430
margin: 25px 0 20px;
6531

66-
.lib-typography(
67-
@_color: @color-gray20,
68-
@_font-family: false,
69-
@_font-size: 26px,
70-
@_font-style: false,
71-
@_font-weight: @font-weight__light,
72-
@_line-height: 1.1
73-
);
32+
.lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 26px, @_font-style: false, @_font-weight: @font-weight__light, @_line-height: 1.1);
7433
}
7534

7635
h3 {
7736
margin: 20px 0 10px;
7837

79-
.lib-typography(
80-
@_color: @color-gray20,
81-
@_font-family: false,
82-
@_font-size: 18px,
83-
@_font-style: false,
84-
@_font-weight: @font-weight__semibold,
85-
@_line-height: 1.1
86-
);
38+
.lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 18px, @_font-style: false, @_font-weight: @font-weight__semibold, @_line-height: 1.1);
8739
}
8840

8941
h4 {
9042
margin: 20px 0;
9143

92-
.lib-typography(
93-
@_color: @color-gray20,
94-
@_font-family: false,
95-
@_font-size: 14px,
96-
@_font-style: false,
97-
@_font-weight: @font-weight__bold,
98-
@_line-height: 1.1
99-
);
44+
.lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 14px, @_font-style: false, @_font-weight: @font-weight__bold, @_line-height: 1.1);
10045
}
10146

10247
h5 {
10348
margin: 20px 0;
10449

105-
.lib-typography(
106-
@_color: @color-gray20,
107-
@_font-family: false,
108-
@_font-size: 12px,
109-
@_font-style: false,
110-
@_font-weight: @font-weight__bold,
111-
@_line-height: 1.1
112-
);
50+
.lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 12px, @_font-style: false, @_font-weight: @font-weight__bold, @_line-height: 1.1);
11351
}
11452

11553
h6 {
11654
margin: 20px 0;
11755

118-
.lib-typography(
119-
@_color: @color-gray20,
120-
@_font-family: false,
121-
@_font-size: 10px,
122-
@_font-style: false,
123-
@_font-weight: @font-weight__bold,
124-
@_line-height: 1.1
125-
);
56+
.lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 10px, @_font-style: false, @_font-weight: @font-weight__bold, @_line-height: 1.1);
12657
}
12758

12859
//

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@
9696
vertical-align: top;
9797
width: 36px;
9898

99-
.lib-tooltip(
100-
@_tooltip-position: top,
101-
@_tooltip-color: @color-gray80
102-
);
99+
.lib-tooltip(@_tooltip-position: top, @_tooltip-color: @color-gray80);
103100

104101
.tooltip-content {
105102
background: @color-lazy-sun;

0 commit comments

Comments
 (0)