Skip to content

Commit 090f648

Browse files
committed
Update Pages to Work With Bootstrap 5
1 parent 86c82c1 commit 090f648

File tree

10 files changed

+184
-174
lines changed

10 files changed

+184
-174
lines changed

_includes/_header.htm

+126-128
Large diffs are not rendered by default.

_layouts/wiki-de.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@
3939
<script src="/assets/js/core/bootstrap-5.1.3.bundle.min.js" type="text/javascript"></script>
4040
<script src="/assets/js/details-element-polyfill.js" type="text/javascript"></script>
4141
<script> //open dropdown by default if on Desktop, but not on Mobile
42-
const breakpoint = parseInt(
43-
getComputedStyle(document.documentElement).getPropertyValue('--breakpoint-xl')
44-
);
45-
if (screen.width >= breakpoint){
42+
if (screen.width >= 1200){ //xl breakpoint is 1200px
4643
document.getElementById("docs-menu").open = true;
4744
}
4845
</script>

_layouts/wiki-sv.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@
3939
<script src="/assets/js/core/bootstrap-5.1.3.bundle.min.js" type="text/javascript"></script>
4040
<script src="/assets/js/details-element-polyfill.js" type="text/javascript"></script>
4141
<script> //open by dropdown default if on Desktop, but not on Mobile
42-
const breakpoint = parseInt(
43-
getComputedStyle(document.documentElement).getPropertyValue('--breakpoint-xl')
44-
);
45-
if (screen.width >= breakpoint){
42+
if (screen.width >= 1200){ //xl breakpoint is 1200px
4643
document.getElementById("docs-menu").open = true;
4744
}
4845
</script>

_layouts/wiki.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@
3939
<script src="/assets/js/core/bootstrap-5.1.3.bundle.min.js" type="text/javascript"></script>
4040
<script src="/assets/js/details-element-polyfill.js" type="text/javascript"></script>
4141
<script> //open by dropdown default if on Desktop, but not on Mobile
42-
const breakpoint = parseInt(
43-
getComputedStyle(document.documentElement).getPropertyValue('--breakpoint-xl')
44-
);
45-
if (screen.width >= breakpoint){
42+
if (screen.width >= 1200){ //xl breakpoint is 1200px
4643
document.getElementById("docs-menu").open = true;
4744
}
4845
</script>

assets/css/gridcoin.css

+27-5
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,20 @@ dfn{
154154
padding-bottom: 25px;
155155
background-image:linear-gradient(#9013FE,#360166);
156156
}
157+
.table-custom-dark{
158+
--bs-table-bg: #343a40;
159+
--bs-table-striped-bg: #3e444a;
160+
--bs-table-striped-color: #fff;
161+
--bs-table-active-bg: #373b3e;
162+
--bs-table-active-color: #fff;
163+
--bs-table-hover-bg: #43494e;
164+
--bs-table-hover-color: #fff;
165+
color: #fff;
166+
border-color: #373b3e;
167+
}
168+
.text-brighter-green{ /* brighter than bootstrap text-success */
169+
color:#28a745;
170+
}
157171
/*----End index.htm----*/
158172

159173
/*Contact.htm*/
@@ -228,17 +242,22 @@ dfn{
228242
font-weight: bold;
229243
}
230244
.table-color-yes{
231-
background-color: green;
245+
--bs-table-bg: green;
246+
--bs-table-striped-bg: green;
247+
--bs-table-hover-bg:#009100;
232248
}
233249
.table-color-no{
234-
background-color: darkred;
250+
--bs-table-bg: darkred;
251+
--bs-table-striped-bg: darkred;
252+
--bs-table-hover-bg:#aa0000;
235253
}
236254
.table-color-gdpr-yes{ /* warns that you need to enable stats */
237-
background-color: #999900;
255+
--bs-table-bg: #999900;
256+
--bs-table-striped-bg: #999900;
257+
--bs-table-hover-bg:#c1c100;
238258
}
239-
.table-color-gdpr-yes a{ /* makes the link underlined and not a hard to read blue*/
259+
.table-color-gdpr-yes a{ /* change color to match table text because blue is hard to read*/
240260
color: inherit;
241-
text-decoration: underline;
242261
}
243262

244263
/*----end whitelist.erb----*/
@@ -460,4 +479,7 @@ dfn{
460479
.search-container li{
461480
list-style-type: none;
462481
}
482+
.max-width-25{
483+
max-width: 25%;
484+
}
463485
/* end search.html */

assets/js/fetch-release.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ function getLatestRelease() {
5151
$(document).ready(function () {
5252
getLatestRelease();
5353
$(function () {
54-
$('[data-toggle="tooltip"]').tooltip(); //Enabled bootstrap tooltips.
54+
$('[data-bs-toggle="tooltip"]').tooltip(); //Enabled bootstrap tooltips.
5555
})
5656
});

guides/terminology.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="container">
1010
<div class="row">
1111
<div class="col-12 text-center">
12-
<h4 class="font-weight-bold">Terminology Guide</h4>
12+
<h4 class="fw-bold">Terminology Guide</h4>
1313
</div>
1414
</div>
1515
</div>
@@ -21,7 +21,7 @@ <h4 class="font-weight-bold">Terminology Guide</h4>
2121
<div class="row">
2222
<div class="col-12">
2323
<!--Content-->
24-
<table class="table table-sm table-dark table-hover table-striped table-bordered">
24+
<table class="table table-sm table-custom-dark table-hover table-striped table-bordered">
2525
<thead>
2626
<tr>
2727
<th class="text-center" colspan="2"><h4>BOINC Terminology</h4></th>
@@ -1207,7 +1207,7 @@ <h4 class="font-weight-bold">Terminology Guide</h4>
12071207
<!--End of boinc-->
12081208
<br />
12091209
<!--Start of Crypto-->
1210-
<table class="table table-sm table-dark table-hover table-striped table-bordered">
1210+
<table class="table table-sm table-custom-dark table-hover table-striped table-bordered">
12111211
<thead>
12121212
<tr>
12131213
<th class="text-center" colspan="2"><h4>CryptoCurrency Terminology</h4></th>

guides/whitelist.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2 class="mb-2 anchor-adjust" id="projects">Whitelisted Projects</h2>
4747
<div class="container">
4848
<div class="row text-center mb-5">
4949
<div class="col-12 d-none d-md-block">
50-
<table class="table table-sm table-dark table-hover table-striped table-bordered">
50+
<table class="table table-sm table-custom-dark table-hover table-striped table-bordered">
5151
<thead>
5252
<tr>
5353
<th>
@@ -122,7 +122,7 @@ <h2 class="mb-2 anchor-adjust" id="projects">Whitelisted Projects</h2>
122122
</div>
123123

124124
<div class="col-12 d-none d-sm-block d-md-none">
125-
<table class="table table-sm table-dark table-hover table-striped table-bordered">
125+
<table class="table table-sm table-custom-dark table-hover table-striped table-bordered">
126126
<thead>
127127
<tr>
128128
<th>
@@ -173,7 +173,7 @@ <h2 class="mb-2 anchor-adjust" id="projects">Whitelisted Projects</h2>
173173
</div>
174174

175175
<div class="col-12 d-sm-none">
176-
<table class="table table-sm table-dark table-hover table-striped table-bordered">
176+
<table class="table table-sm table-custom-dark table-hover table-striped table-bordered">
177177
<thead>
178178
<tr>
179179
<th>

index.htm

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<!-- Intro-->
66
<section class="intro">
77
<div class="container">
8-
<div class="row">
9-
<div class="col-12 text-center">
8+
<div class="row justify-content-center">
9+
<div class="col-sm-10 w-xs-100 text-center">
1010
<img class="img-fluid" src="/assets/img/gridcoinblocks-header.svg" alt="Gridcoin logo with coloured blocks behind it. Gridcoin is written in large, bold characters below the image.">
11-
<h1 class="h2 pt-3 font-weight-bold">Rewarding Volunteer Distributed Computing</h1>
11+
<h1 class="h2 pt-3 fw-bold">Rewarding Volunteer Distributed Computing</h1>
1212
</div>
1313
</div>
1414
</div>
@@ -18,17 +18,17 @@ <h1 class="h2 pt-3 font-weight-bold">Rewarding Volunteer Distributed Computing</
1818
<!--What is Gridcoin section-->
1919
<section class="grc-bgcolor grclink">
2020
<div class="container">
21-
<div class="row text-center">
22-
<div class="col-12 py-3">
23-
<h3 class="h2 font-weight-bold py-3">What is Gridcoin?</h3>
21+
<div class="row text-center justify-content-center">
22+
<div class="col-11 py-3">
23+
<h3 class="h2 fw-bold py-3">What is Gridcoin?</h3>
2424
<p>
2525
Gridcoin is an open source <a href="https://en.wikipedia.org/wiki/Cryptocurrency">cryptocurrency</a> (Ticker: GRC) that rewards <a href="https://en.wikipedia.org/wiki/Volunteer_computing">volunteer computing</a> for science through the <a href="https://boinc.berkeley.edu/">BOINC platform</a>.
2626
</p>
27-
<h3 class="h2 font-weight-bold py-3">What is BOINC?</h3>
27+
<h3 class="h2 fw-bold py-3">What is BOINC?</h3>
2828
<p>
2929
<a href="https://boinc.berkeley.edu/">BOINC</a> is an open source platform for volunteer computing that lets individuals use their computers & phones to help science research. It is free to use and already home to 30+ projects over a range of scientific disciplines. Examples include protein structure prediction (<a href="https://boinc.bakerlab.org/rosetta/">Rosetta@home</a>), mapping the Milky Way galaxy (<a href="https://milkyway.cs.rpi.edu/milkyway/">Milkyway@home</a>), and tackling problems in public health and clean energy (<a href="https://www.worldcommunitygrid.org/discover.action">World Community Grid</a>).
3030
</p>
31-
<h3 class="h2 font-weight-bold py-3">How can I participate?</h3>
31+
<h3 class="h2 fw-bold py-3">How can I participate?</h3>
3232
<p>
3333
<b>Individuals:</b>
3434
Join BOINC and start earning Gridcoin for your contributions! See the table below for more information
@@ -46,12 +46,12 @@ <h3 class="h2 font-weight-bold py-3">How can I participate?</h3>
4646
<!-- BOINC Content -->
4747
<section class="grc-bgcolor">
4848
<div class="container">
49-
<div class="row text-center">
50-
<div class="col-12">
49+
<div class="row text-center justify-content-center">
50+
<div class="col-11">
5151
<a class="anchor-adjust" id="ways-to-join"></a>
52-
<h3 class="h2 font-weight-bold pt-3">Comparison of Ways to Join</h3>
52+
<h3 class="h2 fw-bold pt-3">Comparison of Ways to Join</h3>
5353
<p>Comparison of the ways for individuals to join. Click or hover on dotted text for a definition</p>
54-
<table class="table table-sm table-dark table-hover table-striped table-bordered">
54+
<table class="table table-sm table-custom-dark table-hover table-striped table-bordered">
5555
<thead>
5656
<tr class="d-none d-md-table-row">
5757
<th>
@@ -260,7 +260,7 @@ <h3 class="h2 font-weight-bold pt-3">Comparison of Ways to Join</h3>
260260
<div class="container text-center">
261261
<div class="row">
262262
<div class="col-12">
263-
<h3 class="font-weight-bold">Read More</h3>
263+
<h3 class="fw-bold">Read More</h3>
264264
<p class="mb-2">More in-depth information about Gridcoin</p>
265265
<a href="/assets/docs/whitepaper.pdf" target="_blank"><button class="btn rounded-pill grcbtn">Gridcoin Whitepaper</button></a>
266266
<a href="/wiki/" target="_blank"><button class="btn rounded-pill grcbtn">Gridcoin Wiki</button></a>
@@ -276,10 +276,10 @@ <h3 class="font-weight-bold">Read More</h3>
276276
<div class="col-12">
277277
<a name="Downloads" class="anchor-adjust"></a>
278278
<h3 class="text-center mb-3">Downloads</h3>
279-
<h4 class="font-weight-bold">
279+
<h4 class="fw-bold">
280280
Latest Gridcoin Research Client
281281
</h4>
282-
<p class="text-success font-weight-bold" id="wallet-version">
282+
<p class="text-brighter-green fw-bold" id="wallet-version">
283283
</p>
284284
</div>
285285
</div>

search.htm

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
---
66
<div class="row justify-content-center">
77
<noscript><div class="col-12 mb-5"><b class="h1">This requires Javascript to work since searching is done client side. Either enable Javascript or try using a search engine and prefix it with <code>site:gridcoin.us</code> instead</b></div></noscript>
8-
<div class="col-md-8 offset-md-3 col-auto">
9-
<label class="sr-only" for="search-box">Search</label>
8+
<div class="col-md-5 col-auto">
9+
<label class="visually-hidden" for="search-box">Search</label>
1010
<form action="/search.htm" class="form-inline" method="get">
11-
<div class="input-group col-md-8">
12-
<div class="input-group-prepend">
13-
<div class="input-group-text"><span class="oi oi-magnifying-glass"></span></div>
14-
</div>
11+
<div class="input-group">
12+
13+
<div class="input-group-text"><span class="oi oi-magnifying-glass"></span></div>
1514
<input type="text" placeholder="your search" id="search-box" name="query" class="form-control text-dark">
16-
<input type="submit" value="search" class="form-control btn btn-primary col-md-3">
15+
<input type="submit" value="search" class="form-control btn btn-primary max-width-25">
1716
</div>
1817
</form>
1918
</div>

0 commit comments

Comments
 (0)