Richtext rules adjustments (#8480)

This commit is contained in:
Bjarne Fyrstenborg
2020-07-27 17:28:00 +02:00
committed by GitHub
parent 6b3daf8963
commit 0f9de5d59b
6 changed files with 12 additions and 15 deletions
@@ -41,6 +41,7 @@ textarea.umb-stylesheet-rule-styles {
width: 300px;
height: 100px;
resize: none;
font-family: @monoFontFamily;
}
.umb-stylesheet-rule-preview {
@@ -131,7 +131,7 @@
pre {
display: inline-flex;
font-family: monospace;
font-family: @monoFontFamily;
margin-left: 15px;
margin-right: 15px;
white-space: nowrap;
@@ -168,7 +168,7 @@
label {
border: 1px solid @white;
padding: 6px 10px;
font-family: monospace;
font-family: @monoFontFamily;
border: 1px solid @gray-8;
background: @gray-11;
margin: 0 15px 0 3px;
@@ -4,7 +4,7 @@
<input overlay-submit-on-enter="false" name="newItem" focus-when="{{focusOnNew}}" ng-keydown="createNew($event)" type="text" ng-model="newItem" val-highlight="{{hasError}}" />
</div>
<div class="umb-prevalues-multivalues__right">
<button class="btn btn-info" ng-click="add($event)"><localize key="general_add">Add</localize></button>
<button type="button" class="btn btn-info" ng-click="add($event)"><localize key="general_add">Add</localize></button>
</div>
</div>
<div ui-sortable="sortableOptions">
@@ -14,7 +14,7 @@
<input type="text" ng-model="item.value" val-server="item_{{$index}}" required />
</div>
<div class="umb-prevalues-multivalues__right">
<button class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
<button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
</div>
</div>
</div>
@@ -2,7 +2,7 @@
<form novalidate name="richTextRuleForm" val-form-manager>
<umb-editor-view>
<umb-editor-view>
<umb-editor-header
name="model.title"
@@ -64,9 +64,8 @@
action="vm.submit(model)">
</umb-button>
</umb-editor-footer-content-right>
</umb-editor-footer>
'
</umb-editor-view>
</umb-editor-footer>
</umb-editor-view>
</form>
@@ -59,7 +59,6 @@ angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.RulesControlle
};
editorService.open(ruleDialog);
}
function setDirty() {
@@ -9,13 +9,11 @@
<div class="umb-property-editor umb-stylesheet-rules form-horizontal" ng-controller="Umbraco.Editors.StyleSheets.RulesController">
<div ui-sortable="sortableOptions" ng-model="model.stylesheet.rules">
<div class="umb-stylesheet-rules__listitem" ng-repeat="rule in model.stylesheet.rules track by $id(rule)">
<i class="icon icon-navigation handle"></i>
<div class="umb-stylesheet-rules__left">
{{rule.name}}
</div>
<i class="icon icon-navigation handle" aria-hidden="true"></i>
<div class="umb-stylesheet-rules__left">{{rule.name}}</div>
<div class="umb-stylesheet-rules__right">
<a class="umb-node-preview__action" ng-click="edit(rule, $event)"><localize key="general_edit">Edit</localize></a>
<a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(rule, $event)"><localize key="general_remove">Remove</localize></a>
<button type="button" class="umb-node-preview__action" ng-click="edit(rule, $event)"><localize key="general_edit">Edit</localize></button>
<button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(rule, $event)"><localize key="general_remove">Remove</localize></button>
</div>
</div>
</div>