Compare commits

...

24 commits

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
Friendica Project 7dfbfb3273 Merge branch 'fix/issue-6' of friendica/friendica-wp-theme into master 2019-11-05 10:55:42 +00:00
fabrixxm 96cdf00a49 Fix issue #6
Use title "a decentralized social network" as decided during Hackathon 2019
2019-11-05 08:47:52 +00:00
Tobias Diekershoff 8177714ec2 Merge branch 'fa117' of friendica/friendica-wp-theme into master 2019-10-23 06:09:34 +00:00
fabrixxm dec5c3c0b0 Make top menu work again
The top menu stopped working.
A quick look showed that menu html has changed,
not matching CSS selectors anymore.

The commit f68cafa had changed the CSS selectors from
ones that apply to current menu html.

The menu has been modified from what was in place at the
time when sceenshot.png has been taken.

My guess is that different menus leads to different html
on page (I don't know why).

The CSS now use both selectors, to stay on the safe side.
2019-10-21 12:22:41 +02:00
fabrixxm 7bb8ab5df2 Bigger font on large monitors, nowrap submenu items 2019-10-21 10:48:37 +02:00
fabrixxm 2f051abbf2 Bump theme version 2019-10-21 10:39:35 +02:00
fabrixxm b636cc4aa3 Add version to fa css import url 2019-10-21 10:38:03 +02:00
fabrixxm 08f8a3637d Update ForkAwesome fonts to 1.1.7 2019-10-21 10:33:10 +02:00
fabrixxm 136fa771f2 Merge branch 'feature/improve-readability' of fabrixxm/friendica-wp-theme into master 2019-08-29 05:30:47 +00:00
Fabio e7873e8a67 fix github icon in footer 2019-08-20 17:18:46 +02:00
Fabio de6cf6d90f remove too much bold 2019-08-20 17:10:26 +02:00
Fabio 94a0e34800 update screenshot 2019-08-20 16:55:25 +02:00
Fabio 42037256e8 Increase font size and weight in header 2019-08-20 16:55:25 +02:00
Fabio ae6c09ae84 change font to Fira Sans 2019-08-20 16:55:25 +02:00
fabrixxm 8a0650f98a Merge branch 'master' of hoergen/friendica-wp-theme into master 2019-08-20 14:22:52 +00:00
25 changed files with 904 additions and 586 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
.DS*
work/*

39
assets/css/fira.css Executable file
View file

@ -0,0 +1,39 @@
@font-face{
font-family: 'Fira Sans';
src: local('Fira Sans Light'),
url('../fonts/fira/woff/FiraSans-Light.woff') format('woff');
font-weight: 300;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
src: local('Fira Sans Regular'),
url('../fonts/fira/woff/FiraSans-Regular.woff') format('woff');
font-weight: 400;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
src: local('Fira Sans Regular Italic'),
url('../fonts/fira/woff/FiraSans-Italic.woff') format('woff');
font-weight: 400;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
src: local('Fira Sans Bold'),
url('../fonts/fira/woff/FiraSans-Bold.woff') format('woff');
font-weight: 700;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
src: local('Fira Sans Bold Italic'),
url('../fonts/fira/woff/FiraSans-BoldItalic.woff') format('woff');
font-weight: 700;
font-style: italic;
}

File diff suppressed because one or more lines are too long

View file

@ -14,7 +14,6 @@
border: 0;
font-size: 100%;
font: inherit;
font-weight: 600;
vertical-align: baseline;
}
@ -1585,8 +1584,8 @@
body, input, select, textarea {
color: #111;
font-family: "Raleway", Arial, Helvetica, sans-serif;
font-size: 13pt;
font-family: "Fira Sans", Arial, Helvetica, sans-serif;
font-size: 14pt;
font-weight: 300;
line-height: 1.65;
}
@ -1594,7 +1593,7 @@
@media screen and (max-width: 1680px) {
body, input, select, textarea {
font-size: 11pt;
font-size: 14pt;
}
}
@ -1602,7 +1601,7 @@
@media screen and (max-width: 1280px) {
body, input, select, textarea {
font-size: 11pt;
font-size: 14pt;
}
}
@ -1752,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 {
@ -1903,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%;
}
@ -2229,14 +2228,6 @@
position: relative;
}
.icon:before {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-family: FontAwesome;
font-style: normal;
font-weight: normal;
text-transform: none !important;
}
.icon > .label {
display: none;
@ -2733,7 +2724,6 @@
#header {
color: rgba(255,255,255,0.8);
background-color: rgba(0,0,0,0.2);
cursor: default;
height: 3.25em;
left: 0;
@ -2844,9 +2834,13 @@
}
/* Nav */
#nav > ul,
#nav > .menu > ul { display: inline-block; padding:0; margin: 0; }
#nav > ul > li,
#nav > .menu > ul > li { display: inline-block; }
#nav > ul > li .sub-menu,
#nav > .menu > ul > li .children { display: none; }
#nav > ul > li:hover .sub-menu,
#nav > .menu > ul > li:hover .children {
display: block;
margin: 0;
@ -2859,8 +2853,11 @@
top: 2.5em;
min-width: 100px;
}
#nav .sub-menu li,
#nav .children li { padding: 0; line-height: 2em; }
#nav .children a { color: #333; padding: 0.4em; width: 100%; text-align: left; }
#nav .sub-menu a ,
#nav .children a { color: #333; padding: 0.4em; width: 100%; text-align: left; white-space: nowrap; }
#nav .sub-menu a:hover,
#nav .children a:hover{ color: #fff; background-color: #5385c1; }
@media screen and (max-width: 980px) {
@ -2965,7 +2962,7 @@
#banner {
padding: 12em 0 10em 0;
background-image: url('../../images/banner-blu.orig.jpg');
background-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0) 100%), url('../../images/banner-blu.orig.jpg');
background-size: cover;
background-position: center;
/*background-attachment: fixed;*/
@ -2976,7 +2973,7 @@
#banner h1 {
font-size: 3.5em;
font-weight: 100;
font-weight: 400;
color: #ffffff;
line-height: 1em;
margin: 0 0 0.5em 0;

