Skip to content

Commit ee9752f

Browse files
authored
[WC-1698]: Replace glyphicons in pluggableWidgets (#504)
2 parents 5807635 + 81eb1ed commit ee9752f

File tree

55 files changed

+618
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+618
-102
lines changed

packages/modules/data-widgets/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- We replaced glyphicons with internal icons
12+
913
## [2.7.2] DataWidgets - 2023-05-02
1014

1115
### [2.7.1] Datagrid

packages/modules/data-widgets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@mendix/data-widgets",
33
"moduleName": "Data Widgets",
4-
"version": "2.7.2",
4+
"version": "2.7.3",
55
"license": "Apache-2.0",
66
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
77
"private": true,

packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-filters.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ $item-min-height: 32px;
2929

3030
.btn-calendar {
3131
margin-left: 5px; //Review in atlas, the current date picker is also 5px
32+
.button-icon {
33+
width: 18px;
34+
height: 18px;
35+
}
3236
}
3337
}
3438

packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,13 @@ $grid-selected-row-background: $brand-light;
313313
outline: 1px solid $brand-primary;
314314
}
315315
}
316+
.pagination-icon {
317+
position: relative;
318+
top: 4px;
319+
display: inline-block;
320+
width: 20px;
321+
height: 20px;
322+
}
316323
}
317324

318325
/* Column selector for hidable columns outside DG context */

packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- We replaced glyphicons with internal icons
12+
913
## [2.5.0] - 2023-05-01
1014

1115
### Fixed
Loading
Loading

packages/pluggableWidgets/datagrid-date-filter-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@mendix/datagrid-date-filter-web",
33
"widgetName": "DatagridDateFilter",
4-
"version": "2.5.0",
4+
"version": "2.5.1",
55
"description": "",
66
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
77
"private": true,
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { createElement } from "react";
2+
3+
export default function CalendarIcon() {
4+
return (
5+
<svg className="button-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
6+
<path
7+
fill="currentColor"
8+
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
9+
/>
10+
</svg>
11+
);
12+
}

packages/pluggableWidgets/datagrid-date-filter-web/src/components/DatePicker.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { isDate, isValid } from "date-fns";
1717
import { createPortal } from "react-dom";
1818
import replaceAllInserter from "string.prototype.replaceall";
1919
import { doubleMonthOrDayWhenSingle } from "../utils/utils";
20+
import CalendarIcon from "./CalendarIcon";
2021

2122
export type RangeDateValue = [Date | undefined, Date | undefined];
2223

@@ -147,7 +148,7 @@ export const DatePicker = forwardRef(
147148
}
148149
}}
149150
>
150-
<span className="glyphicon glyphicon-calendar" />
151+
<CalendarIcon />
151152
</button>
152153
</Fragment>
153154
);

0 commit comments

Comments
 (0)