Skip to content

Commit 32d9753

Browse files
TimHessTimHess
committed
update to latest version of bootstrap
1 parent ddf092c commit 32d9753

14 files changed

+81
-86
lines changed

‎src/Client/Components/App.razor

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<!DOCTYPE html>
55
<html lang="en">
66
<head>
7-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
87
<script src="https://cdn.cookielaw.org/scripttemplates/otSDKStub.js" data-domain-script="018ee7f5-70e6-7787-8d98-05c8f935c75d"></script>
98
<script>function OptanonWrapper(){}</script>
109
<script>
@@ -30,7 +29,7 @@
3029
<meta name="DC.Type" content="text/html">
3130
<base href="/">
3231
<link rel="icon" href="/images/favicon.png" type="image/png">
33-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
32+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
3433
<link rel="stylesheet" href="css/fonts.css">
3534
<link rel="stylesheet" href="css/site.css">
3635
<link rel="stylesheet" href="css/mobile.css">
@@ -55,6 +54,6 @@
5554
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
5655
</Found>
5756
</Router>
58-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
57+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
5958
</body>
6059
</html>

‎src/Client/Components/Banner.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="banner">
22
<Href href="@Href" NewWindow="@NewWindow">
3-
<div class="row no-gutters text-center" style="padding: 1% 0">
3+
<div class="row g-0 text-center" style="padding: 1% 0">
44
<div class="col desc">
55
<div class="sign rounded-pill special-link text-center" style="min-width:125px;max-width:200px;display:inline-block;margin:10px;">
66
<div style="padding: 4px 4px 0 4px;">@BannerTypeName</div>

‎src/Client/Components/DefaultAltFeature.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row component-feature no-gutters">
1+
<div class="row component-feature g-0">
22
<div class="col-6">
33
<div class="component-feature-title">@Feature.Title</div>
44
<div class="component-feature-desc">@Feature.Description</div>

‎src/Client/Components/DefaultFeature.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row component-feature no-gutters">
1+
<div class="row component-feature g-0">
22
<div class="col-6 text-center">
33
<div class="component-feature-img">
44
<img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/>

‎src/Client/Components/Href.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<NavLink class="@(Class + " nav-link" + (AsButton ? " border border-dark font-weight-bold btn btn-default border-black p-3" : ""))"
2+
<NavLink class="@(Class + (AsButton ? " border border-dark font-weight-bold btn btn-default border-black p-3" : ""))"
33
target="@(NewWindow ? "_blank" : "")" role="@(AsButton ? "button" : "")" @attributes="AdditionalAttributes">@ChildContent</NavLink>
44

55
@code

‎src/Client/Components/Layout/SiteFooter.razor