View file

@ -1,18 +0,0 @@
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 100;
src: local('Raleway Thin'), local('Raleway-Thin'), url(../fonts/Raleway-Thin.ttf) format('truetype');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 300;
src: local('Raleway Light'), local('Raleway-Light'), url(../fonts/Raleway-Light.ttf) format('truetype');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 600;
src: local('Raleway SemiBold'), local('Raleway-SemiBold'), url(../fonts/Raleway-SemiBold.ttf) format('truetype');
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load diff

Before

Width:  |  Height:  |  Size: 424 KiB

After

Width:  |  Height:  |  Size: 470 KiB

Binary file not shown.

View file

@ -10,8 +10,9 @@
<?php echo sprintf( __( '%1$s %2$s %3$s. All Rights Reserved.', 'friendica' ), '&copy;', date( 'Y' ), esc_html( get_bloginfo( 'name' ) ) ); echo sprintf( __( ' Original Design: %1$s.', 'friendica' ), '<a href="https://templated.co">TEMPLATED</a>' ); ?>
</div>
<ul class="icons">
<li><a href="https://github.com/friendica/" class="icon fa-github"><span class="label">GitGub</span></a></li>
<li><a href="https://github.com/friendica/" title="GitHub">
<i class="fa fa-github" aria-hidden="true"></i>
</a></li>
</ul>
</div>
</div>

View file

@ -1,4 +1,3 @@
<?php
add_action('after_setup_theme', 'friendica_setup');

View file

@ -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>

View file

@ -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,11 +36,12 @@
</div>
</section>
<!-- Two -->
<section id="two" class="wrapper style1 special">
<!-- more key feature -->
<section class="wrapper style1 special">
<div class="inner">
<header>
<h2>A personal social network</h2>
<h2>A decentralized social network</h2>
<p>Keep in contact with people you care about.</p>
</header>
<div class="flex flex-4">
@ -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>
@ -115,9 +134,19 @@
</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"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 KiB

After

Width:  |  Height:  |  Size: 144 KiB

View file

@ -4,13 +4,13 @@ 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.3
Version: 1.1.6
License: GNU General Public License
License URI: https://www.gnu.org/licenses/gpl.html
Text Domain: friendica
*/
@import url(./assets/css/fork-awesome.min.css);
@import url(./assets/css/raleway.css);
@import url(./assets/css/fork-awesome.min.css?v=1.1.7);
@import url(./assets/css/fira.css);
@import url(./assets/css/main.css);