Skip to content

Commit ae04e4c

Browse files
Dimitar-GoshevDimitar-Goshev
committed
chore: update references and fix icons
1 parent 6c8ee3a commit ae04e4c

File tree

5 files changed

+77
-86
lines changed

5 files changed

+77
-86
lines changed

‎KendoUIBootstrapIntegration/Content/styles.css‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
@font-face {
2-
font-family: "Kendo UI";
3-
src: url("https://kendo.cdn.telerik.com/2023.1.117/styles/images/kendoui.woff") format("woff"), url("https://kendo.cdn.telerik.com/2023.1.117/styles/images/kendoui.ttf") format("truetype");
4-
}
5-
6-
body:before {
7-
font-family: "Kendo UI";
8-
content: "\a0";
9-
font-size: 0;
10-
width: 0;
11-
height: 0;
12-
position: absolute;
13-
z-index: -1;
14-
}
15-
161
html,
172
body {
183
margin: 0;
@@ -29,6 +14,7 @@ header {
2914
font-size: 20px;
3015
color: #fff;
3116
background-color: #272727;
17+
max-height: 80px;
3218
}
3319

3420
header h1,
@@ -101,11 +87,6 @@ header {
10187
line-height: 45px;
10288
}
10389

104-
header .k-dropdown .k-i-arrow-s {
105-
background-image: url("http://cdn.kendostatic.com/2023.1.117/styles/Bootstrap/sprite.png");
106-
background-position: -16px -32px;
107-
}
108-
10990
header .k-dropdown .k-input {
11091
color: #fff;
11192
}

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Kendo_UI_Bootstrap_Integration</RootNamespace>
1515
<AssemblyName>Kendo UI Bootstrap Integration</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
@@ -44,8 +44,9 @@
4444
<Reference Include="Antlr3.Runtime">
4545
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Kendo.Mvc, Version=2024.3.806.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
47+
<Reference Include="Kendo.Mvc, Version=2024.3.806.462, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Telerik.UI.for.AspNet.Mvc5.Trial.2024.3.806\lib\net45\Kendo.Mvc.dll</HintPath>
49+
<SpecificVersion>False</SpecificVersion>
4950
</Reference>
5051
<Reference Include="Microsoft.CSharp" />
5152
<Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -106,11 +107,11 @@
106107
<Reference Include="System.Web.Services" />
107108
<Reference Include="System.EnterpriseServices" />
108109
<Reference Include="System.Xml.Linq" />
109-
<Reference Include="Telerik.FontIcons, Version=2.1.0.0, Culture=neutral, PublicKeyToken=20b4b0547069c4f8, processorArchitecture=MSIL">
110-
<HintPath>..\packages\Telerik.FontIcons.2.1.0\lib\netstandard1.1\Telerik.FontIcons.dll</HintPath>
110+
<Reference Include="Telerik.FontIcons, Version=3.0.0.0, Culture=neutral, PublicKeyToken=20b4b0547069c4f8, processorArchitecture=MSIL">
111+
<HintPath>..\packages\Telerik.FontIcons.3.0.0\lib\netstandard2.0\Telerik.FontIcons.dll</HintPath>
111112
</Reference>
112-
<Reference Include="Telerik.SvgIcons, Version=2.1.0.0, Culture=neutral, PublicKeyToken=20b4b0547069c4f8, processorArchitecture=MSIL">
113-
<HintPath>..\packages\Telerik.SvgIcons.2.1.0\lib\netstandard1.1\Telerik.SvgIcons.dll</HintPath>
113+
<Reference Include="Telerik.SvgIcons, Version=3.0.0.0, Culture=neutral, PublicKeyToken=20b4b0547069c4f8, processorArchitecture=MSIL">
114+
<HintPath>..\packages\Telerik.SvgIcons.3.0.0\lib\netstandard2.0\Telerik.SvgIcons.dll</HintPath>
114115
</Reference>
115116
<Reference Include="WebGrease">
116117
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>

‎KendoUIBootstrapIntegration/Views/Home/Index.cshtml‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
.Name("tabstrip")
5858
.Items(tabstrip =>
5959
{
60-
tabstrip.Add().Text("<span class='km-icon revenue'></span><span class='hidden-xs'>Revenue</span>")
60+
tabstrip.Add().Text("<span class='km-icon revenue-icon'></span><span class='hidden-xs'>Revenue</span>")
6161
.Encoded(false)
6262
.Selected(true)
6363
.Content(@<text>
6464
@(Html.Kendo().Chart<Kendo_UI_Bootstrap_Integration.Models.RevenueViewModel>()
6565
.Name("revenue")
6666
.DataSource(ds => ds.Read(read => read.Action("Revenue", "Home")))
6767
.Transitions(false)
68-
.Theme("bootstrap")
68+
.Theme("sass")
6969
.ChartArea(chart => chart.Margin(10, 5, 0, 10).Background("transparent"))
7070
.Legend(l => l.Visible(false))
7171
.SeriesDefaults(s=>s
@@ -93,14 +93,14 @@
9393
.Tooltip(t=>t.Visible(true).Template("#= series.name # <br /> #= category #: $#= value #"))
9494
)
9595
</text>);
96-
tabstrip.Add().Text("<span class='km-icon spd'></span><span class='hidden-xs'>Sales / day</span>")
96+
tabstrip.Add().Text("<span class='km-icon spd-icon'></span><span class='hidden-xs'>Sales / day</span>")
9797
.Encoded(false)
9898
.Content(@<text>
9999
@(Html.Kendo().Chart<Kendo_UI_Bootstrap_Integration.Models.SalesPerDayViewModel>()
100100
.Name("sales-per-day")
101101
.DataSource(ds => ds.Read(read => read.Action("SalesPerDay", "Home")))
102102
.Transitions(false)
103-
.Theme("bootstrap")
103+
.Theme("sass")
104104
.ChartArea(chart => chart.Margin(0, 10, 0, 0).Background("transparent"))
105105
.Legend(l => l.Visible(false))
106106
.SeriesDefaults(s => s.VerticalBullet())
@@ -115,14 +115,14 @@
115115
}))
116116
)
117117
</text>);
118-
tabstrip.Add().Text("<span class='km-icon spr'></span><span class='hidden-xs'>Sales / region</span>")
118+
tabstrip.Add().Text("<span class='km-icon spr-icon'></span><span class='hidden-xs'>Sales / region</span>")
119119
.Encoded(false)
120120
.Content(@<text>
121121
@(Html.Kendo().Chart<Kendo_UI_Bootstrap_Integration.Models.SalesPerRegionViewModel>()
122122
.Name("sales-per-region")
123123
.DataSource(ds => ds.Read(read => read.Action("SalesPerRegion", "Home")))
124124
.Transitions(false)
125-
.Theme("bootstrap")
125+
.Theme("sass")
126126
.Legend(l=>l.Visible(false))
127127
.ChartArea(c=>c.Margin(10, 8, 0, 10).Background("transparent"))
128128
.SeriesDefaults(s=>s
@@ -135,7 +135,7 @@
135135
.Labels(l=>l.Visible(false))
136136
.MajorGridLines(l=>l.Visible(false))
137137
)
138-
.Tooltip(t=>t.Visible(false).Template("#= series.name # <br /> #= category #: #= value #"))
138+
.Tooltip(t=>t.Visible(false).Shared(true).Template("#= series.name # <br /> #= category #: #= value #"))
139139
.Series(series => {
140140
series.Area(model => model.Canterbury).Name("Canterbury");
141141
series.Area(model => model.Manchester).Name("Manchester");
@@ -144,15 +144,15 @@
144144
.ValueAxis(v=>v.Numeric().Labels(l=>l.Step(2)))
145145
)
146146
</text>);
147-
tabstrip.Add().Text("<span class='km-icon share'></span><span class='hidden-xs'>Market share</span>")
147+
tabstrip.Add().Text("<span class='km-icon share-icon'></span><span class='hidden-xs'>Market share</span>")
148148
.Encoded(false)
149149
.Content(@<text>
150150
@(Html.Kendo().Chart<Kendo_UI_Bootstrap_Integration.Models.DonutChartViewModel>()
151151
.HtmlAttributes(new { @class = "market-donut"})
152152
.Name("market-alice-mutton")
153153
.DataSource(ds => ds.Read(read => read.Action("AliceMutton", "Home")).Group(g => g.Add(d=> d.Series)))
154154
.Transitions(false)
155-
.Theme("bootstrap")
155+
.Theme("sass")
156156
.Title(t => t
157157
.Text("Alice Mutton")
158158
.Position(ChartTitlePosition.Bottom)
@@ -175,7 +175,7 @@
175175
.Name("market-gravad")
176176
.DataSource(ds => ds.Read(read => read.Action("Gravad", "Home")).Group(g => g.Add(d=> d.Series)))
177177
.Transitions(false)
178-
.Theme("bootstrap")
178+
.Theme("sass")
179179
.Title(t => t
180180
.Text("Gravad lax")
181181
.Position(ChartTitlePosition.Bottom)
@@ -198,7 +198,7 @@
198198
.Name("market-inlagd")
199199
.DataSource(ds => ds.Read(read => read.Action("Inlagd", "Home")).Group(g => g.Add(d=> d.Series)))
200200
.Transitions(false)
201-
.Theme("bootstrap")
201+
.Theme("sass")
202202
.Title(t => t
203203
.Text("Inlagd Sill")
204204
.Position(ChartTitlePosition.Bottom)
@@ -221,7 +221,7 @@
221221
.Name("market-spageslid")
222222
.DataSource(ds => ds.Read(read => read.Action("Spegesild", "Home")).Group(g => g.Add(d=> d.Series)))
223223
.Transitions(false)
224-
.Theme("bootstrap")
224+
.Theme("sass")
225225
.Title(t => t
226226
.Text("Spageslid")
227227
.Position(ChartTitlePosition.Bottom)
@@ -599,4 +599,13 @@
599599
<footer>
600600
Copyright © @DateTime.Now.Year <a href="https://www.telerik.com/">Progress Software Corporation and/or its subsidiaries or affiliates</a>. All Rights Reserved.
601601
</footer>
602-
</div>
602+
</div>
603+
604+
<script>
605+
$(document).ready(function () {
606+
kendo.ui.icon($(".revenue-icon"), { icon: 'dollar' });
607+
kendo.ui.icon($(".spd-icon"), { icon: 'chart-column-clustered' });
608+
kendo.ui.icon($(".spr-icon"), { icon: 'graph' });
609+
kendo.ui.icon($(".share-icon"), { icon: 'chart-doughnut' });
610+
});
611+
</script>

‎KendoUIBootstrapIntegration/Views/Shared/_Layout.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="description" content="See how to create a fully functional user profile pages with the help of Telerik UI for ASP.NET MVC widgets and CSS Responsive layouts provided by Twitter Bootstrap.">
77

88
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" />
9-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/themes/9.0.0/bootstrap/bootstrap-main.css" />
9+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/themes/8.2.1/bootstrap/bootstrap-main.css" />
1010

1111
<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
1212
<script src="https://kendo.cdn.telerik.com/2024.3.806/js/kendo.all.min.js"></script>

0 commit comments

Comments
 (0)