Skip to content

Commit bee5785

Browse files
LucasharskampLucasharskamp
committed
Merge commit.
2 parents ba59bbf + d564976 commit bee5785

File tree

132 files changed

+5499
-2488
lines changed

Some content is hidden

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

132 files changed

+5499
-2488
lines changed

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@
6363
#*.RTF diff=astextplain
6464

6565
# blazor dlls
66-
*.dll binary
66+
*.dll binary

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4+
##
45
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
56

67
# User-specific files

‎BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "3.0.0-preview.1",
2+
"version": "3.0.0-preview.2",
33
"release": {
4-
"short_description": "Charts, Grid, Modal, Sidebar, Sidebar2 updates, and other improvements!!!"
4+
"short_description": "New Polar Area Chart and Image Components and Other Improvements!!!"
55
},
66
"urls": {
77
"docs": "//docs.blazorbootstrap.com/docs/getting-started/blazor-webassembly",

‎BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor.cs

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,23 @@ internal override IReadOnlyCollection<NavItem> GetNavItems()
4141

4242
#region Grid
4343

44-
new (){ Id = "511", Text = "Grid", IconName = IconName.Grid, ParentId = "5" },
45-
new (){ Id = "51101", Text = "Overview", Href = "/grid/overview", IconName = IconName.Grid, ParentId = "511" },
46-
new (){ Id = "51102", Text = "Data Binding", Href = "/grid/data-binding", IconName = IconName.GridFill, ParentId = "511" },
47-
new (){ Id = "51103", Text = "Filters", Href = "/grid/filters", IconName = IconName.FunnelFill, ParentId = "511" },
48-
new (){ Id = "51104", Text = "Paging", Href = "/grid/paging", IconName = IconName.ChevronBarRight, ParentId = "511" },
49-
new (){ Id = "51105", Text = "Sorting", Href = "/grid/sorting", IconName = IconName.ArrowDownUp, ParentId = "511" },
50-
new (){ Id = "51106", Text = "Selection", Href = "/grid/selection", IconName = IconName.CheckSquareFill, ParentId = "511" },
51-
new (){ Id = "51107", Text = "Alignment", Href = "/grid/alignment", IconName = IconName.Justify, ParentId = "511" },
52-
new (){ Id = "51108", Text = "Grid Settings", Href = "/grid/settings", IconName = IconName.GearFill, ParentId = "511" },
53-
new (){ Id = "51109", Text = "Custom CSS Class", Href = "/grid/custom-css-class", IconName = IconName.FileTypeCss, ParentId = "511" },
54-
new (){ Id = "51110", Text = "Events", Href = "/grid/events", IconName = IconName.Fire, ParentId = "511" },
55-
new (){ Id = "51111", Text = "Translations", Href = "/grid/translations", IconName = IconName.Translate, ParentId = "511" },
56-
new (){ Id = "51112", Text = "Fixed Header", Href = "/grid/fixed-header", IconName = IconName.Table, ParentId = "511" },
57-
new (){ Id = "51113", Text = "Freeze Columns", Href = "/grid/freeze-columns", IconName = IconName.LayoutThreeColumns, ParentId = "511" },
58-
new (){ Id = "51114", Text = "Other", Href = "/grid/other", IconName = IconName.PlusSquareFill, ParentId = "511" },
44+
new (){ Id = "511", Text = "Grid", IconName = IconName.Grid, ParentId = "5" },
45+
new (){ Id = "51101", Text = "Overview", Href = "/grid/overview", IconName = IconName.Grid, ParentId = "511" }, // first item- do not change
46+
new (){ Id = "51102", Text = "Alignment", Href = "/grid/alignment", IconName = IconName.Justify, ParentId = "511" },
47+
new (){ Id = "51103", Text = "Custom CSS Class", Href = "/grid/custom-css-class", IconName = IconName.FileTypeCss, ParentId = "511" },
48+
new (){ Id = "51104", Text = "Data Binding", Href = "/grid/data-binding", IconName = IconName.GridFill, ParentId = "511" },
49+
new (){ Id = "51106", Text = "Detail View", Href = "/grid/detail-view", IconName = IconName.ListNested, ParentId = "511" },
50+
new (){ Id = "51107", Text = "Events", Href = "/grid/events", IconName = IconName.LightningChargeFill, ParentId = "511" },
51+
new (){ Id = "51107", Text = "Filters", Href = "/grid/filters", IconName = IconName.FunnelFill, ParentId = "511" },
52+
new (){ Id = "51108", Text = "Fixed Header", Href = "/grid/fixed-header", IconName = IconName.Table, ParentId = "511" },
53+
new (){ Id = "51109", Text = "Freeze Columns", Href = "/grid/freeze-columns", IconName = IconName.LayoutThreeColumns, ParentId = "511" },
54+
new (){ Id = "51110", Text = "Grid Settings", Href = "/grid/settings", IconName = IconName.GearFill, ParentId = "511" },
55+
new (){ Id = "51111", Text = "Nested Grid", Href = "/grid/nested-grid", IconName = IconName.Pip, ParentId = "511" },
56+
new (){ Id = "51112", Text = "Paging", Href = "/grid/paging", IconName = IconName.ChevronBarRight, ParentId = "511" },
57+
new (){ Id = "51113", Text = "Selection", Href = "/grid/selection", IconName = IconName.CheckSquareFill, ParentId = "511" },
58+
new (){ Id = "51114", Text = "Sorting", Href = "/grid/sorting", IconName = IconName.ArrowDownUp, ParentId = "511" },
59+
new (){ Id = "51115", Text = "Translations", Href = "/grid/translations", IconName = IconName.Translate, ParentId = "511" },
60+
new (){ Id = "51199", Text = "Other", Href = "/grid/other", IconName = IconName.PlusSquareFill, ParentId = "511" }, // last item - do not change
5961

6062
#endregion Grid
6163

@@ -81,6 +83,7 @@ internal override IReadOnlyCollection<NavItem> GetNavItems()
8183
new (){ Id = "601", Text = "Doughnut Chart", Href = "/charts/doughnut-chart", IconName = IconName.CircleFill, ParentId = "6", Match = NavLinkMatch.All },
8284
new (){ Id = "602", Text = "Line Chart", Href = "/charts/line-chart", IconName = IconName.GraphUp, ParentId = "6", Match = NavLinkMatch.All },
8385
new (){ Id = "603", Text = "Pie Chart", Href = "/charts/pie-chart", IconName = IconName.PieChartFill, ParentId = "6", Match = NavLinkMatch.All },
86+
new (){ Id = "604", Text = "Polar Area Chart", Href = "/charts/polar-area-chart", IconName = IconName.PieChartFill, ParentId = "6", Match = NavLinkMatch.All },
8487

8588
new(){ Id = "7", Text = "Services", IconName = IconName.WrenchAdjustableCircleFill, IconColor = IconColor.Success },
8689
new (){ Id = "700", Text = "Modal Service", Href = "/modal-service", IconName = IconName.WindowStack, ParentId = "7" },

‎BlazorBootstrap.Demo.RCL/Components/Pages/Charts/ChartsDocumentation.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
<li><a href="/charts/doughnut-chart">Doughnut Chart</a></li>
2222
<li><a href="/charts/line-chart">Line Chart</a></li>
2323
<li><a href="/charts/pie-chart">Pie Chart</a></li>
24+
<li><a href="/charts/polar-area-chart">Polar Area Chart</a></li>
2425
</ol>
2526

2627
<Callout Color="CalloutColor.Info">
27-
We will add Bubble Chart, Polar Area Chart, Radar Chart, Scatter Chart, and Mixed Chart support in the subsequent versions.
28+
We will add Bubble Chart, Radar Chart, Scatter Chart, and Mixed Chart support in the subsequent versions.
2829
</Callout>
2930

3031
<SectionHeading Size="HeadingSize.H4" Text="Charts Setup" PageUrl="@pageUrl" HashTagName="charts-setup" />

‎BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_02_Datalabels.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@
100100
var dataset = GetRandomDoughnutChartDataset();
101101

102102
if (index == 0)
103-
dataset.Datalabels.Anchor = "end";
103+
dataset.Datalabels.Anchor = Anchor.End;
104104
else if (index == numberOfDatasets - 1)
105-
dataset.Datalabels.Anchor = "start";
105+
dataset.Datalabels.Anchor = Anchor.Start;
106106
else
107-
dataset.Datalabels.Anchor = "center";
107+
dataset.Datalabels.Anchor = Anchor.Center;
108108

109109
datasets.Add(dataset);
110110
}

