Merge branch 'update-logo' into 'master'

Update styles and logos, expand donations page

See merge request openlp/website!32

pages/donate.rst

@@ -2,22 +2,17 @@
 .. slug: donate
 .. date: 2015-10-03 20:31:32 UTC
 .. type: text
+.. hidetitle: True
 .. previewimage: /cover-images/donate.jpg
 
+.. raw:: html
+
+   <div class="space"></div>
+
 Like most other voluntary open source projects, OpenLP has no income and is entirely funded by the personal funds of
 the developers. We have a number of fixed costs, like server hosting, domain names, and the like. If you'd like to
 help us out, please consider donating to our cause.
 
-There are two ways to help out financially:
-
-1. Once-off donations
-2. Buy swag
-
-Once-off Donations
-^^^^^^^^^^^^^^^^^^
-
-Once-off donations are gratefully accepted.
-
 .. raw:: html
 
     <div id="error-alert" class="alert alert-danger hidden" role="alert">
@@ -40,7 +35,7 @@ Once-off donations are gratefully accepted.
         <p>Donate to us via Bitcoin using the address below.</p>
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-fw fa-btc"></i></span>
-          <input class="form-control type="text" value="1Hcuk8eX485NmfjUoPNSpJWci22FwuXJjV" readonly>
+          <input class="form-control type="text" value="bc1qzmlan4lwwexr4fhevq972ugnganr8c9skgg02s" readonly>
         </div>
       </div>
       <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">  
@@ -69,14 +64,36 @@ Once-off donations are gratefully accepted.
     <hr>
 
 
-Buy Swag
+Current Needs
-^^^^^^^^
+^^^^^^^^^^^^^
-One other way you can help us financially is by buying stuff from our online store. There are T-shirts, cups, hats,
+
-USB drives, and other things for sale, and all proceeds go to OpenLP.
+The reality is that most of the donated money we receive is contributed toward various server costs,
+as detailed below. From time to time, however, we have additional needs that are usually financed
+by the OpenLP team themselves. Below are some of those needs, and whether or not we have purchased
+them already.
+
+.. table::
+   :class: table
+
+   +-----------------------------------+---------+---------+-----------+------------+
+   | Item                              | Cost    | Covered | Purchased | Keywords   |
+   +===================================+=========+=========+===========+============+
+   | `Extra RAM for virtual machines`_ | $39.99  | $0      | Yes       | RAM        |
+   +-----------------------------------+---------+---------+-----------+------------+
+   | `4K monitor for Hi DPI testing`_  | $169.99 | $0      | Yes       | 4K Monitor |
+   +-----------------------------------+---------+---------+-----------+------------+
+   | `Refurbished Apple M1 Mac Mini`_  | $469.00 | $0      | No        | M1 Mac     |
+   +-----------------------------------+---------+---------+-----------+------------+
+
+If you feel led to give for something specifically, please feel free to use the keywords when you
+donate. Below are ways to get hold of us:
+
+* If you use PayPal, add the keywords in the message
+* You can direct message `Raoul`_ via `your Inbox`_ on the `forums`_
+* You can `come into IRC`_ and let "superfly", "TRB143" or "tgc" know your amount and keywords
 
 .. raw:: html
 
-    <p><a href="https://www.zazzle.com/openlp" class="btn btn-primary"><i class="fa fa-fw fa-shopping-basket notranslate"></i> Buy Some Swag</a></p>
    <hr>
 
 Regular Costs
@@ -91,6 +108,13 @@ Here's a breakdown of our regular costs:
 
 [ Image Credit: `Tip Jar at Open Bar by Dave Dugdale`_ ]
 
+.. _Extra RAM for virtual machines: https://www.amazon.com/dp/B08H7T81YV?psc=1&ref=ppx_yo2ov_dt_b_product_details
+.. _4K monitor for Hi DPI testing: https://www.amazon.com/gp/product/B08MXQ4NJ9/ref=ppx_od_dt_b_asin_title_s00?ie=UTF8&psc=1
+.. _Refurbished Apple M1 Mac Mini: https://www.apple.com/shop/product/FGNR3LL/A/refurbished-mac-mini-apple-m1-chip-with-8%E2%80%91core-cpu-and-8%E2%80%91core-gpu
+.. _Raoul: https://forums.openlp.org/profile/raoul
+.. _your Inbox: https://forums.openlp.org/messages/inbox
+.. _forums: https://forums.openlp.org/
+.. _come into IRC: https://kiwiirc.com/client/irc.libera.chat/?nick=guest?#openlp
 .. _VPS from Linode.com: https://www.linode.com/pricing
 .. _backup service: https://www.linode.com/backups
 .. _Gandi.net's pricing page: https://www.gandi.net/domain/price/info

themes/openlp2v2/assets/css/custom.css

