Skip to content

Commit df3feee

Browse files
authored
Use button elements in grid editor (#8887)
1 parent 9feb6e6 commit df3feee

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/Umbraco.Web.UI.Client/src/less/buttons.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ input[type="submit"].btn {
342342
cursor: pointer;
343343
color: @ui-icon;
344344
margin: 0;
345-
padding: 5px 10px;
345+
padding: 3px 5px;
346346
width: auto;
347347
overflow: visible;
348348
background: transparent;

src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ input.umb-group-builder__group-title-input:disabled:hover {
355355
position: relative;
356356
margin: 5px 0;
357357

358-
> button {
358+
button.btn-icon {
359359
border: none;
360360
font-size: 18px;
361361
position: relative;

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@
9191
<div class="umb-tools row-tools" ng-show="(row === active || row === currentRowWithActiveChild) && !sortMode">
9292

9393
<div class="cell-tools-edit row-tool" ng-if="hasSettings">
94-
<i class="icon icon-settings" title="@grid_settings" localize="title" ng-click="editGridItemSettings(row, 'row')"></i>
94+
<button type="button" class="btn-icon" ng-click="editGridItemSettings(row, 'row')" localize="title" title="@grid_settings">
95+
<umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
96+
<span class="sr-only">
97+
<localize key="grid_settings">Settings</localize>
98+
</span>
99+
</button>
95100
</div>
96101

97102
<div class="cell-tools-remove row-tool">
@@ -155,10 +160,10 @@
155160
</div>
156161

157162
<div class="cell-tools" ng-if="(area === active || area === currentCellWithActiveChild) && !sortMode">
158-
<button type="button" aria-haspopup="true" class="btn-icon cell-tool" ng-click="editGridItemSettings(area, 'cell')">
159-
<i class="icon-settings" aria-hidden="true"></i>
160-
<span class="sr-only">Open column settings</span>
161-
</button>
163+
<button type="button" aria-haspopup="true" class="btn-icon cell-tool" ng-click="editGridItemSettings(area, 'cell')">
164+
<umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
165+
<span class="sr-only">Open column settings</span>
166+
</button>
162167
</div>
163168

164169
<div class="umb-cell-inner" ui-sortable="sortableOptionsCell" umb-grid-hack-scope ng-model="area.controls">
@@ -201,7 +206,8 @@
201206
<div class="umb-tools" ng-if="control === active">
202207

203208
<div class="umb-control-tool" ng-if="control.editor.config.settings">
204-
<button type="button" class="umb-control-tool-icon icon-settings btn-icon" ng-click="editGridItemSettings(control, 'control')">
209+
<button type="button" class="umb-control-tool-icon btn-icon" ng-click="editGridItemSettings(control, 'control')">
210+
<umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
205211
<span class="sr-only">
206212
<localize key="general_edit">Edit</localize>
207213
</span>

0 commit comments

Comments
 (0)