Skip to content

Commit 456823d

Browse files
authored
Merge pull request #69 from magento-obsessive-owls/MAGETWO-88142-editing-heading-new
[CMS Team 1] MAGENTO-88142 Editing Heading from the stage
2 parents 1512701 + 558b8c4 commit 456823d

File tree

36 files changed

+2825
-149
lines changed

36 files changed

+2825
-149
lines changed

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<argument name="optionsSize" xsi:type="string">small</argument>
108108
<argument name="optionsData" xsi:type="array">
109109
<item name="0" xsi:type="array">
110-
<item name="value" xsi:type="string">default</item>
110+
<item name="value" xsi:type="string"/>
111111
<item name="title" xsi:type="string" translate="true">Default</item>
112112
</item>
113113
<item name="1" xsi:type="array">

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_base_form.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<label translate="true">Advanced</label>
2424
<collapsible>true</collapsible>
2525
</settings>
26-
<field name="text_align" sortOrder="10" formElement="select">
26+
<field name="text_align" sortOrder="10" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
2727
<argument name="data" xsi:type="array">
2828
<item name="config" xsi:type="array">
29-
<item name="default" xsi:type="string">default</item>
29+
<item name="default" xsi:type="string"/>
3030
</item>
3131
</argument>
3232
<settings>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
@icon-pagebuilder-special-characters__content: '\e914';
3232
@icon-pagebuilder-tabs__content: '\e915';
3333
@icon-pagebuilder-text__content: '\e916';
34+
@icon-pagebuilder-align-center__content: '\e91a';
35+
@icon-pagebuilder-align-left__content: '\e91b';
36+
@icon-pagebuilder-align-right__content: '\e91c';
3437
@icon-pagebuilder-variable__content: '\e917';
3538
@icon-pagebuilder-widgets__content: '\e918';
3639

@@ -136,6 +139,18 @@
136139
content: @icon-pagebuilder-text__content;
137140
}
138141

142+
.icon-pagebuilder-align-center:before {
143+
content: @icon-pagebuilder-align-center__content;
144+
}
145+
146+
.icon-pagebuilder-align-left:before {
147+
content: @icon-pagebuilder-align-left__content;
148+
}
149+
150+
.icon-pagebuilder-align-right:before {
151+
content: @icon-pagebuilder-align-right__content;
152+
}
153+
139154
.icon-pagebuilder-variable:before {
140155
content: @icon-pagebuilder-variable__content;
141156
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,9 @@
5656
// _____________________________________________
5757

5858
@import 'content-type/_import.less';
59+
60+
//
61+
// Import Menus less
62+
// _____________________________________________
63+
64+
@import '_toolbar.less';
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
// /**
2+
// * Copyright © Magento, Inc. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Toolbar Options Panel
8+
// _____________________________________________
9+
10+
// Don't display the hover state when the stage is being interacted with
11+
.pagebuilder-stage.interacting .pagebuilder-content-type.pagebuilder-toolbar-active:hover {
12+
outline: 1px solid rgb(153, 153, 153);
13+
}
14+
15+
.pagebuilder-toolbar-active {
16+
&.pagebuilder-content-type {
17+
outline: 1px solid rgb(153, 153, 153);
18+
}
19+
20+
.pagebuilder-toolbar-options {
21+
opacity: 1;
22+
top: -39px;
23+
transition-delay: 200ms;
24+
visibility: visible;
25+
}
26+
}
27+
28+
.pagebuilder-toolbar-container {
29+
overflow: hidden;
30+
}
31+
32+
.pagebuilder-toolbar-options {
33+
-moz-transition: opacity 200ms, top 200ms, visibility 200ms;
34+
-o-transition: opacity 200ms, top 200ms, visibility 200ms;
35+
-webkit-transition: opacity 200ms, top 200ms, visibility 200ms;
36+
background-color: @color-gray94;
37+
border: 1px solid @color-gray75;
38+
height: 38px;
39+
left: -2px;
40+
opacity: 0;
41+
position: absolute;
42+
top: 0;
43+
transition: opacity 200ms, top 200ms, visibility 200ms;
44+
visibility: hidden;
45+
width: calc(~'100% + 4px');
46+
z-index: 32;
47+
48+
.pagebuilder-toolbar-options-wrapper {
49+
display: flex;
50+
51+
.pagebuilder-toolbar-options-links {
52+
display: flex;
53+
list-style: none;
54+
margin: 0;
55+
vertical-align: middle;
56+
57+
&:not(:first-child):before {
58+
background-color: @color-light-gray;
59+
content: '';
60+
height: 80%;
61+
left: 0;
62+
position: relative;
63+
top: 10%;
64+
width: 1px;
65+
}
66+
67+
.pagebuilder-toolbar-options-link {
68+
display: flex;
69+
margin: 2px;
70+
71+
> a {
72+
border: 1px solid transparent;
73+
color: @color-very-dark-grayish-orange;
74+
display: block;
75+
height: 32px;
76+
text-align: center;
77+
text-decoration: none;
78+
width: 34px;
79+
80+
&:hover,
81+
&.toolbar-active {
82+
background-color: @color-light-gray;
83+
border: 1px solid @color-gray80;
84+
}
85+
86+
i {
87+
font-size: 18px;
88+
font-style: normal;
89+
line-height: 30px;
90+
}
91+
92+
span {
93+
font-size: 15px;
94+
font-weight: 600;
95+
line-height: 32px;
96+
}
97+
}
98+
}
99+
}
100+
}
101+
}

app/code/Magento/PageBuilder/view/adminhtml/web/fonts/pagebuilder-icons/pagebuilder-icons.svg

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)