yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8/8.1' into v8/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
This commit is contained in:
Shannon
2019-09-09 23:31:07 +10:00
parent 8f32fce781 1723c39e00
commit 4869298b03
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/less/property-editors.less
View File

@@ -625,6 +625,12 @@
margin-right: auto;
}
img {
display: block;
margin-left: auto;
margin-right: auto;
}
&:hover {
cursor: pointer;
}

2
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
View File

@@ -16,7 +16,7 @@
<umb-box-content>
<umb-control-group label="@general_url">
<input type="text" id="url" class="umb-property-editor input-block-level" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
<input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
<umb-button
type="button"
action="vm.showPreview()"