+29-29
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,41 @@
3131
</div>
3232
<div class="col" id="footer-why-col">
3333
<div class="pb-2 font-weight-bold">Why Steeltoe</div>
34-
<div><Href href="/why-steeltoe">Overview</Href></div>
35-
<div><Href href="/microservices">Microservices</Href></div>
36-
<div><Href href="/cloud">Cloud</Href></div>
37-
<div><Href href="/web-applications">Web Applications</Href></div>
38-
<div><Href href="/event-driven">Event Driven</Href></div>
34+
<div><Href Class="link-light" href="/why-steeltoe">Overview</Href></div>
35+
<div><Href Class="link-light" href="/microservices">Microservices</Href></div>
36+
<div><Href Class="link-light" href="/cloud">Cloud</Href></div>
37+
<div><Href Class="link-light" href="/web-applications">Web Applications</Href></div>
38+
<div><Href Class="link-light" href="/event-driven">Event Driven</Href></div>
3939
</div>
4040
<div class="col" id="footer-learn-col">
4141
<div class="pb-2 font-weight-bold">Learn</div>
42-
<div><Href href="/initializr" NewWindow="true">Steeltoe Initializr</Href></div>
43-
<div><Href href="@(DocsSiteOptions.Value.GuidesHome)">Guides</Href></div>
44-
<div><Href href="@(DocsSiteOptions.Value.DocsHome)">Documentation</Href></div>
45-
<div><Href href="@(DocsSiteOptions.Value.ApiBrowserHome)">API Browser</Href></div>
46-
<div><Href href="@(DocsSiteOptions.Value.BlogHome)">Blog</Href></div>
42+
<div><Href Class="link-light" href="/initializr" NewWindow="true">Steeltoe Initializr</Href></div>
43+
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.GuidesHome)">Guides</Href></div>
44+
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.DocsHome)">Documentation</Href></div>
45+
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.ApiBrowserHome)">API Browser</Href></div>
46+
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.BlogHome)">Blog</Href></div>
4747
</div>
4848
<div class="col" id="footer-projects-col">
4949
<div class="pb-2 font-weight-bold">Projects</div>
50-
<div><Href href="/app-configuration">Application Configuration</Href></div>
51-
<div><Href href="/circuit-breakers">Circuit Breakers</Href></div>
52-
<div><Href href="/logging">Dynamic Logging</Href></div>
53-
<div><Href href="/cloud-management">Management</Href></div>
54-
<div><Href href="/messaging">Messaging</Href></div>
55-
<div><Href href="@(DocsSiteOptions.Value.FileShareHome)">Network File Sharing</Href></div>
56-
<div><Href href="/security-providers">Security</Href></div>
57-
<div><Href href="/service-connectors">Service Connectors</Href></div>
58-
<div><Href href="/service-discovery">Service Discovery</Href></div>
59-
<div><Href href="@(DocsSiteOptions.Value.DocsStreamHome)">Stream</Href></div>
50+
<div><Href Class="link-light" href="/app-configuration">Application Configuration</Href></div>
51+
<div><Href Class="link-light" href="/circuit-breakers">Circuit Breakers</Href></div>
52+
<div><Href Class="link-light" href="/logging">Dynamic Logging</Href></div>
53+
<div><Href Class="link-light" href="/cloud-management">Management</Href></div>
54+
<div><Href Class="link-light" href="/messaging">Messaging</Href></div>
55+
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.FileShareHome)">Network File Sharing</Href></div>
56+
<div><Href Class="link-light" href="/security-providers">Security</Href></div>
57+
<div><Href Class="link-light" href="/service-connectors">Service Connectors</Href></div>
58+
<div><Href Class="link-light" href="/service-discovery">Service Discovery</Href></div>
59+
<div><Href Class="link-light" href="@(DocsSiteOptions.Value.DocsStreamHome)">Stream</Href></div>
6060
</div>
6161
<div class="col" id="footer-others-col">
6262
@*<div class="pb-2 font-weight-bold"><Href href="/training">Training</Href></div>*@
63-
<div class="pb-2 font-weight-bold"><Href href="/support">Support</Href></div>
64-
<div class="pb-2 font-weight-bold"><Href href="/community">Community</Href></div>
63+
<div class="pb-2 font-weight-bold"><Href Class="link-light" href="/support">Support</Href></div>
64+
<div class="pb-2 font-weight-bold"><Href Class="link-light" href="/community">Community</Href></div>
6565
</div>
6666
</div>
6767
<div class="row py-sm-0 py-4">
68-
<div class="col text-right">
68+
<div class="col text-end">
6969
<Href href="https://github.com/SteeltoeOSS" title="Steeltoe on GitHub" NewWindow="true">
7070
<svg id="github-icon" width="100px" height="50px" viewBox="0 0 1 75" xmlns="http://www.w3.org/2000/svg">
7171
<defs>
@@ -94,13 +94,13 @@
9494
</Href>
9595
</div>
9696
</div>
97-
<div class="row align-items-center no-gutters pt-0">
98-
<div class="col text-center my-2 small text-muted">
97+
<div class="row align-items-center g-0 pt-0">
98+
<div class="col text-center my-2 small text-secondary">
9999
Copyright &copy; 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term &quot;Broadcom&quot; refers to Broadcom Inc. and/or its subsidiaries.<br />
100-
&bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/privacy.html" NewWindow="true">Privacy&nbsp;Policy</Href>
101-
&bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/privacy/california-privacy-rights.html" NewWindow="true">Your&nbsp;California&nbsp;Privacy&nbsp;Rights</Href>
102-
&bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/legal.html" NewWindow="true">Terms&nbsp;of&nbsp;Use</Href>
103-
&bull;&nbsp;<Href Class="text-muted" href="/SteeltoeTrademarkGuidelines.pdf" NewWindow="true">Trademark&nbsp;Guidelines</Href>
100+
&bull;&nbsp;<Href Class="link-secondary" href="https://www.vmware.com/help/privacy.html" NewWindow="true">Privacy&nbsp;Policy</Href>
101+
&bull;&nbsp;<Href Class="link-secondary" href="https://www.vmware.com/help/privacy/california-privacy-rights.html" NewWindow="true">Your&nbsp;California&nbsp;Privacy&nbsp;Rights</Href>
102+
&bull;&nbsp;<Href Class="link-secondary" href="https://www.vmware.com/help/legal.html" NewWindow="true">Terms&nbsp;of&nbsp;Use</Href>
103+
&bull;&nbsp;<Href Class="link-secondary" href="/SteeltoeTrademarkGuidelines.pdf" NewWindow="true">Trademark&nbsp;Guidelines</Href>
104104
</div>
105105
</div>
106106
</div>

