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

Jump to bottom

Listview config icons #10036

Merged
merged 6 commits into from
Mar 23, 2021
Merged

Listview config icons #10036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
274d202
Update icons to use <umb-icon> component
bjarnef Mar 22, 2021
3346114
Simplify markup and use disabled button
bjarnef Mar 22, 2021
af7fd80
Use move cursor style on sortable handle
bjarnef Mar 22, 2021
02e3594
Add class for action column
bjarnef Mar 22, 2021
9b34a1e
Update setting auto focus
bjarnef Mar 22, 2021
88440ba
Increase font size of umb-panel-header-icon
bjarnef Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/Umbraco.Web.UI.Client/src/less/buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,22 @@
// --------------------------------------------------

.btn-reset {
padding: 0;
margin: 0;
border: none;
padding: 0;
margin: 0;
border: none;
background: none;
color: currentColor;
color: currentColor;
font-family: @baseFontFamily;
font-size: @baseFontSize;
line-height: @baseLineHeight;
cursor: pointer;
cursor: pointer;

// Disabled state
&.disabled,
&[disabled],
&:disabled:hover {
cursor: default;
}
}

// Button Sizes
Expand Down
4 changes: 4 additions & 0 deletions src/Umbraco.Web.UI.Client/src/less/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@ table thead button:focus{

/* UI interactions */

.ui-sortable-handle {
cursor: move;
}

.umb-table tbody.ui-sortable tr
{
cursor:pointer;
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI.Client/src/less/panel.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@

.umb-panel-header-icon {
cursor: pointer;
font-size: 2rem;
margin-right: 5px;
margin-top: -6px;
height: 50px;
Expand Down
4 changes: 2 additions & 2 deletions ...Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody ui-sortable="sortableOptions" ng-model="model.value">
<tr ng-repeat="val in model.value">
<td>
<i class="icon icon-navigation handle" aria-hidden="true" aria-label="Sort"></i>
<umb-icon icon="icon-navigation" class="icon-navigation icon handle" aria-label="Sort"></umb-icon>
</td>
<td>
<div class="list-view-layout__name flex-column content-start">
Expand All @@ -54,7 +54,7 @@
</td>
<td>
<button type="button" class="btn-icon" ng-click="removeField(val)" aria-label="Remove">
<i class="icon-trash" aria-hidden="true"></i>
<umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
</button>
</td>
</tr>
Expand Down
18 changes: 9 additions & 9 deletions src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@

<div class="list-view-layout" ng-repeat="layout in model.value">

<i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
<umb-icon icon="icon-navigation" class="icon-navigation list-view-layout__sort-handle" aria-label="Sort"></umb-icon>

<div class="list-view-layout__icon-wrapper">

<button ng-if="layout.isSystem !== 1" type="button" class="btn-reset" ng-click="vm.openIconPicker(layout)" umb-auto-focus>
<button type="button"
class="btn-reset"
ng-disabled="layout.isSystem === 1"
ng-click="vm.openIconPicker(layout)"
umb-auto-focus="{{layout.isSystem !== 1}}">
<span class="list-view-layout__icon">
<i class="{{layout.icon}}" aria-hidden="true"></i>
<umb-icon icon="{{layout.icon}}" class="{{layout.icon}}"></umb-icon>
</span>
</button>

<div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
<i class="{{layout.icon}}" aria-hidden="true"></i>
</div>

</div>

<div class="list-view-layout__name">
Expand All @@ -32,12 +32,12 @@
<input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
</div>

<div>
<div class="list-view-layout__action">
<umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>

<div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
<button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
<i class="icon-trash" aria-hidden="true"></i>
<umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
</button>
<umb-confirm-action ng-if="layout.deletePrompt"
direction="left"
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
{{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
</button>


<button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
&nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
{{::blueprint.name}}
Expand Down