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

Fixes U4-7759 Imagepicker setting in Grid broken in 7.4-beta2

Browse Source
This commit is contained in:
Simon Busborg
2016-01-18 10:10:03 +01:00
parent 2aa5dfb3ec
commit c9936da37f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/less/components/overlays.less
View File

@@ -188,13 +188,16 @@
}
/*ensures dialogs doesnt have side-by-side labels*/
.umb-overlay .control-label {
.umb-overlay .control-label,
.umb-overlay .form-horizontal .control-label {
width: 100%;
display: block;
box-sizing: border-box;
margin-bottom: 10px;
float: none;
}
.umb-overlay .controls-row {
margin-left: 0 !important;
}

13
src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
View File

@@ -1,16 +1,15 @@
<div ng-controller="Umbraco.PrevalueEditors.ImageFilePickerController" class="umb-editor umb-mediapicker">
<ul class="umb-sortable-thumbnails">
<li>
<a href ng-click="pick()" class="icon-holder umb-mediapicker add-link" ng-hide="model.value">
<i class="icon icon-add large"></i>
</a>
<img ng-src="{{model.value}}" alt="" ng-show="model.value">
<a href class="picked-image" ng-click="model.value = null" ng-show="model.value"><i class="icon icon-delete"></i></a>
<img ng-src="{{model.value}}" alt="" ng-show="model.value">
<a href class="picked-image" ng-click="model.value = null" ng-show="model.value"><i class="icon icon-delete"></i></a>
</li>
</ul>
<a href ng-click="pick()" class="umb-mediapicker add-link" ng-hide="model.value">
<i class="icon icon-add large"></i>
</a>
<umb-overlay
ng-if="mediaPickerDialog.show"
model="mediaPickerDialog"