Compare commits

..

1 Commits

Author SHA1 Message Date
hoergen 2eb5cd34cd Changed every font weight from 300 to 400
And removed the previous change (300 to 600) so the inheritance should take place.
2019-08-20 15:20:33 +00:00
25 changed files with 590 additions and 909 deletions

1
.gitignore vendored
View File

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

View File

@ -1,39 +0,0 @@
@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

@ -1584,16 +1584,16 @@
body, input, select, textarea {
color: #111;
font-family: "Fira Sans", Arial, Helvetica, sans-serif;
font-size: 14pt;
font-weight: 300;
font-family: "Raleway", Arial, Helvetica, sans-serif;
font-size: 13pt;
font-weight: 400;
line-height: 1.65;
}
@media screen and (max-width: 1680px) {
body, input, select, textarea {
font-size: 14pt;
font-size: 11pt;
}
}
@ -1601,7 +1601,7 @@
@media screen and (max-width: 1280px) {
body, input, select, textarea {
font-size: 14pt;
font-size: 11pt;
}
}
@ -1654,7 +1654,7 @@
h1, h2, h3, h4, h5, h6 {
color: #3a6395;
font-weight: 300;
font-weight: 400;
line-height: 1.5;
margin: 0 0 1em 0;
}
@ -1751,11 +1751,18 @@
}
.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 {
@ -1895,13 +1902,6 @@
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%;
}
@ -2099,7 +2099,7 @@
cursor: pointer;
display: inline-block;
font-size: 1em;
font-weight: 300;
font-weight: 400;
padding-left: 2.4em;
padding-right: 0.75em;
position: relative;
@ -2228,6 +2228,14 @@
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;
@ -2724,6 +2732,7 @@
#header {
color: rgba(255,255,255,0.8);
background-color: rgba(0,0,0,0.2);
cursor: default;
height: 3.25em;
left: 0;
@ -2834,13 +2843,9 @@
}
/* 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;
@ -2853,12 +2858,9 @@
top: 2.5em;
min-width: 100px;
}
#nav .sub-menu li,
#nav .children li { padding: 0; line-height: 2em; }
#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; }
#nav .children a { color: #333; padding: 0.4em; width: 100%; text-align: left; }
#nav .children a:hover { color: #fff; background-color: #5385c1; }
@media screen and (max-width: 980px) {
@ -2908,7 +2910,7 @@
display: block;
padding: 0.75em 0;
text-decoration: none;
font-weight: 300;
font-weight: 400;
}
#navPanel a:not(.close):first-child {
@ -2962,7 +2964,7 @@
#banner {
padding: 12em 0 10em 0;
background-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0) 100%), url('../../images/banner-blu.orig.jpg');
background-image: url('../../images/banner-blu.orig.jpg');
background-size: cover;
background-position: center;
/*background-attachment: fixed;*/
@ -2973,7 +2975,7 @@
#banner h1 {
font-size: 3.5em;
font-weight: 400;
font-weight: 100;
color: #ffffff;
line-height: 1em;
margin: 0 0 0.5em 0;
@ -3047,7 +3049,7 @@
#banner h1 {
font-size: 2.5em;
font-weight: 300;
font-weight: 400;
}

18
assets/css/raleway.css Normal file
View File

@ -0,0 +1,18 @@
@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.

After

Width:  |  Height:  |  Size: 151 KiB

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: 470 KiB

After

Width:  |  Height:  |  Size: 424 KiB

Binary file not shown.

View File

@ -10,9 +10,8 @@
<?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/" title="GitHub">
<i class="fa fa-github" aria-hidden="true"></i>
</a></li>
<li><a href="https://github.com/friendica/" class="icon fa-github"><span class="label">GitGub</span></a></li>
</ul>
</div>
</div>

View File

@ -1,3 +1,4 @@
<?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="#try" class="button special">Try It!</a></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>
</section>

View File

