Skip to content

Commit

Permalink
Colour picker fix for short forms
Browse files Browse the repository at this point in the history
  • Loading branch information
maurofmferrao committed Oct 16, 2023
1 parent 17068f4 commit 9ff9a4c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions modules/templates/global-elements.xml
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ $(target).find('.date').each(function(_idx, dateEl){
<property id="roundBorder" type="checkbox">
<title>Round Border</title>
<default>0</default>
<helpText>Should the square have rounded corners?</helpText>
<helpText>Should the image have rounded corners?</helpText>
<visibility>
<test>
<condition field="objectFit" type="neq">contain</condition>
Expand Down Expand Up @@ -656,7 +656,7 @@ $(target).find('.date').each(function(_idx, dateEl){
<property id="roundBorder" type="checkbox">
<title>Round Border</title>
<default>0</default>
<helpText>Should the square have rounded corners?</helpText>
<helpText>Should the rectangle have rounded corners?</helpText>
</property>
<property id="borderRadius" type="number">
<title>Border Radius</title>
Expand All @@ -670,7 +670,7 @@ $(target).find('.date').each(function(_idx, dateEl){
<property id="outline" type="checkbox">
<title>Show Outline</title>
<default>1</default>
<helpText>Should the square have an outline?</helpText>
<helpText>Should the rectangle have an outline?</helpText>
</property>
<property id="outlineColor" type="color">
<title>Outline Color</title>
Expand Down
3 changes: 2 additions & 1 deletion ui/src/style/layout-editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ body.editor-opened {
overflow: hidden auto;
padding: 0 1rem;
margin-top: 0.5rem;
flex: 1;
}
}

Expand Down Expand Up @@ -1957,7 +1958,7 @@ div#bg_media_name {

body[multi-select-active] {
.moveable-control-box {
z-index: 0 !important;
z-index: 0 !important;
}

.layout-live-preview {
Expand Down

0 comments on commit 9ff9a4c

Please sign in to comment.