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

update data type editor to use umb-box directive

Browse Source
This commit is contained in:
Mads Rasmussen
2018-01-05 20:40:29 +01:00
parent 9260c04a08
commit f1f4d64e85
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
View File

@@ -22,5 +22,5 @@
.umb-expansion-panel__content {
padding: 20px;
border-top: 1px solid @gray-8;
border-top: 1px solid @gray-9;
}

9
src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
View File

@@ -1,16 +1,16 @@
.umb-box {
border: 1px solid @gray-8;
background: @white;
border-radius: 3px;
margin-bottom: 30px;
margin-bottom: 8px;
box-shadow: 0 1px 1px 0 rgba(0,0,0,.16);
}
.umb-box-header {
padding: 10px 20px;
background-color: @gray-10;
}
.umb-box-header-title {
font-size: 16px;
font-size: 15px;
color: @black;
font-weight: bold;
}
@@ -24,4 +24,5 @@
.umb-box-content {
padding: 20px;
border-top: 1px solid @gray-9;
}

6
src/Umbraco.Web.UI.Client/src/less/main.less
View File

@@ -128,6 +128,12 @@ h5.-black {
border: none;
}
.umb-property:last-of-type .umb-control-group {
border: none;
margin-bottom: 0 !important;
padding-bottom: 0;
}
/* BLOCK MODE */
.block-form .umb-control-group {
border-bottom: none;

41
src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
View File

@@ -20,33 +20,38 @@
<umb-editor-container class="form-horizontal">
<umb-box>
<umb-property property="properties.selectedEditor">
<div>
<select name="selectedEditor"
ng-model="content.selectedEditor"
required
ng-options="e.alias as e.name for e in content.availableEditors"></select>
<span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
</div>
<umb-box-content>
</umb-property>
<umb-property property="properties.selectedEditor">
<div>
<select name="selectedEditor"
ng-model="content.selectedEditor"
required
ng-options="e.alias as e.name for e in content.availableEditors"></select>
<span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
</div>
<umb-property property="properties.selectedEditorId">
<div>{{content.selectedEditor}}</div>
</umb-property>
</umb-property>
<umb-property property="properties.selectedEditorId">
<div>{{content.selectedEditor}}</div>
</umb-property>
<umb-property
property="preValue"
ng-repeat="preValue in preValues">
<umb-property
property="preValue"
ng-repeat="preValue in preValues">
<umb-editor model="preValue" is-pre-value="true"></umb-editor>
</umb-property>
</umb-box-content>
<umb-editor model="preValue" is-pre-value="true"></umb-editor>
</umb-property>
</umb-box>
</umb-editor-container>
<umb-editor-footer>
<umb-editor-footer-content-right>