@ -1,208 +1,179 @@
<?php get_header("home"); ?>
<!-- intro -->
<section class="wrapper">
<div class="inner">
<div class="flex flex-3">
<article>
<header>
<h3>Decentralization</h3>
</header>
<p>Decentralized architecture with no central authority or ownership.</p>
<p>Relationships can be made across any compatible system, creating a network of Internet scale made up of smaller sites.</p>
<p>Seamless wall-to-wall posts and remote comments, even across different network nodes.</p>
</article>
<article>
<header>
<h3>Privacy</h3>
</header>
<p>Access lists for every item.</p>
<p>Private conversation groups &mdash; on these pages all communications are restricted to group members.</p>
<p>One-to-one private messaging on supported protocols.</p>
<p>Optionally "expire" old content after a certain period of time.</p>
<p>Download your personal data. It all belongs to you.</p>
</article>
<article>
<header>
<h3>Interoperability</h3>
</header>
<p>Built-in support for ActivityPub (e.g. Funkwhale, Hubzilla, Mastodon, Pleroma, Pixelfed), OStatus (e.g. StatusNet, GNU social, Quitter) and diaspora* protocols.</p>
<p>Support for email contacts and communications (two-way) via IMAP4rev1/ESMTP.</p>
<p>Import arbitrary websites and blogs into your social stream via RSS/Atom feeds.</p>
<p>Support for other services via plugins.</p>
</article>
</div>
</div>
</section>
<!-- more key feature -->
<section class="wrapper style1 special">
<div class="inner">
<header>
<h2>A decentralized social network</h2>
<p>Keep in contact with people you care about.</p>
</header>
<div class="flex flex-4">
<div class="box person">
<div class="image round">
<i class="fa fa-file-text" aria-hidden="true"></i>
</div>
<h3>Posts</h3>
<p>Write your thoughts, edit them if you want. Comment, Like and Dislike posts from your contacts.</p>
</div>
<div class="box person">
<div class="image round">
<i class="fa fa-picture-o" aria-hidden="true"></i>
</div>
<h3>Photos</h3>
<p>Share your holiday photos, but only with people you want.</p>
</div>
<div class="box person">
<div class="image round">
<i class="fa fa-calendar" aria-hidden="true"></i>
</div>
<h3>Events</h3>
<p>Organize the next meeting of your reading group, or let everybody know about your cool party!</p>
</div>
<div class="box person">
<div class="image round">
<i class="fa fa-users" aria-hidden="true"></i>
</div>
<h3>Profiles</h3>
<p>Like in real life, have a public profile and private aspects only for your closest friends. Or keep everything private!</p>
</div>
</div>
<footer>
<a href="/features/" class="button">More features</a> <a href="/screenshots/" class="button">Screenshots</a>
</footer>
</div>
</section>
<!-- 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>
<p>Friendica is free software and use free protocols.</p>
</header>
<div class="flex flex-2">
<article>
<div class="image fit">
<img src="<?php echo get_template_directory_uri(); ?>/images/pic2.png" alt="Stack">
</div>
<header>
<h3>PHP &amp; MariaDB</h3>
</header>
<p>Run your personal Friendica node on shared hosts.</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>
</article>
<article>
<div class="image fit">
<img src="<?php echo get_template_directory_uri(); ?>/images/pic1.png" alt="Plugin">
</div>
<header>
<h3>Extensible</h3>
</header>
<p>Extensible via third-party plugins and themes.</p>
<p>Add functionality, personalize the look and feel, connect to third-party services.</p>
<footer>
<a href="https://github.com/friendica/friendica-addons" class="button special">More</a>
</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>
<!-- Last news -->
<?php
$args = array(
'post_type' => "post"
);
$the_query = new WP_Query( $args );
?>
<section id="four" class="wrapper special">
<div class="inner">
<header class="align-center">
<h2>Last News</h2>
</header>
<div class="row">
<!-- article 1 -->
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
<div class="6u 12u$(medium)">
<!-- article 2-5 -->
<div class="row">
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
</div>
<hr>
<div class="flex flex-2">
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
</div>
</div>
<div>
</div>
</section>
<?php wp_reset_query(); ?>
<?php get_footer(); ?>
<?php get_header("home"); ?>
<!-- One -->
<section id="one" class="wrapper">
<div class="inner">
<div class="flex flex-3">
<article>
<header>
<h3>Decentralization</h3>
</header>
<p>Decentralized architecture with no central authority or ownership.</p>
<p>Relationships can be made across any compatible system, creating a network of Internet scale made up of smaller sites.</p>
<p>Seamless wall-to-wall posts and remote comments, even across different network nodes.</p>
</article>
<article>
<header>
<h3>Privacy</h3>
</header>
<p>Access lists for every item.</p>
<p>Private conversation groups &mdash; on these pages all communications are restricted to group members.</p>
<p>One-to-one private messaging on supported protocols.</p>
<p>Optionally "expire" old content after a certain period of time.</p>
<p>Download your personal data. It all belongs to you.</p>
</article>
<article>
<header>
<h3>Interoperability</h3>
</header>
<p>Built-in support for ActivityPub (e.g. Funkwhale, Hubzilla, Mastodon, Pleroma, Pixelfed), OStatus (e.g. StatusNet, GNU social, Quitter) and diaspora* protocols.</p>
<p>Support for email contacts and communications (two-way) via IMAP4rev1/ESMTP.</p>
<p>Import arbitrary websites and blogs into your social stream via RSS/Atom feeds.</p>
<p>Support for other services via plugins.</p>
</article>
</div>
</div>
</section>
<!-- Two -->
<section id="two" class="wrapper style1 special">
<div class="inner">
<header>
<h2>A personal social network</h2>
<p>Keep in contact with people you care about.</p>
</header>
<div class="flex flex-4">
<div class="box person">
<div class="image round">
<i class="fa fa-file-text" aria-hidden="true"></i>
</div>
<h3>Posts</h3>
<p>Write your thoughts, edit them if you want. Comment, Like and Dislike posts from your contacts.</p>
</div>
<div class="box person">
<div class="image round">
<i class="fa fa-picture-o" aria-hidden="true"></i>
</div>
<h3>Photos</h3>
<p>Share your holiday photos, but only with people you want.</p>
</div>
<div class="box person">
<div class="image round">
<i class="fa fa-calendar" aria-hidden="true"></i>
</div>
<h3>Events</h3>
<p>Organize the next meeting of your reading group, or let everybody know about your cool party!</p>
</div>
<div class="box person">
<div class="image round">
<i class="fa fa-users" aria-hidden="true"></i>
</div>
<h3>Profiles</h3>
<p>Like in real life, have a public profile and private aspects only for your closest friends. Or keep everything private!</p>
</div>
</div>
<footer>
<a href="/features/" class="button">More features</a> <a href="/screenshots/" class="button">Screenshots</a>
</footer>
</div>
</section>
<!-- Three -->
<section id="three" class="wrapper special">
<div class="inner">
<header class="align-center">
<h2>Free software &mdash; Free protocols</h2>
<p>Friendica is free software and use free protocols.</p>
</header>
<div class="flex flex-2">
<article>
<div class="image fit">
<img src="<?php echo get_template_directory_uri(); ?>/images/pic2.png" alt="Stack">
</div>
<header>
<h3>PHP &amp; MySQL</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>
<footer>
<a href="/requirements/" class="button special">More</a>
</footer>
</article>
<article>
<div class="image fit">
<img src="<?php echo get_template_directory_uri(); ?>/images/pic1.png" alt="Plugin">
</div>
<header>
<h3>Extensible</h3>
</header>
<p>Extensible via third-party plugins and themes.</p>
<p>Add functionality, personalize the look and feel, connect to third-party services.</p>
<footer>
<a href="https://github.com/friendica/friendica-addons" class="button special">More</a>
</footer>
</article>
</div>
</div>
</section>
<hr>
<!-- Four -->
<?php
$args = array(
'post_type' => "post"
);
$the_query = new WP_Query( $args );
?>
<section id="four" class="wrapper special">
<div class="inner">
<header class="align-center">
<h2>Last News</h2>
</header>
<div class="row">
<!-- article 1 -->
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
<div class="6u 12u$(medium)">
<!-- article 2-5 -->
<div class="row">
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
</div>
<hr>
<div class="flex flex-2">
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
<?php
if ($the_query->have_posts()) {
$the_query->the_post();
get_template_part( 'entry', 'home' );
}
?>
</div>
</div>
<div>
</div>
</section>
<?php wp_reset_query(); ?>
<?php get_footer(); ?>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 203 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.6
Version: 1.1.3
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?v=1.1.7);
@import url(./assets/css/fira.css);
@import url(./assets/css/fork-awesome.min.css);
@import url(./assets/css/raleway.css);
@import url(./assets/css/main.css);