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

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Shannon
2016-01-28 15:16:37 +01:00
parent d526ff43f2 dc6c15e150
commit a1156472fb
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
View File

@@ -11,7 +11,8 @@ var _umbPropertyEditor = function (umbPropEditorHelper) {
return {
scope: {
model: "=",
isPreValue: "@"
isPreValue: "@",
preview: "@"
},
require: "^form",
@@ -38,4 +39,4 @@ var _umbPropertyEditor = function (umbPropEditorHelper) {
//Preffered is the umb-property-editor as its more explicit - but we keep umb-editor for backwards compat
angular.module("umbraco.directives").directive('umbPropertyEditor', _umbPropertyEditor);
angular.module("umbraco.directives").directive('umbEditor', _umbPropertyEditor);
angular.module("umbraco.directives").directive('umbEditor', _umbPropertyEditor);

1
src/Umbraco.Web.UI.Client/src/less/belle.less
View File

@@ -106,6 +106,7 @@
@import "components/overlays/umb-overlay-backdrop.less";
@import "components/umb-grid.less";
@import "components/umb-empty-state.less";
@import "components/umb-property-editor.less";
@import "components/buttons/umb-button.less";
@import "components/buttons/umb-button-group.less";

5
src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
View File

@@ -293,14 +293,13 @@ input.umb-group-builder__group-sort-value {
display:none !important;
}
.umb-group-builder__property-preview-overlay {
.umb-group-builder__property-preview-background {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 10;
border-radius: 10px;
z-index: -1;
background: url("../img/checkered-background.png");
opacity: 0.2;
}

3
src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less Normal file
View File

@@ -0,0 +1,3 @@
.umb-property-editor.-not-clickable {
pointer-events: none;
}

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js
View File

@@ -33,7 +33,7 @@ angular.module("umbraco").controller('Umbraco.Dialogs.Template.QueryBuilderContr
alias: "",
name: "",
},
direction: "Ascending"
direction: "ascending"
}
};

3
src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
View File

@@ -1,2 +1,3 @@
<div class="umb-property-editor" ng-class="{'-not-clickable': preview}">
<div ng-include="propertyEditorView"></div>
</div>

7
src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
View File

@@ -179,8 +179,6 @@
<div tabindex="-1" class="umb-group-builder__property-preview" ng-click="editPropertyTypeSettings(property, tab)" ng-if="!sortingMode" ng-class="{'-not-clickable': !sortingMode && (property.inherited || property.locked)}">
<span class="umb-group-builder__property-preview-overlay"></span>
<div class="umb-group-builder__property-tags">
<span class="umb-group-builder__property-tag -white">
@@ -223,10 +221,13 @@
<ng-form name="propertyEditorPreviewForm" umb-disable-form-validation>
<umb-property-editor
ng-if="property.view !== undefined"
model="property">
model="property"
preview="true">
</umb-property-editor>
</ng-form>
<div class="umb-group-builder__property-preview-background"></div>
</div>
<!-- row tools -->