‎BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_A_Examples.razor

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@
121121
{
122122
Label = $"Team {datasetsCount}",
123123
Data = GetRandomData(),
124-
BackgroundColor = new List<string> { c.ToRgbString() },
125-
BorderColor = new List<string> { c.ToRgbString() },
126-
BorderWidth = new List<double> { 2 },
127-
HoverBorderWidth = new List<double> { 4 },
128-
PointBackgroundColor = new List<string> { c.ToRgbString() },
129-
PointRadius = new List<int> { 0 }, // hide points
130-
PointHoverRadius = new List<int> { 4 }
124+
BackgroundColor = c.ToRgbString(),
125+
BorderColor = c.ToRgbString(),
126+
BorderWidth = 2,
127+
HoverBorderWidth = 4,
128+
PointBackgroundColor = c.ToRgbString(),
129+
PointRadius = 0, // hide points
130+
PointHoverRadius = 4,
131131
};
132132
}
133133

‎BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_04_Datalabels.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
PointHoverRadius = new List<int> { 4 },
2626

2727
// datalabels
28-
Datalabels = new() { Align = "end", Anchor = "end" }
28+
Datalabels = new() { Alignment = Alignment.End, Anchor = Anchor.End }
2929
};
3030
datasets.Add(dataset1);
3131

