Merge pull request 'Always have some margin left and right of the page content.' (#11 ) from haheute/friendica-wp-theme:width-and-missing-space into master

Reviewed-on: friendica/friendica-wp-theme#11 Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>
remove not longer used media query
2024-03-26 17:56:33 +01:00 · 2024-03-26 17:54:16 +01:00 · 2024-03-25 17:16:04 +01:00 · 2022-04-25 11:28:06 +00:00 · 2022-03-27 08:53:57 +02:00 · 2020-10-21 17:16:09 +02:00
5 changed files with 48 additions and 20 deletions
--- a/assets/css/main.css
+++ b/assets/css/main.css
@ -1751,18 +1751,11 @@
 	}

 	.inner {
+		width: 90%;
 		max-width: 75em;
 		margin: 0 auto;
 	}

-		@media screen and (max-width: 1280px) {
-
-			.inner {
-				max-width: 90%;
-			}
-
-		}
-
 		@media screen and (max-width: 480px) {

 			.inner {
@ -1902,6 +1895,13 @@
 		justify-content: space-between;
 	}

+		.flex.center {
+			-moz-justify-content: center;
+			-webkit-justify-content: center;
+			-ms-justify-content: center;
+			justify-content: center;
+		}
+
 		.flex.flex-2 article {
 			width: 47%;
 		}
--- a/functions.php
+++ b/functions.php
@ -1,4 +1,3 @@
-
 <?php
 add_action('after_setup_theme', 'friendica_setup');

--- a/header-home.php
+++ b/header-home.php
@ -62,5 +62,5 @@
                                ?>
                                </span>
                                </h1>				<p><?php echo esc_html(get_bloginfo('description')); ?></p>
-                <p><a href="https://github.com/friendica/friendica/releases" class="button special">Download</a> <a href="http://dir.friendica.social/servers" class="button">Try It</a></p>
+                <p><a href="#try" class="button special">Try It!</a></p>
 			</section>
--- a/page-home.php
+++ b/page-home.php
@ -1,7 +1,8 @@
 <?php get_header("home"); ?>

-        <!-- One -->
-            <section id="one" class="wrapper">
+
+            <!-- intro -->
+            <section class="wrapper">
                <div class="inner">
                    <div class="flex flex-3">
                        <article>
@ -35,8 +36,9 @@
                </div>
            </section>

-        <!-- Two -->
-            <section id="two" class="wrapper style1 special">
+
+            <!-- more key feature -->
+            <section class="wrapper style1 special">
                <div class="inner">
                    <header>
                        <h2>A decentralized social network</h2>
@ -78,8 +80,25 @@
                </div>
            </section>

-        <!-- Three -->
-            <section id="three" class="wrapper special">
+            <!-- try friendica -->
+            <section id="try" class="wrapper style1 special">
+                <div class="inner">
+                    <header>
+                        <h2>Try Friendica</h2>
+                    </header>
+                    <div class="flex center flex-3">
+                        <article>
+                            <p>Do you want to try Friendica but don't have the technical knowledge to install your server?
+                            You can create an account on one of the many servers out there which accept new users!</p>
+                            
+                        </article>
+                    </div>
+                    <p><a href="https://dir.friendica.social/servers" class="button">Have a look at the list of public servers</a></p>
+                </div>
+            </section>
+        
+            <!-- technical -->
+            <section class="wrapper special">
                <div class="inner">
                    <header class="align-center">
                        <h2>Free software &mdash; Free protocols</h2>
@ -91,10 +110,10 @@
                                <img src="<?php echo  get_template_directory_uri(); ?>/images/pic2.png" alt="Stack">
                            </div>
                            <header>
-                                <h3>PHP &amp; MySQL</h3>
+                                <h3>PHP &amp; MariaDB</h3>
                            </header>
                            <p>Run your personal Friendica node on shared hosts.</p>
-                            <p>Friendica runs on PHP with MySQL as a database. If you can run WordPress, you can run Friendica.</p>
+                            <p>Friendica runs on PHP with MariaDB as a database. If you can run WordPress, you can run Friendica.</p>
                            <footer>
                                <a href="/requirements/" class="button special">More</a>
                            </footer>
@ -113,11 +132,21 @@
                            </footer>
                        </article>
                    </div>
+                    </div>
+            </section>
+            <section id="run">
+                <div class="inner">
+                    <header class="align-center">
+                        <h2>Run your own server</h2>
+                        <p>Be part of the network, host a Friendica server for you, your family and your friends!</p>
+                        <p><a href="/resources/installation/" class="button special">Installation guide</a></p>
+                    </header>
                </div>
            </section>

            <hr>
-            <!-- Four -->
+
+            <!-- Last news -->
            <?php
            $args = array(
                'post_type' => "post"
--- a/style.css
+++ b/style.css
@ -4,7 +4,7 @@ Theme URI: https://git.friendi.ca/friendica/friendica-wp-theme
 Author: Friendica
 Author URI: https://friendi.ca/
 Description: This is the theme for Friendica main site.<br>Based on https://templated.co/theory
-Version: 1.1.5
+Version: 1.1.6
 License: GNU General Public License
 License URI: https://www.gnu.org/licenses/gpl.html
 Text Domain: friendica
Author	SHA1	Message	Date
Hypolite Petovan	e948c51178	Merge pull request 'Always have some margin left and right of the page content.' (#11 ) from haheute/friendica-wp-theme:width-and-missing-space into master Reviewed-on: friendica/friendica-wp-theme#11 Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>	2024-03-26 17:56:33 +01:00
Hannes Heute	8b6924ca9b	remove not longer used media query	2024-03-26 17:54:16 +01:00
Hannes Heute	cf37ab239e	Always have some margin left and right of the page content.	2024-03-25 17:16:04 +01:00
Hypolite Petovan	aa85eaea1d	Merge pull request 'MySQL -> MariaDB to avoid confusion' (#9 ) from tobias/friendica-wp-theme:20220327-mysql into master Reviewed-on: friendica/friendica-wp-theme#9	2022-04-25 11:28:06 +00:00
Tobias Diekershoff	dd0aeba316	MySQL -> MariaDB to avoid confusion	2022-03-27 08:53:57 +02:00
Tobias Diekershoff	71ded2739a	Bump theme version to 1.1.6	2020-10-21 17:16:09 +02:00
Hypolite Petovan	fdd20f5f4d	Merge pull request 'Rework "download" and "try it" (Issue 9430)' (#8 ) from fabrixxm/friendica-wp-theme:issue/9430 into master Reviewed-on: friendica/friendica-wp-theme#8	2020-10-20 11:36:17 +00:00
Fabio	a00d65e7ee	Rework "download" and "try it" - Remove "Download" button - Add "Try friendica" section with link to directory - Add "Run your server" section with link to install guide See https://github.com/friendica/friendica/issues/9430	2020-10-20 10:29:41 +02:00
Fabio	041f2e00f5	Remove whitespace in functions.php	2020-10-20 10:25:55 +02:00