Skip to content

Commit eb06ef2

Browse files
stsrkistsrki
committed
merge rel-2.0
2 parents 9e8ba4d + 58a7667 commit eb06ef2

28 files changed

Lines changed: 358 additions & 64 deletions

File tree

‎Demos/Blazorise.Demo.Bootstrap5/wwwroot/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
1515
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css">
16+
<link href="_content/Blazorise.Icons.Bootstrap/blazorise.icons.bootstrap.css?v=2.0.3.0" rel="stylesheet" />
1617

1718
<link href="_content/Blazorise/blazorise.css?v=2.0.3.0" rel="stylesheet" />
1819
<link href="_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css?v=2.0.3.0" rel="stylesheet" />

‎Demos/Blazorise.Demo/Pages/Tests/ButtonsPage.razor‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,39 @@
217217
</CardBody>
218218
</Card>
219219
</Column>
220+
<Column>
221+
<Card Margin="Margin.Is4.FromBottom">
222+
<CardHeader>
223+
<CardTitle>Icon Buttons</CardTitle>
224+
</CardHeader>
225+
<CardBody>
226+
<Div Flex="Flex.AlignItems.Center" Gap="Gap.Is2">
227+
<Button Color="Color.Primary" Outline><Icon Name="IconName.Add" /></Button>
228+
<Button Color="Color.Secondary" Outline><Icon Name="IconName.Edit" /></Button>
229+
<Button Color="Color.Danger" Outline><Icon Name="IconName.Delete" /></Button>
230+
<Button Color="Color.Success">
231+
Submit <Icon Name="IconName.Send" Margin="Margin.Is2.FromStart" />
232+
</Button>
233+
<Button Color="Color.Warning" Disabled>
234+
<Icon Name="IconName.Undo" Margin="Margin.Is2.FromEnd" /> Disabled
235+
</Button>
236+
</Div>
237+
</CardBody>
238+
<CardBody>
239+
<Div Flex="Flex.AlignItems.Center" Gap="Gap.Is2">
240+
<Buttons Margin="Margin.Is2.FromEnd">
241+
<Button Color="Color.Dark" Size="Size.Small" Outline><Icon Name="IconName.Bold" /></Button>
242+
<Button Color="Color.Dark" Size="Size.Small" Outline><Icon Name="IconName.Italic" /></Button>
243+
<Button Color="Color.Dark" Size="Size.Small" Outline><Icon Name="IconName.Calendar" /></Button>
244+
</Buttons>
245+
<Buttons>
246+
<Button Color="Color.Dark" Size="Size.Small" Outline><Icon Name="IconName.Image" /></Button>
247+
<Button Color="Color.Dark" Size="Size.Small" Disabled Outline><Icon Name="IconName.Link" /></Button>
248+
</Buttons>
249+
</Div>
250+
</CardBody>
251+
</Card>
252+
</Column>
220253
</Row>
221254
@code {
222255
private bool isLoading;

‎Source/Blazorise.AntDesign/Styles/components/_table.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,12 @@ tr.ant-table-row {
206206
}
207207
}
208208

209+
.ant-table.ant-table-fixed-header.ant-table-fixed-columns {
210+
thead th[data-fixed-position] {
211+
z-index: 12 !important;
212+
}
213+
}
214+
209215

210216
td:focus {
211217
outline: -webkit-focus-ring-color auto 1px;

‎Source/Blazorise.AntDesign/wwwroot/blazorise.antdesign.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,6 +3907,10 @@ tr.ant-table-row.ant-table-row-selectable:focus[tabindex="0"] {
39073907
right: 0;
39083908
}
39093909

3910+
.ant-table.ant-table-fixed-header.ant-table-fixed-columns thead th[data-fixed-position] {
3911+
z-index: 12 !important;
3912+
}
3913+
39103914
td:focus {
39113915
outline: -webkit-focus-ring-color auto 1px;
39123916
}

‎Source/Blazorise.AntDesign/wwwroot/blazorise.antdesign.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Blazorise.Bootstrap/Styles/components/_table.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@ tr {
9595
}
9696
}
9797

98+
.table-fixed-header.table-fixed-columns {
99+
.table {
100+
thead th[data-fixed-position] {
101+
z-index: 12 !important;
102+
}
103+
}
104+
}
105+
98106

99107
td:focus {
100108
outline: -webkit-focus-ring-color auto 1px;

‎Source/Blazorise.Bootstrap/wwwroot/blazorise.bootstrap.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,6 +2439,10 @@ tr.table-row-selectable:focus[tabindex="0"] {
24392439
right: 0;
24402440
}
24412441

2442+
.table-fixed-header.table-fixed-columns .table thead th[data-fixed-position] {
2443+
z-index: 12 !important;
2444+
}
2445+
24422446
td:focus {
24432447
outline: -webkit-focus-ring-color auto 1px;
24442448
}

‎Source/Blazorise.Bootstrap/wwwroot/blazorise.bootstrap.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Blazorise.Bootstrap5/Styles/components/_table.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ tr {
106106
}
107107
}
108108

109+
.table-fixed-header.table-fixed-columns {
110+
> .table {
111+
> thead > tr > th[data-fixed-position] {
112+
z-index: 12 !important;
113+
}
114+
}
115+
}
116+
109117

110118
td:focus {
111119
outline: -webkit-focus-ring-color auto 1px;

‎Source/Blazorise.Bootstrap5/wwwroot/blazorise.bootstrap5.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,6 +1994,10 @@ tr.table-row-selectable:focus[tabindex="0"] {
19941994
border-inline-start-width: 1px;
19951995
}
19961996

1997+
.table-fixed-header.table-fixed-columns > .table > thead > tr > th[data-fixed-position] {
1998+
z-index: 12 !important;
1999+
}
2000+
19972001
td:focus {
19982002
outline: -webkit-focus-ring-color auto 1px;
19992003
}

0 commit comments

Comments
 (0)