@@ -82,8 +82,8 @@ div.product-chooser div.product-chooser-item {
 }
 
 div.product-chooser div.product-chooser-item.selected{
-  border: 4px solid #55acee;
+  border: 4px solid #3d6adb;
-  color: #55acee;
+  color: #3d6adb;
 }
 
 div.product-chooser div.product-chooser-item img{
@@ -223,7 +223,7 @@ article .section {
 time {
   background-color: #fff;
   border-radius: 3px;
-  border: 1px solid #55acee;
+  border: 1px solid #3d6adb;
   box-shadow: 0 1px 2px #bbb;
   display: block;
   float: right;
@@ -247,7 +247,7 @@ time * {
 
 time strong
 {
-  background-color: #55acee;
+  background-color: #3d6adb;
   color: #fff;
   padding: 0.4em 0;
   position: absolute;
@@ -461,3 +461,31 @@ aside.tip p.admonition-title {
   background-color: #17a2b8 !important;
   color: white;
 }
+
+html, body {
+  font-family: 'Oxygen', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: 'Montserrat', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+.site-name {
+  font-family: 'Montserrat', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+h1 span, h2 span, h3 span, h4 span, a, .text-colored {
+    color: #3d6adb;
+}
+
+.default-bg.blue {
+    background-color: #3d6adb;
+}
+
+.translucent-bg.blue:after {
+    background-color: rgba(61, 106, 189, 0.7);
+}
+
+.banner-caption h1 {
+  text-shadow: 0 0 5px rgba(34, 34, 34, 0.5);
+}

themes/openlp2v2/templates/base.tmpl

@@ -20,7 +20,7 @@ ${template_hooks['extra_head']()}
                     <div class="col-md-3">
                         <div class="header-left clearfix">
                             <div class="logo smooth-scroll">
-                                <a href="/"><img id="logo" src="/assets/images/logo.png" alt="OpenLP"></a>
+                                <a href="/"><img id="logo" src="/assets/images/logo.png" width="64" height="64" alt="OpenLP"></a>
                             </div>
                             <div class="site-name-and-slogan smooth-scroll">
                                 <div class="site-name"><a href="/">OpenLP</a></div>

themes/openlp2v2/templates/base_helper.tmpl

@@ -35,6 +35,9 @@ lang="${lang}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>${title|striphtml} | ${blog_title|striphtml}</title>
 
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,400;0,700;1,400;1,700&family=Oxygen:wght@400;700&display=swap" rel="stylesheet">
     ${html_stylesheets()}
     ${html_feedlinks()}
     %if permalink:

themes/openlp2v2/templates/front_page.html

@@ -5,7 +5,7 @@
       <div class="col-md-3">
         <div class="header-left clearfix">
           <div class="logo smooth-scroll">
-            <a href="#banner"><img id="logo" src="/assets/images/logo.png" alt="OpenLP"></a>
+            <a href="#banner"><img id="logo" src="/assets/images/logo.png" width="64" height="64" alt="OpenLP"></a>
           </div>
           <div class="site-name-and-slogan smooth-scroll">
             <div class="site-name"><a href="#banner">OpenLP</a></div>
@@ -83,7 +83,7 @@
             <ul class="list-unstyled">
               <li><i class="fa fa-caret-right pr-10 text-colored notranslate"></i> Cross platform between Linux, Windows, OS X and FreeBSD</li>
               <li><i class="fa fa-caret-right pr-10 text-colored notranslate"></i> Display songs, Bible verses, presentations, images and more</li>
-              <li><i class="fa fa-caret-right pr-10 text-colored notranslate"></i> Control OpenLP remotely via the Android remote, iOS remote or mobile web browser</li>
+              <li><i class="fa fa-caret-right pr-10 text-colored notranslate"></i> Control OpenLP remotely via your mobile web browser</li>
               <li><i class="fa fa-caret-right pr-10 text-colored notranslate"></i> Quickly and easily import songs from other popular presentation packages</li>
               <li><i class="fa fa-caret-right pr-10 text-colored notranslate"></i> Easy enough to use to get up and running in less than 10 minutes</li>
             </ul>
@@ -451,18 +451,6 @@
         </div>
       </div>
     </div>
-    <div class="lead text-center"><h2 id="mobile-app-downloads">Get the Mobile Remote App</h2></div>
-    <div class="lead row mobile-app">
-      <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2 col-md-offset-3 col-lg-offset-3 text-center">
-        <a href="https://play.google.com/store/apps/details?id=org.openlp.android2"><img alt="Android app on Google Play" src="/google-play-badge.png" style="height: 40px"></a>
-      </div>
-      <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2 text-center">
-        <a href="https://f-droid.org/repository/browse/?fdid=org.openlp.android2"><img alt="Android app on F-Droid" src="/f-droid-badge.png" style="height: 40px"></a>
-      </div>
-      <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2 text-center">
-        <a href="https://itunes.apple.com/us/app/openlp-remote/id1096218725?mt=8" title="Download on the App Store"><img src="/app-store-badge.png"></a>
-      </div>
-    </div>
     <div class="space"></div>
     <div class="alert alert-info text-center col-md-8 col-md-offset-2">
       <p>Older versions can be downloaded from our <a href="https://get.openlp.org/">downloads archive</a>, but <strong>we do not support these versions</strong>.</p>

themes/openlp2v2/templates/post.tmpl

@@ -46,7 +46,7 @@
         </section>
     % endif
     ${helper.mathjax_script(post)}
-</article>
+  </article>
 ${comments.comment_link_script()}
 </%block>