Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support custom SVG icon in umb-child-selector component #10344

Merged
merged 10 commits into from
Jun 6, 2021
Merged

Support custom SVG icon in umb-child-selector component #10344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
50cefac
Use umb-icon component
bjarnef May 27, 2021
e8a22d0
Specify button type attribute
bjarnef May 27, 2021
37cbbba
Use umb-search-filter component
bjarnef May 27, 2021
d79c58c
Adjust styling of item picker
bjarnef May 27, 2021
a8f4ad4
Replace trash icons with umb-icon
bjarnef May 27, 2021
dde9a73
Replace a few icons in umb-grid-selector as well
bjarnef May 27, 2021
13724a3
Use umb-icon in datatype picker
bjarnef May 27, 2021
447dae1
Ensure icons are styles correct in legacy format
bjarnef May 27, 2021
a4d6847
Use umb-icon component in macro parameter editors and fix wrong end c…
bjarnef May 27, 2021
a54b0b1
Use umb-icon in macro parameter editor overlay
bjarnef May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 58 additions & 59 deletions src/Umbraco.Web.UI.Client/src/less/components/card.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@
}




//Card icon grid for picking items off a card
.umb-card-grid {
padding: 0;
Expand Down Expand Up @@ -129,48 +127,74 @@
}

.umb-card-grid.-three-in-row li {
flex: 0 0 33.333%;
max-width:33.333%;
flex: 0 0 33.333%;
max-width: 33.333%;

i {
span > i, // legacy icon
.umb-icon {
font-size: 36px;
line-height: 28px;
line-height: 1;
}
}

.umb-card-grid .umb-card-grid-item {
position: relative;
display: block;
width: 100%;
height: 100%;
padding: 10px 5px;
border-radius: @baseBorderRadius * 2;
transition: background-color 120ms;
font-size: 13px;
line-height: 1.3em;
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;

> span {
.umb-card-grid {
.umb-card-grid-item {
position: relative;
display: block;
width: 100%;
height: 100%;
padding: 10px 5px;
border-radius: @baseBorderRadius * 2;
transition: background-color 120ms;
font-size: 13px;
line-height: 1.3em;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
background-color: transparent;
word-break: break-word;
}
}
align-items: center;
justify-content: flex-start;

&__loading {
position: absolute;
background-color: rgba(255,255,255,0.8);
top: 0;
right: 0;
bottom: 0;
left: 0;
}

a {
color: @ui-option-type;
text-decoration: none;
}

.umb-card-grid .umb-card-grid-item:hover {
background-color: @ui-option-hover;
color: @ui-option-type-hover;
}
.umb-card-grid .umb-card-grid-item:focus {
color: @ui-option-type-hover;
> span {
position: relative;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
background-color: transparent;
word-break: break-word;
}

&:hover {
background-color: @ui-option-hover;
color: @ui-option-type-hover;
}

&:focus {
color: @ui-option-type-hover;
}
}

span > i, // legacy icon
.umb-icon {
font-size: 30px;
line-height: 1;
margin-top: 6px;
margin-bottom: 10px;
display: block;
}
}

.umb-card-grid .umb-card-grid-item.--creator {
Expand All @@ -189,7 +213,6 @@
width: 100%;
padding-top: 100%;
border-radius: @baseBorderRadius * 2;

box-sizing: border-box;
transition: background-color 120ms;

Expand Down Expand Up @@ -217,30 +240,6 @@
}
}


.umb-card-grid a {
color: @ui-option-type;
text-decoration: none;
}

.umb-card-grid i {
font-size: 30px;
line-height: 20px;
margin-top: 6px;
margin-bottom: 10px;
display: block;
}

.umb-card-grid .umb-card-grid-item__loading {
position: absolute;
background-color: rgba(255,255,255,0.8);
top: 0;
right: 0;
bottom: 0;
left: 0;
}


//Round icon-like button - this should be somewhere else
.umb-btn-round {
padding: 4px 6px 4px 6px;
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ input.umb-group-builder__group-sort-value {

.icon {
font-size: 32px;
line-height: 1;
}
}

Expand Down
42 changes: 19 additions & 23 deletions ...Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
text="Type to search"
on-change="vm.searchTermChanged()"
css-class="w-100"
auto-focus="true"
>
auto-focus="true">
</umb-search-filter>

<umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
Expand All @@ -33,14 +32,13 @@
<h2 class="h5">{{key | umbCmsTitleCase}}</h2>
<ul class="umb-card-grid -six-in-row">
<li ng-repeat="dataType in value | orderBy:'name'" data-element="datatype-{{dataType.name}}">
<button
type="button"
class="btn-reset umb-card-grid-item"
ng-click="vm.viewOptionsForEditor(dataType)"
title="{{ dataType.name }}">
<button type="button"
class="btn-reset umb-card-grid-item"
ng-click="vm.viewOptionsForEditor(dataType)"
title="{{dataType.name}}">
<span>
<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}" aria-hidden="true"></i>
{{ dataType.name }}
<umb-icon icon="{{dataType.icon || 'icon-autofill'}}" class="{{dataType.icon || 'icon-autofill'}}"></umb-icon>
{{dataType.name}}
</span>
</button>
</li>
Expand All @@ -62,14 +60,13 @@ <h3 class="h5">{{result.group | umbCmsTitleCase}}</h3>
<div ng-if="dataType.loading" class="umb-card-grid-item__loading">
<div class="umb-button__progress"></div>
</div>
<button
type="button"
class="btn-reset umb-card-grid-item"
ng-click="vm.pickDataType(dataType)"
title="{{ dataType.name }}">
<button type="button"
class="btn-reset umb-card-grid-item"
ng-click="vm.pickDataType(dataType)"
title="{{dataType.name}}">
<span>
<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}" aria-hidden="true"></i>
{{ dataType.name }}
<umb-icon icon="{{dataType.icon || 'icon-autofill'}}" class="{{dataType.icon || 'icon-autofill'}}"></umb-icon>
{{dataType.name}}
</span>
</button>
</li>
Expand All @@ -84,14 +81,13 @@ <h2 class="h5 -border-bottom -black">
<h3 class="h5">{{result.group | umbCmsTitleCase}}</h3>
<ul class="umb-card-grid -six-in-row">
<li ng-repeat="dataType in result.entries | orderBy:'name'">
<button
type="button"
class="btn-reset umb-card-grid-item"
ng-click="vm.pickEditor(dataType)"
title="{{ dataType.name }}">
<button type="button"
class="btn-reset umb-card-grid-item"
ng-click="vm.pickEditor(dataType)"
title="{{dataType.name}}">
<span>
<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}" aria-hidden="true"></i>
{{ dataType.name }}
<umb-icon icon="{{dataType.icon || 'icon-autofill'}}" class="{{dataType.icon || 'icon-autofill'}}"></umb-icon>
{{dataType.name}}
</span>
</button>
</li>
Expand Down
31 changes: 14 additions & 17 deletions ...UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
text="Type to filter..."
css-class="w-100"
on-change="vm.filterItems()"
auto-focus="true"
>
auto-focus="true">
</umb-search-filter>

<umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
Expand All @@ -36,14 +35,13 @@ <h5>{{key}}</h5>
<ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
<li ng-repeat="parameterEditor in value | orderBy:'name'"
data-element="editor-{{parameterEditor.name}}">
<button
type="button"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)"
class="btn-reset umb-card-grid-item"
title="{{parameterEditor.name}}">
<button type="button"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)"
class="btn-reset umb-card-grid-item"
title="{{parameterEditor.name}}">
<span>
<i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}" aria-hidden="true"></i>
<umb-icon icon="{{parameterEditor.icon || 'icon-autofill'}}" class="{{parameterEditor.icon || 'icon-autofill'}}"></umb-icon>
{{parameterEditor.name}}
</span>
</button>
Expand All @@ -63,17 +61,16 @@ <h5>{{result.group}}</h5>
<div ng-if="parameterEditor.loading" class="umb-card-grid-item__loading">
<div class="umb-button__progress"></div>
</div>
<button
type="button"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)"
class="btn-reset umb-card-grid-item"
title="{{parameterEditor.name}}">
<button type="button"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)"
class="btn-reset umb-card-grid-item"
title="{{parameterEditor.name}}">
<span>
<i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}" aria-hidden="true"></i>
<umb-icon icon="{{parameterEditor.icon || 'icon-autofill'}}" class="{{parameterEditor.icon || 'icon-autofill'}}"></umb-icon>
{{parameterEditor.name}}
</span>
</a>
</button>
</li>
</ul>
</div>
Expand Down
34 changes: 17 additions & 17 deletions src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<div ng-controller="Umbraco.Overlays.ItemPickerOverlay" class="umb-itempicker">
<div class="form-search" ng-if="model.filter !== false" style="margin-bottom: 15px;">
<i class="icon-search" aria-hidden="true"></i>
<input type="text"
ng-model="filter.searchTerm"
class="umb-search-field search-query input-block-level -full-width-input"
localize="placeholder"
placeholder="@placeholders_filter"
umb-auto-focus
no-dirty-check />