‎src/Client/Components/Layout/SiteHeader.razor

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
22

3-
<header class="sticky-top bg-white" style="box-shadow: 0 0 20px -4px #eeeeee;">
4-
<nav class="bg-white navbar navbar-expand-xl container py-xl-2 navbar-light">
5-
<Href class="navbar-brand" href="/">
3+
<header class="sticky-top bg-light" style="box-shadow: 0 0 20px -4px #eeeeee;">
4+
<nav class="bg-light navbar navbar-expand-xl container py-xl-2">
5+
<Href Class="navbar-brand" href="/">
66
<img id="logo" class="svg" src="/images/logo.svg" alt="Steeltoe" style="width:211px">
77
</Href>
88
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
@@ -11,19 +11,19 @@
1111
<div class="collapse navbar-collapse" id="navbar">
1212
<ul class="navbar-nav text-center">
1313
<li class="nav-item dropdown ml-xl-5 mr-xl-2">
14-
<a class="nav-link dropdown-toggle" href="#" id="why" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
14+
<a class="nav-link dropdown-toggle link-primary" href="#" id="why" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
1515
Why Steeltoe
1616
</a>
1717
<div class="dropdown-menu" aria-labelledby="why">
18-
<Href class="dropdown-item" href="/why-steeltoe">Overview</Href>
19-
<Href class="dropdown-item" href="/microservices">Microservices</Href>
20-
<Href class="dropdown-item" href="/cloud">Cloud</Href>
21-
<Href class="dropdown-item" href="/web-application">Web Applications</Href>
22-
<Href class="dropdown-item" href="/event-driven">Event Driven</Href>
18+
<Href Class="dropdown-item" href="/why-steeltoe">Overview</Href>
19+
<Href Class="dropdown-item" href="/microservices">Microservices</Href>
20+
<Href Class="dropdown-item" href="/cloud">Cloud</Href>
21+
<Href Class="dropdown-item" href="/web-application">Web Applications</Href>
22+
<Href Class="dropdown-item" href="/event-driven">Event Driven</Href>
2323
</div>
2424
</li>
2525
<li class="nav-item dropdown mx-xl-2">
26-
<a class="nav-link dropdown-toggle" href="#" id="learn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
26+
<a class="nav-link dropdown-toggle link-primary" href="#" id="learn" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
2727
Get Started
2828
</a>
2929
<div class="dropdown-menu" aria-labelledby="learn">
@@ -35,7 +35,7 @@
3535
</div>
3636
</li>
3737
<li class="nav-item dropdown mx-xl-2">
38-
<a class="nav-link dropdown-toggle" href="#" id="projects" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
38+
<a class="nav-link dropdown-toggle link-primary" href="#" id="projects" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
3939
Projects
4040
</a>
4141
<div class="dropdown-menu" aria-labelledby="projects">
@@ -55,10 +55,10 @@
5555
<Href class="nav-link" href="/training">Training</Href>
5656
</li>*@
5757
<li class="nav-item mx-xl-2">
58-
<Href class="nav-link" href="/support">Support</Href>
58+
<Href Class="nav-link link-primary" href="/support">Support</Href>
5959
</li>
6060
<li class="nav-item mx-xl-2">
61-
<Href class="nav-link" href="/community">Community</Href>
61+
<Href Class="nav-link link-primary" href="/community">Community</Href>
6262
</li>
6363
</ul>
6464
</div>

‎src/Client/Components/Pages/Community.razor

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Template Name="Community" MetaDescription="Connect with other developers and share your project with the Steeltoe community.">
44
<Description>Connect with other developers and share your project with the Steeltoe community.</Description>
55
<OtherArea>
6-
<div class="row no-gutters">
6+
<div class="row g-0">
77
<div class="col">
88
<div class="component-whatis-title"><h2>Office Hours Meetup</h2></div>
99
<div class="my-5">
@@ -23,7 +23,7 @@
2323
</div>
2424
</div>
2525
</div>
26-
<div class="row no-gutters mb-5">
26+
<div class="row g-0 mb-5">
2727
<div class="col-6">
2828
<div class="component-whatis-title"><h2>Developers</h2></div>
2929
<div class="my-5">

