← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~thelinuxguy/openlp/website-fixes into lp:openlp/website

 

Simon Hanna has proposed merging lp:~thelinuxguy/openlp/website-fixes into lp:openlp/website.

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~thelinuxguy/openlp/website-fixes/+merge/320271

A fix for the social buttons appearing on more than one line.
I hope this mr is correct is filed against the correct branch...
-- 
Your team OpenLP Core is subscribed to branch lp:openlp/website.
=== modified file 'themes/openlp2v2/assets/css/custom.css'
--- themes/openlp2v2/assets/css/custom.css	2016-05-09 21:16:37 +0000
+++ themes/openlp2v2/assets/css/custom.css	2017-03-18 01:25:49 +0000
@@ -7,6 +7,12 @@
 License: Creative Commons Attribution 3.0 License (https://creativecommons.org/licenses/by/3.0/)
 File Description: Place here your custom CSS styles
 */
+@media (max-width: 767px) {
+    .navbar-collapse {
+        background-color: rgba(0, 0, 0, 0.90);
+    }
+}
+
 .bg-image-1 {
     background: url("../images/worship-1.jpg") 50% 0px no-repeat;
 }
@@ -55,6 +61,11 @@
     text-shadow: 1px 1px 2px #000;
 }
 
+div#feature-details div.row {
+  margin-bottom: 5px;
+  margin-top: 5px;
+}
+
 div.product-chooser div.product-chooser-item {
     padding: 11px;
     border-radius: 6px;
@@ -276,10 +287,12 @@
 }
 
 .social-links {
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 36px;
-    width: 463px;
+    text-align: center;
+}
+
+.social-links li {
+    margin: 10px;
+    width: 54px;
 }
 
 .social-links li.reddit a:hover {

=== modified file 'themes/openlp2v2/templates/front_page.html'
--- themes/openlp2v2/templates/front_page.html	2017-02-05 00:42:32 +0000
+++ themes/openlp2v2/templates/front_page.html	2017-03-18 01:25:49 +0000
@@ -156,7 +156,7 @@
             </div>
         </div>
         <div class="section translucent-bg bg-image-1 blue">
-            <div class="container object-non-visible" data-animation-effect="fadeIn">
+            <div class="container object-non-visible" data-animation-effect="fadeIn" id="feature-details">
                 <h1 id="features"  class="text-center title">Features</h1>
                 <div class="space"></div>
                 <div class="row">
@@ -170,6 +170,21 @@
                                 <i class="fa fw fa-music"></i>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="media">
+                            <div class="media-left">
+                                <i class="fa fa-video-camera"></i>
+                            </div>
+                            <div class="media-body">
+                                <h4 class="media-heading">Media</h4>
+                                <p>Integration with VLC means that you can display almost any video file and play almost any audio file in OpenLP. Using VLC means that a wide variety of formats are supported.</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
                         <div class="media">
                             <div class="media-body text-right">
                                 <h4 class="media-heading">Bibles</h4>
@@ -179,6 +194,21 @@
                                 <i class="fa fa-fw fa-book"></i>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="media">
+                            <div class="media-left">
+                                <i class="fa fa-file-text"></i>
+                            </div>
+                            <div class="media-body">
+                                <h4 class="media-heading">Custom Slides</h4>
+                                <p>Store your liturgy, announcements, or other custom slides in OpenLP. Just like a song, but with less structure, custom slides can also contain formatting and can be set to loop.</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
                         <div class="media">
                             <div class="media-body text-right">
                                 <h4 class="media-heading">Presentations</h4>
@@ -188,6 +218,21 @@
                                 <i class="fa fa-desktop"></i>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="media">
+                            <div class="media-left">
+                                <i class="fa fa-wifi"></i>
+                            </div>
+                            <div class="media-body">
+                                <h4 class="media-heading">Android/iOS Remote</h4>
+                                <p>Control OpenLP remotely using any tablet or phone using our remote apps in the Google Play Store and Apple App Store. Search, go live, control slides, and more. Also accessible via any phone's web browser.</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
                         <div class="media">
                             <div class="media-body text-right">
                                 <h4 class="media-heading">Pictures</h4>
@@ -198,37 +243,9 @@
                             </div>
                         </div>
                     </div>
-                    <div class="space visible-xs"></div>
                     <div class="col-sm-6">
                         <div class="media">
                             <div class="media-left">
-                                <i class="fa fa-video-camera"></i>
-                            </div>
-                            <div class="media-body">
-                                <h4 class="media-heading">Media</h4>
-                                <p>Integration with VLC means that you can display almost any video file and play almost any audio file in OpenLP. Using VLC means that a wide variety of formats are supported.</p>
-                            </div>
-                        </div>
-                        <div class="media">
-                            <div class="media-left">
-                                <i class="fa fa-file-text"></i>
-                            </div>
-                            <div class="media-body">
-                                <h4 class="media-heading">Custom Slides</h4>
-                                <p>Store your liturgy, announcements, or other custom slides in OpenLP. Just like a song, but with less structure, custom slides can also contain formatting and can be set to loop.</p>
-                            </div>
-                        </div>
-                        <div class="media">
-                            <div class="media-left">
-                                <i class="fa fa-wifi"></i>
-                            </div>
-                            <div class="media-body">
-                                <h4 class="media-heading">Android/iOS Remote</h4>
-                                <p>Control OpenLP remotely using any tablet or phone using our remote apps in the Google Play Store and Apple App Store. Search, go live, control slides, and more. Also accessible via any phone's web browser.</p>
-                            </div>
-                        </div>
-                        <div class="media">
-                            <div class="media-left">
                                 <i class="fa fa-play-circle"></i>
                             </div>
                             <div class="media-body">
@@ -479,11 +496,7 @@
             </div>
             <div class="translucent-bg blue">
                 <div class="container">
-                    <div class="row">
-                        <div class="col-md-8 col-md-offset-2">
-                            <h1 class="text-center">Used by churches worldwide!</h1>
-                        </div>
-                    </div>
+                    <h1 class="text-center">Used by churches worldwide!</h1>
                 </div>
             </div>
         </div>


Follow ups