<div class="mb3" ng-if="model.filter !== false">
<umb-search-filter
model="filter.searchTerm"
label-key="placeholders_filter"
text="Type to filter..."
css-class="w-100"
auto-focus="true">
</umb-search-filter>
</div>

<div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:filter.searchTerm).length > 0">
<h5><localize key="content_createFromClipboard">Paste from clipboard</localize></h5>
<button ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)" alt="Clear clipboard for entries accepted in this context.">
<i class="icon-trash" aria-hidden="true"></i>
<button type="button" ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)" alt="Clear clipboard for entries accepted in this context.">
<umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
</button>
</div>

<ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
<li ng-repeat="pasteItem in model.pasteItems | filter:filter.searchTerm">
<button type="button" class="umb-card-grid-item btn-reset" ng-click="model.clickPasteItem(pasteItem)">
<span>
<i class="{{ pasteItem.icon }}" aria-hidden="true"></i>
<umb-icon icon="{{pasteItem.icon}}" class="{{pasteItem.icon}}"></umb-icon>
{{ pasteItem.name | truncate:true:36 }}
</span>
</button>
Expand All @@ -36,16 +36,16 @@ <h5><localize key="content_createEmpty">Create new</localize></h5>
<li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:filter.searchTerm">
<button type="button" class="umb-card-grid-item btn-reset" ng-click="selectItem(availableItem)">
<span ng-mouseover="showTooltip(availableItem, $event)" ng-mouseleave="hideTooltip()">
<i class="{{ availableItem.icon }}" aria-hidden="true"></i>
<span>{{ availableItem.name }}</span>
<umb-icon icon="{{availableItem.icon}}" class="{{availableItem.icon}}"></umb-icon>
<span>{{availableItem.name}}</span>
</span>
</button>
</li>
<li ng-if="model.createNewItem">
<button class="umb-card-grid-item btn-reset --creator" ng-click="model.createNewItem.action()">
<button type="button" class="umb-card-grid-item btn-reset --creator" ng-click="model.createNewItem.action()">
<span>
<i class="{{ model.createNewItem.icon }}"></i>
{{ model.createNewItem.name }}
<umb-icon icon="{{model.createNewItem.icon}}" class="{{model.createNewItem.icon}}"></umb-icon>
{{model.createNewItem.name}}
</span>
</button>
</li>
Expand Down
8 changes: 4 additions & 4 deletions src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<div class="umb-child-selector__child -parent">
<div class="umb-child-selector__child-description">
<div class="umb-child-selector__child-icon-holder">
<i class="umb-child-selector__child-icon {{ parentIcon }}" aria-hidden="true"></i>
<umb-icon icon="{{parentIcon}}" class="umb-child-selector__child-icon {{parentIcon}}"></umb-icon>
</div>
<span class="umb-child-selector__child-name">
<strong>{{ parentName }}</strong>
<strong>{{parentName}}</strong>
</span>
<small>
(<localize key="general_current"></localize>)
Expand All @@ -19,13 +19,13 @@
<div class="umb-child-selector__child" ng-repeat="selectedChild in selectedChildren">
<div class="umb-child-selector__child-description">
<div class="umb-child-selector__child-icon-holder">
<i class="umb-child-selector__child-icon {{selectedChild.icon}}" aria-hidden="true"></i>
<umb-icon icon="{{selectedChild.icon}}" class="umb-child-selector__child-icon {{selectedChild.icon}}"></umb-icon>
</div>
<span class="umb-child-selector__child-name">{{selectedChild.name}}</span>
</div>
<div class="umb-child-selector__child-actions">
<button type="button" class="umb-child-selector__child-remove" ng-click="removeChild(selectedChild, $index)">
<i class="icon-trash" aria-hidden="true"></i>
<umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
</button>
</div>
</div>
Expand Down
Loading