‎src/Client/Components/Pages/Home.razor

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
<div class="bg-midnight-blue text-white width-all">
1919
<div class="width-70 container">
20-
<div class="row no-gutters pt-5">
20+
<div class="row g-0 pt-5">
2121
<div class="col text-center">
2222
<h1>
2323
Creating .NET microservices? <br />Modernizing existing applications?<br />
2424
Moving apps to containers? <br /> <br />Steeltoe makes your life much easier.
2525
</h1>
2626
</div>
2727
</div>
28-
<div class="row no-gutters mt-5">
28+
<div class="row g-0 mt-5">
2929
<div class="col text-center">
3030
<Href class="text-white border-white mr-4" href="/why-steeltoe" AsButton="true">WHY STEELTOE</Href>
3131
<Href class="text-white border-white" href="@(DocsSiteOptions.Value.GuidesHome)" AsButton="true">GET STARTED</Href>
@@ -37,7 +37,7 @@
3737
<div class="width-70 container">
3838
<div class="width-all text-center"><h2>What Steeltoe can do</h2></div>
3939
<div class="">
40-
<div class="row no-gutters">
40+
<div class="row g-0">
4141
<div class="col component">
4242
<Href href="/microservices">
4343
<div class="text-center"><img class="img-fluid" src="/images/icon-microservices-dfc414fd79f67718216adaffb5d99947.svg" alt="Steeltoe helps you build .NET microservices." /></div>
@@ -76,7 +76,7 @@
7676
</div>
7777
<div class="width-all">
7878
<div class="width-90 container py-5">
79-
<div class="row no-gutters text-center mt-3">
79+
<div class="row g-0 text-center mt-3">
8080
<div class="col stat">
8181
Steeltoe has been downloaded over <span class="number">98 million</span> times on <a href="https://www.nuget.org/profiles/SteeltoeOSS">NuGet</a>!
8282
</div>
@@ -100,7 +100,7 @@ else
100100
var i = 1;
101101
@foreach (var calendarEvent in CalendarEventOptions?.Value.Events ?? [])
102102
{
103-
<div class="row no-gutters">
103+
<div class="row g-0">
104104
<div class="col news">
105105
<div class="date">@((MarkupString)calendarEvent.Date)</div>
106106
<div class="title">@((MarkupString)calendarEvent.Title)</div>
@@ -110,7 +110,7 @@ else
110110
</div>
111111
@if (i++ < CalendarEventOptions?.Value.Events.Count)
112112
{
113-
<div class="row no-gutters">
113+
<div class="row g-0">
114114
<div class="col"><hr class="border-steeltoe-blue" /></div>
115115
</div>
116116
}

‎src/Client/Components/Pages/Initializr/Index.razor

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
Application generators can help developers to get easy access to these libraries without having to delve into docs, wade through wikis, or search in NuGet repositories.
2020
</WhatIs>
2121
<OtherArea>
22-
<div class="row no-gutters">
22+
<div class="row g-0">
2323
<div class="col component-whyuse-title mt-0">
2424
<h2>Using Initializr</h2>
2525
</div>
2626
</div>
27-
<div class="row mb-5 no-gutters">
27+
<div class="row mb-5 g-0">
2828
<div class="col component-whyuse-desc">
2929
There are a few ways you can use Steeltoe Initializr. Every option gives you the same ready-to-go .NET project. The typical use of Initializr is hosting the service in-house.
3030
Because it is a nuget-distributed package included in an even simpler .NET app, hosting and staying up to date doesn't come with a bunch of debt.
3131
Hosting in-house also gives teams the option to add their own private dependencies to the service, but stay up to date with the community.
3232
</div>
3333
</div>
34-
<div class="row mb-5 no-gutters">
34+
<div class="row mb-5 g-0">
3535
<div class="col component-whyuse-desc">
3636
<h4>Hosted Service</h4>
3737
<div>
@@ -50,12 +50,12 @@
5050
</div>
5151
</div>
5252
</div>
53-
<div class="row no-gutters">
53+
<div class="row g-0">
5454
<div class="col component-whyuse-title mt-0">
5555
<h2>About Dependencies</h2>
5656
</div>
5757
</div>
58-
<div class="row mb-5 no-gutters">
58+
<div class="row mb-5 g-0">
5959
<div class="col component-whyuse-desc">
6060
No matter the way you choose to use Initializr, the value is in the distribution of pre-packaged dependencies. The default dependencies included in Initializr are mostly Steeltoe focused.
6161
Things like database connectors, a Spring Cloud Config Server client, a Consul service discovery client, and many others. But this is a community driven project, so it only makes sense to offer ways for the .NET community to contribute.<br /><br />

0 commit comments

Comments
 (0)