Merge branch 'captainbuckkets-master'

peercoin · Feb 15, 2019 · dcbbeab · dcbbeab
2 parents 8cea358 + 552ee56
commit dcbbeab
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/index.html b/index.html
@@ -205,20 +205,20 @@ <h5 data-toggle="collapse" data-target="#collapsezero" aria-expanded="true" aria
                             <div class="card">
                                 <div class="card-header" id="purchasing_dropdown">
                                     <h5 data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                                        <span><img src="img/icons/wallets.png" alt=""></span>Wallet
+                                        <span><img src="img/icons/purchasing_white.png" alt=""></span>Purchase
                                     </h5>
                                 </div>
                                 <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
                                     <div class="card-body">
                                         <div class="row">
                                             <div class="col-md-6">
                                                 <p>
-                                                    The Peercoin wallet is available on Windows, Mac OSX, and Linux platforms.  Command-line experiences are also available.<br> <br>
-                                                    To get started, check out the <a href="wallet.html" class="intext">wallet download page</a> and the included installation guides.  For more information on how to use the wallet, check the <a href="https://docs.peercoin.net/#/wallets" class="intext">wallets documentation</a>.
+                                                    Peercoin is available through a variety of exchanges and services.  You can <a href="resources.html#exchanges" class="intext">check here for a list</a>.<br><br>
+                                                    A guide to buying Peercoin is also available <a href="https://docs.peercoin.net/#/purchase" class="intext">here</a>.
                                                 </p>
                                             </div>
                                             <div class="col-md-4">
-                                                <img src="img/icons/sidecard-wallet.png" alt="" class="sidecard">
+                                                <img src="img/icons/sidecard-purchasing.png" alt="" class="sidecard">
                                             </div>
                                         </div>
                                     </div>
@@ -227,21 +227,21 @@ <h5 data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-
                             <div class="card">
                                 <div class="card-header" id="purchasing_dropdown">
                                     <h5 data-toggle="collapse" data-target="#collapsetwo" aria-expanded="true" aria-controls="collapsetwo">
-                                        <span><img src="img/icons/purchasing_white.png" alt=""></span>Purchase
+                                        <span><img src="img/icons/wallets.png" alt=""></span>Wallet
                                     </h5>
                                 </div>
                                 <div id="collapsetwo" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
                                     <div class="card-body">
                                         <div class="row">
                                             <div class="col-md-8">
                                                 <p>
-                                                    Peercoin is available through a variety of exchanges and services.  You can <a href="resources.html#exchanges" class="intext">check here for a list</a>.<br><br>
-                                                    A guide to buying Peercoin is also available <a href="https://docs.peercoin.net/#/purchase" class="intext">here</a>.
+                                                    The <a href="wallet.html" class="intext">Peercoin wallet</a> is available on Windows, Mac OSX, and Linux platforms.<br> <br>
+                                                    Command-line experiences are also available.<br><br>
+                                                    To get started, check out the Wallet download page and the Installation guide's.
                                                 </p>
-                                                <script></script>
                                             </div>
                                             <div class="col-md-4">
-                                                <img src="img/icons/sidecard-purchasing.png" alt="" class="sidecard">
+                                                <img src="img/icons/sidecard-wallet.png" alt="" class="sidecard">
                                             </div>
                                         </div>
                                     </div>

diff --git a/resources.html b/resources.html
@@ -70,7 +70,7 @@ <h1 class="titlethick">Documentation</h1>
                 <div data-wow-delay=".2s" class="row wow fadeIn">
                     <!--Minting section-->
                     <div class="row">
-                        <div class="col-md-12">
+                        <div class="col-md-6">
                             <h1 class="titlethick"><a name="mining" class="linked">Mining</a></h1>
                             <br>
                             <p class="desc">
@@ -87,6 +87,24 @@ <h1 class="titlethick"><a name="mining" class="linked">Mining</a></h1>
                                 <a href="https://docs.peercoin.net/#/mining"><span><button class="button green">Documentation</button></span></a>
                                 <a href="https://www.coinwarz.com/calculators/peercoin-mining-calculator"><span><button class="button green">Calculator</button></span></a>
                         </div>
+
+                        <div class="col-md-6">
+                            <h1 class="titlethick"><a name="university" class="linked">Peercoin University</a></h1>
+                            <br>
+                            <p class="desc">
+                                Peercoin University is an educational article geared toward less technical members of the community to help them understand the complex topic of public blockchain.<br><br>
+
+                                The article starts off by explaining what a blockchain is, how it works, and its many benefits and use cases. Bitcoin and proof-of-work is detailed next, followed by Peercoin and proof-of-stake. Other topics include security, centralization, decentralization, scalability, and economics
+                            </p>
+
+                                <ul>
+                                    <li><a href="https://university.peercoin.net/#/2-what-is-a-blockchain-">What is a Blockchain?</a></li>
+                                    <li><a href="https://university.peercoin.net/#/6-inherent-centralization-of-proof-of-work-blockchains">Inherent Centralization of Proof-of-Work Blockchains</a></li>
+                                    <li><a href="https://university.peercoin.net/#/9-peercoin-proof-of-stake-consensus">Peercoin & Proof-Of-Stake Consensus</a></li>
+                                </ul>
+                                <a href="https://university.peercoin.net/"><span><button class="button green">Peercoin University</button></span></a>
+                        </div>
+
                     </div>
                 </div>
             </div>