Merge branch 'hotfix/sponsors'

README.md

@@ -109,13 +109,7 @@ npm run build
 
 Result will appear in `dist` directory.
 
-## Backers
-
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap-table#backer)]
-
-<a href="https://opencollective.com/bootstrap-table#backers" target="_blank"><img src="https://opencollective.com/bootstrap-table/backers.svg?width=890"></a>
-
-## Sponsors
+## OpenCollective Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/bootstrap-table#sponsor)]
 
@@ -124,3 +118,13 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/bootstrap-table/sponsor/2/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/2/avatar.svg"></a>
 <a href="https://opencollective.com/bootstrap-table/sponsor/3/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/3/avatar.svg"></a>
 <a href="https://opencollective.com/bootstrap-table/sponsor/4/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/4/avatar.svg"></a>
+
+## PayPal Sponsors
+
+<a href="https://edubirdie.com/write-my-essay" target="_blank"><img height="64" src="https://bootstrap-table.com/assets/images/edu-birdie.png"></a>
+
+## OpenCollective Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap-table#backer)]
+
+<a href="https://opencollective.com/bootstrap-table#backers" target="_blank"><img src="https://opencollective.com/bootstrap-table/backers.svg?width=890"></a>

site/_includes/header.html

@@ -17,7 +17,6 @@
 
 {% include stylesheet.html %}
 {% include favicons.html %}
-{% include analytics.html %}
 
 <script type="text/javascript">
   if (window !== top) // 判断当前的 window 对象是否是 top 对象

site/_includes/opencollective.html

@@ -1,26 +1,8 @@
-<div class="container">
-  <div class="pt-md-5">
-    <div>
-      <h3>Backers</h3>
-    </div>
+<div class="container border-bottom">
 
+  <div class="pt-5 pb-5">
     <div>
-      Thank you to all our backers!
-      🙏 [<a href="https://opencollective.com/bootstrap-table#backer" target="_blank">
-        Become a backer
-      </a>]
-    </div>
-
-    <div>
-      <a href="https://opencollective.com/bootstrap-table#backers" target="_blank">
-        <img src="https://opencollective.com/bootstrap-table/backers.svg?width=890">
-      </a>
-    </div>
-  </div>
-
-  <div class="pt-md-5 pb-md-5">
-    <div>
-      <h3>Sponsors</h3>
+      <h3>OpenCollective Sponsors</h3>
     </div>
 
     <div>
@@ -39,4 +21,32 @@
       <a href="https://opencollective.com/bootstrap-table/sponsor/4/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/4/avatar.svg"></a>
     </div>
   </div>
+
+  <div class="pt-5 pb-5">
+    <div>
+      <h3>PayPal Sponsors</h3>
+    </div>
+
+    <div>
+      <a href="https://edubirdie.com/write-my-essay" target="_blank">
+        <img height="64" src="assets/images/edu-birdie.png">
+      </a>
+    </div>
+  </div>
+
+  <div class="pt-5 pb-5">
+    <div>
+      <h3>OpenCollective Backers</h3>
+    </div>
+
+    <div>
+      Thank you to all our backers!
+      🙏 [<a href="https://opencollective.com/bootstrap-table#backer" target="_blank">
+        Become a backer
+      </a>]
+      <a href="https://opencollective.com/bootstrap-table#backers" target="_blank">
+        <img src="https://opencollective.com/bootstrap-table/backers.svg?width=890">
+      </a>
+    </div>
+  </div>
 </div>

site/_includes/scripts.html

