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

Replace splitview close button with button element (#8510)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2020-07-30 15:45:52 +02:00
committed by GitHub
parent 6edd0bbb6c
commit 27db255f77
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
View File

@@ -44,6 +44,7 @@ This format is only used in the iconpicker.html
},
link: function (scope) {
if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) {
var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker

15
src/Umbraco.Web.UI.Client/src/less/components/editor.less
View File

@@ -140,22 +140,19 @@ input.umb-editor-header__name-input:disabled {
margin-left: auto;
}
a.umb-editor-header__close-split-view {
.umb-editor-header__close-split-view {
display: flex;
justify-content: center;
align-items: center;
position: relative;
height: 69px;
width: 69px;
font-size: 20px;
color: @gray-6;
text-decoration: none !important;
}
font-size: 20px;
color: @gray-6;
a.umb-editor-header__close-split-view:hover {
color: @black;
&:hover {
color: @black;
}
}
.umb-editor-header {

9
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
View File

@@ -56,8 +56,7 @@
ng-class="{'--current': entry.variant === editor.content, '--active': entry.variant.active && vm.dropdownOpen, '--error': entry.variant.active !== true && entry.variant.hasError, '--state-notCreated':entry.variant.state==='NotCreated' && entry.variant.name == null, '--state-draft':entry.variant.state==='Draft' || (entry.variant.state==='NotCreated' && entry.variant.name != null)}"
>
<button type="button" ng-if="entry.subVariants && entry.subVariants.length > 0" class="umb-variant-switcher__item-expand-button umb-outline" ng-click="entry.open = !entry.open">
<i class="icon icon-navigation-down" ng-if="entry.open"></i>
<i class="icon icon-navigation-right" ng-if="!entry.open"></i>
<i class="icon {{entry.open ? 'icon-navigation-down' : 'icon-navigation-right'}}"></i>
</button>
<button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, entry.variant)" prevent-default>
<span class="umb-variant-switcher__name" ng-bind="entry.variant.displayName"></span>
@@ -91,9 +90,9 @@
</div>
<div ng-if="splitViewOpen">
<a class="umb-editor-header__close-split-view" href="" ng-click="closeSplitView()">
<i class="icon-delete"></i>
</a>
<button type="button" class="btn-reset umb-editor-header__close-split-view" ng-click="closeSplitView()">
<umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
</button>
</div>
<div ng-if="editor.variantApps && splitViewOpen !== true">