@@ -42,7 +42,7 @@
4242
PointHoverRadius = new List<int> { 4 },
4343

4444
// datalabels
45-
Datalabels = new() { Align = "end", Anchor = "end" }
45+
Datalabels = new() { Alignment = Alignment.End, Anchor = Anchor.End }
4646
};
4747
datasets.Add(dataset2);
4848

@@ -59,7 +59,7 @@
5959
PointHoverRadius = new List<int> { 4 },
6060

6161
// datalabels
62-
Datalabels = new() { Align = "start", Anchor = "start" }
62+
Datalabels = new() { Alignment = Alignment.Start, Anchor = Anchor.Start }
6363
};
6464
datasets.Add(dataset3);
6565

‎BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_05_Tick_Configuration.razor

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
{
7878
Label = $"Team {datasetsCount}",
7979
Data = GetRandomData(),
80-
BackgroundColor = new List<string> { c.ToRgbString() },
81-
BorderColor = new List<string> { c.ToRgbString() },
82-
BorderWidth = new List<double> { 2 },
83-
HoverBorderWidth = new List<double> { 4 },
84-
PointBackgroundColor = new List<string> { c.ToRgbString() },
85-
PointRadius = new List<int> { 0 }, // hide points
86-
PointHoverRadius = new List<int> { 4 }
80+
BackgroundColor = c.ToRgbString(),
81+
BorderColor = c.ToRgbString(),
82+
BorderWidth = 2,
83+
HoverBorderWidth = 4,
84+
PointBackgroundColor = c.ToRgbString(),
85+
PointRadius = 0, // hide points
86+
PointHoverRadius = 4,
8787
};
8888
}
8989

‎BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_02_Datalabels.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
var dataset = GetRandomPieChartDataset();
9999

100100
if (index == 0)
101-
dataset.Datalabels.Anchor = "end";
101+
dataset.Datalabels.Anchor = Anchor.End;
102102
else if (index == numberOfDatasets - 1)
103-
dataset.Datalabels.Anchor = "end";
103+
dataset.Datalabels.Anchor = Anchor.End;
104104
else
105-
dataset.Datalabels.Anchor = "center";
105+
dataset.Datalabels.Anchor = Anchor.Center;
106106

107107
datasets.Add(dataset);
108108
}

0 commit comments

Comments
 (0)