@@ -13,3 +13,4 @@ $(function () {
 {%- endif -%}
 
 <script src="{{ site.baseurl }}/assets/js/docs.min.js?m=1"></script>
+{% include analytics.html %}

site/_includes/subscribe.html

@@ -1,54 +1,37 @@
-<!-- Begin Mailchimp Signup Form -->
 <link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
-<style type="text/css">
-  #mc_embed_signup {
-    background: #fff;
-    clear: left;
-    font: 14px Helvetica, Arial, sans-serif;
-  }
-
-  /* Add your own Mailchimp form style overrides in your site stylesheet or in this style block.
-     We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
+<style>
+#mc_embed_signup {
+  margin: 0 auto;
+  text-align: center;
+  max-width: 550px;
+  width: 100%;
+}
+#mc-embedded-subscribe {
+  margin: 0;
+}
 </style>
-<div id="mc_embed_signup">
-  <form action="https://gmail.us20.list-manage.com/subscribe/post?u=f30f83799e58c38ca308f6b73&amp;id=4256ed0bdc"
-    method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank"
-    novalidate>
-    <div id="mc_embed_signup_scroll">
-      <h2>Subscribe News</h2>
-      <div class="mc-field-group">
-        <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL" placeholder="Email Address">
-      </div>
-      <div id="mce-responses" class="clear">
-        <div class="response" id="mce-error-response" style="display:none"></div>
-        <div class="response" id="mce-success-response" style="display:none"></div>
-      </div>
-      <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
-      <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text"
-          name="b_f30f83799e58c38ca308f6b73_4256ed0bdc" tabindex="-1" value=""></div>
-      <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe"
-          class="button"></div>
+
+<hr>
+<div id="mc_embed_signup" class="pt-5 pb-5">
+<form action="https://gmail.us20.list-manage.com/subscribe/post?u=f30f83799e58c38ca308f6b73&amp;id=4256ed0bdc" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
+  <h3 for="mce-EMAIL">Subscribe our News</h3>
+  <div class="input-group">
+    <input type="email" value="" name="EMAIL" class="form-control form-control-lg email" id="mce-EMAIL" placeholder="email address" required>
+    <div class="input-group-append">
+      <input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn btn-outline-secondary">
     </div>
-  </form>
+  </div>
+  <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+  <div style="position: absolute; left: -5000px;" aria-hidden="true">
+    <input type="text" name="b_f30f83799e58c38ca308f6b73_4256ed0bdc" tabindex="-1" value="">
+  </div>
+
+  <div id="mce-responses" class="clear">
+    <div class="response" id="mce-error-response" style="display:none"></div>
+    <div class="response" id="mce-success-response" style="display:none"></div>
+  </div>
+</form>
 </div>
-<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>
-<script type='text/javascript'>
-  (function ($) {
-    window.fnames = new Array();
-    window.ftypes = new Array();
-    fnames[0] = 'EMAIL';
-    ftypes[0] = 'email';
-    fnames[1] = 'FNAME';
-    ftypes[1] = 'text';
-    fnames[2] = 'LNAME';
-    ftypes[2] = 'text';
-    fnames[3] = 'ADDRESS';
-    ftypes[3] = 'address';
-    fnames[4] = 'PHONE';
-    ftypes[4] = 'phone';
-    fnames[5] = 'BIRTHDAY';
-    ftypes[5] = 'birthday';
-  }(jQuery));
-  var $mcj = jQuery.noConflict(true);
-</script>
-<!--End mc_embed_signup-->
+
+<script async src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>
+<script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';fnames[3]='ADDRESS';ftypes[3]='address';fnames[4]='PHONE';ftypes[4]='phone';fnames[5]='BIRTHDAY';ftypes[5]='birthday';}(jQuery));var $mcj = jQuery.noConflict(true);</script>

site/index.html

@@ -11,10 +11,8 @@ redirect_from:
 <main class="bd-masthead" id="content" role="main">
   <div class="container">
     <div class="row align-items-center">
-      <div class="col-4 mx-auto col-md-4 order-md-2">
+      <div class="col-4 mx-auto col-md-3 order-md-2">
         <img class="img-fluid mb-3 mb-md-0" src="favicon.png">
-
-        {% include subscribe.html %}
       </div>
       <div class="col-md-6 order-md-1 text-center text-md-left pr-md-5">
         <h1 class="mb-3 bd-text-purple-bright">
@@ -23,9 +21,6 @@ redirect_from:
         <p class="lead">
           {{ site.description }}
         </p>
-        <p class="lead mb-4">
-          Bootstrap Table has been designed to reduce development time and to require no specific knowledge from developers. It is both featherweight and feature-rich.
-        </p>
         <div class="row mx-n2">
           <div class="col-md px-2">
             <a href="{{ site.baseurl }}/docs/getting-started/introduction/"
@@ -52,16 +47,12 @@ redirect_from:
 <div class="masthead-followup row m-0 border border-white">
   <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
     <!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons -->
-    {% include icons/import.svg width="32" height="32" class="text-primary mb-2" %}
-    <h3>Installation</h3>
-    <p>Include Bootstrap Table source CSS and JavaScript files via npm or Bower.</p>
+    <h3>{% include icons/import.svg width="32" height="32" class="text-primary mb-2" %}Installation</h3>
+    <p>Include Bootstrap Table source CSS and JavaScript files via npm or yarn.</p>
 
-{% highlight sh %}
+{% highlight javascript %}
 npm install bootstrap-table
-{% endhighlight %}
-
-{% highlight sh %}
-bower install bootstrap-table
+yarn add bootstrap-table
 {% endhighlight %}
 
     <hr class="half-rule">
@@ -73,9 +64,8 @@ bower install bootstrap-table
 
   <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
     <!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons -->
-    {% include icons/download.svg width="32" height="32" class="text-primary mb-2" %}
-    <h3>CDN</h3>
-    <p>When you only need to include Bootstrap Table’s compiled CSS or JS, you can use <a href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/">UNPKG</a>.</p>
+    <h3>{% include icons/download.svg width="32" height="32" class="text-primary mb-2" %}CDN</h3>
+    <p>When you only need to include Bootstrap Table’s compiled CSS or JS, use <a href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/">UNPKG</a>.</p>
 
 {% highlight html %}
 <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.css">
@@ -90,8 +80,7 @@ bower install bootstrap-table
 
   <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
     <!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons -->
-    {% include icons/lightning.svg width="32" height="32" class="text-primary mb-2" %}
-    <h3>Examples</h3>
+    <h3>{% include icons/lightning.svg width="32" height="32" class="text-primary mb-2" %}Examples</h3>
     <p>
       The examples of bootstrap table.
     </p>
@@ -103,4 +92,6 @@ bower install bootstrap-table
   </div>
 
   {% include opencollective.html %}
+
+  {% include subscribe.html %}
 </div>