eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[FAQ][CSS] All FAQ pages stylized, minor structure changes throughout.

This commit is contained in:
Eliseu Amaro 2021-08-09 13:25:08 +01:00 committed by Hugo Sales
parent 10f930ad4b
commit 68cf6dee65
Signed by untrusted user: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
14 changed files with 333 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
public/assets/css/base.css
View File

@ -10,9 +10,9 @@
* small size - used in common text, borders * small size - used in common text, borders
*/ */
--unit-size: 0.5rem; --unit-size: 0.5rem;
--main-size: 1.15rem; --main-size: 1.4rem;
--medium-size: 0.9rem; --medium-size: 1.2rem;
--small-size: 0.8rem; --small-size: 1rem;
/* colours and shadows */ /* colours and shadows */
--bg1: #242434; --bg1: #242434;
@ -78,7 +78,7 @@
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around; justify-content: space-around;
/*margin-top: calc(3 * var(--small-size) + var(--main-size));*/ /*margin-top: calc(3 * var(--small-size) + var(--main-size));*/
margin-top: 3.3rem; margin-top: 4.3rem;
} }
/* THE FOCUSED (middle) DIV */ /* THE FOCUSED (middle) DIV */
@ -93,6 +93,35 @@
max-width: 60%; max-width: 60%;
} }
.markdown-blocks {
background-color: var(--translucent);
border-radius: 0 0 var(--unit-size) var(--unit-size);
border: solid 2px var(--bg2);
border-top: solid 2px var(--bg3);
padding: var(--unit-size);
}
.markdown-blocks ul {
margin-left: 1em;
list-style: disc;
}
.markdown-blocks ul li {
margin-bottom: 0.2em;
}
.doc-navigation {
background-color: var(--translucent);
border-radius: var(--unit-size) var(--unit-size) 0 0;
border: solid 2px var(--bg2);
border-bottom: none;
padding: var(--unit-size);
}
.doc-navigation ul {
display: flex;
justify-content: space-evenly;
font-size: var(--main-size);
font-family: var(--display-font);
}
/* NOTES */ /* NOTES */
.h-feed, .h-feed,
.notes { .notes {
@ -109,6 +138,7 @@
.note { .note {
background-color: var(--translucent); background-color: var(--translucent);
border: solid 2px var(--bg2); border: solid 2px var(--bg2);
border-top: solid 2px var(--bg3);
border-radius: var(--unit-size); border-radius: var(--unit-size);
} }

3
templates/base.html.twig
View File

@ -27,6 +27,7 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</head> </head>
<body class="bg"> <body class="bg">
{% block header %} {% block header %}
<div id='header'> <div id='header'>
@ -52,10 +53,12 @@
{% endblock header %} {% endblock header %}
<div class="container"> <div class="container">
<div class='content'>
{% block nav %}{% endblock %} {% block nav %}{% endblock %}
{% block body %}{% endblock %} {% block body %}{% endblock %}
{% block javascripts %}{% endblock javascripts %} {% block javascripts %}{% endblock javascripts %}
</div> </div>
</div>
</body> </body>
</html> </html>

6
templates/doc/faq/contact.html.twig
View File

@ -1,11 +1,15 @@
{% extends 'doc/faq/faq.html.twig' %} {% extends 'doc/faq/faq.html.twig' %}
{% block title %}Help{% endblock %} {% block title %}Contact us!{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
{% endblock %} {% endblock %}
{% block nav %}
{{ parent() }}
{% endblock %}
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## Bugs ## Bugs

19
templates/doc/faq/faq.html.twig
View File

@ -1,12 +1,13 @@
{% extends 'doc/base.html.twig' %} {% extends 'doc/privacy.html.twig' %}
{% block title %}FAQ{% endblock %} {% block title %}FAQ{% endblock %}
{% block header %}{{ parent() }}{% endblock %}
{% block body %} {% block body %}
<div class='content'> {{ parent() }}
<nav class='faq-nav'> {% endblock %}
{% block nav %}
<nav class='doc-navigation'>
<ul> <ul>
<li> <li>
<a href="{{ path('doc_faq') }}" <a href="{{ path('doc_faq') }}"
@ -30,8 +31,9 @@
</li> </li>
</ul> </ul>
</nav> </nav>
<div class='markd'> {% endblock %}
{% block markdown %}
{% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## What is this site? ## What is this site?
This is a social network, running the GNU social software. This is a social network, running the GNU social software.
@ -49,7 +51,4 @@
To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications. To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications.
{% endapply %} {% endapply %}
{% endblock %}
</div>
</div>
{% endblock %} {% endblock %}

6
templates/doc/faq/groups.html.twig
View File

@ -1,10 +1,14 @@
{% extends 'doc/faq/faq.html.twig' %} {% extends 'doc/faq/faq.html.twig' %}
{% block title %}Help{% endblock %} {% block title %}Groups{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
{% endblock %} {% endblock %}
{% block nav %}
{{ parent() }}
{% endblock %}
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## Groups ## Groups

6
templates/doc/faq/openid.html.twig
View File

@ -1,11 +1,15 @@
{% extends 'doc/faq/faq.html.twig' %} {% extends 'doc/faq/faq.html.twig' %}
{% block title %}Help{% endblock %} {% block title %}OpenID{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
{% endblock %} {% endblock %}
{% block nav %}
{{ parent() }}
{% endblock %}
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## Openid ## Openid

6
templates/doc/faq/tags.html.twig
View File

@ -1,11 +1,15 @@
{% extends 'doc/faq/faq.html.twig' %} {% extends 'doc/faq/faq.html.twig' %}
{% block title %}Help{% endblock %} {% block title %}Tags{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
{% endblock %} {% endblock %}
{% block nav %}
{{ parent() }}
{% endblock %}
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## Tags ## Tags

43
templates/doc/privacy.html.twig
View File

@ -1,35 +1,36 @@
{% extends 'base.html.twig' %} {% extends 'stdgrid.html.twig' %}
{% block title %}Privacy{% endblock %} {% block title %}Privacy{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
<div class='content'>
<div class='markd markd-single'> <div class='markdown-blocks'>
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## Privacy ## Privacy
This document outlines this service's respect for your personal privacy as a user of the service. This document outlines this service's respect for your personal privacy as a user of the service.
- Almost all the text and files that users upload to this site is available under the site license (see the license block at the bottom of this page). Users agree to the license when they register to use the site for the first time. Typically that means that the data can be copied far and wide, for commercial and non-commercial purposes, and in modified or unmodified form. If you're not OK with that, don't use the service. Almost all the text and files that users upload to this site is available under the site license (see the license block at the bottom of this page). Users agree to the license when they register to use the site for the first time. Typically that means that the data can be copied far and wide, for commercial and non-commercial purposes, and in modified or unmodified form. If you're not OK with that, don't use the service.
The following data items are considered private data that won't be shared with other users, business partners, or the public at large:
- your password The following data items **are considered private data** that won't be shared with other users, business partners, or the public at large:
- your email address
- your IM address (AIM, Jabber, or other instant messaging address) - Your Password;
- your phone number - Your Email address;
- your "private messages" - Your IM address (AIM, Jabber, or other instant messaging address);
- your login credentials (username and password) for other services (Twitter, Facebook, etc.) - Your phone number;
- Some private data may be published in aggregate, e.g. "30% of our users are registered with Hotmail addresses." - Your "private messages";
- Your notices (including files) can be downloaded and re-used by other services, either one-by-one or in bulk as RSS files. - Your login credentials (username and password) for other services (Twitter, Facebook, etc.);
- Your profile information (including subscriptions and avatars) can be downloaded and re-used by other services, either scraped from the HTML interface or in bulk as FOAF files. - Some private data may be published in aggregate, e.g. "30% of our users are registered with Hotmail addresses.";
- Your notices will be forwarded to users who subscribe to them, including users on another microblogging service. - Your notices (including files) can be downloaded and re-used by other services, either one-by-one or in bulk as RSS files;
- Your profile information will be sent to microblogging services for users who subscribe to you or to whom you subscribe. - Your profile information (including subscriptions and avatars) can be downloaded and re-used by other services, either scraped from the HTML interface or in bulk as FOAF files;
- Based on your email preferences, you may receive automated email messages for important system events, such as when others subscribe to your notices. - Your notices will be forwarded to users who subscribe to them, including users on another microblogging service;
- Based on your email preferences, you may receive an email newsletter. You can opt out of the newsletter if you don't want to receive it. - Your profile information will be sent to microblogging services for users who subscribe to you or to whom you subscribe;
- In urgent situations, administrators may send you email directly to your registered email address, even if you've requested no notices or newsletter. Administrators will use digitally-signed email. - Based on your email preferences, you may receive automated email messages for important system events, such as when others subscribe to your notices;
- This service will comply with court orders to turn over your private information. - Based on your email preferences, you may receive an email newsletter. You can opt out of the newsletter if you don't want to receive it;
- In urgent situations, administrators may send you email directly to your registered email address, even if you've requested no notices or newsletter. Administrators will use digitally-signed email;
- This service will comply with court orders to turn over your private information;
{% endapply %} {% endapply %}
{% endblock %} {% endblock %}
</div> </div>
</div>
{% endblock %} {% endblock %}

12
templates/doc/source.html.twig
View File

@ -1,11 +1,12 @@
{% extends 'base.html.twig' %} {% extends 'doc/privacy.html.twig' %}
{% block title %}Source{% endblock %} {% block title %}Source{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
<div class='content'> {% endblock %}
<div class='markd markd-single'>
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## Source ## Source
@ -18,7 +19,4 @@
- GNU social main site, https://gnu.io - GNU social main site, https://gnu.io
- GNU social repository, https://notabug.org/gnu/gnu-social - GNU social repository, https://notabug.org/gnu/gnu-social
{% endapply %} {% endapply %}
{% endblock %}
</div>
</div>
{% endblock %} {% endblock %}

14
templates/doc/tos.html.twig
View File

@ -1,11 +1,12 @@
{% extends 'base.html.twig' %} {% extends 'doc/privacy.html.twig' %}
{% block title %}Terms of Service{% endblock %}
{% block title %}TOS{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
<div class='content'> {% endblock %}
<div class='markd markd-single'>
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## TOS ## TOS
## The gist ## The gist
@ -83,7 +84,4 @@
Originally published by Automattic, Inc. as the WordPress.com Terms of Service and made available by them under the Creative Commons Attribution-ShareAlike 3.0 License. Modifications to remove reference to "VIP services", rename "blog" to "notice stream", remove the choice-of-venue clause, and add variables specific to instances of this software made by Control Yourself, Inc. and made available under the terms of the same license. Originally published by Automattic, Inc. as the WordPress.com Terms of Service and made available by them under the Creative Commons Attribution-ShareAlike 3.0 License. Modifications to remove reference to "VIP services", rename "blog" to "notice stream", remove the choice-of-venue clause, and add variables specific to instances of this software made by Control Yourself, Inc. and made available under the terms of the same license.
{% endapply %} {% endapply %}
{% endblock %}
</div>
</div>
{% endblock %} {% endblock %}

12
templates/doc/version.html.twig
View File

@ -1,11 +1,12 @@
{% extends 'base.html.twig' %} {% extends 'doc/privacy.html.twig' %}
{% block title %}Version{% endblock %} {% block title %}Version{% endblock %}
{% block body %} {% block body %}
{{ parent() }} {{ parent() }}
<div class='content'> {% endblock %}
<div class='markd markd-single'>
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
## GNU social 3 ## GNU social 3
@ -23,7 +24,4 @@
You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/agpl.html. You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/agpl.html.
{% endapply %} {% endapply %}
{% endblock %}
</div>
</div>
{% endblock %} {% endblock %}

1
templates/faq/home.html.twig
View File

@ -1 +0,0 @@
{% extends "base.html.twig" %}

3
templates/network/public.html.twig
View File

@ -9,8 +9,6 @@
{% block body %} {% block body %}
<div class="content">
{# Backwards compatibility with hAtom 0.1 #} {# Backwards compatibility with hAtom 0.1 #}
<div class="timeline"> <div class="timeline">
<main class="h-feed hfeed notes"> <main class="h-feed hfeed notes">
@ -24,7 +22,6 @@
</main> </main>
</div> </div>
</div>
{% endblock body %} {% endblock body %}
{% block javascripts %}{% endblock %} {% block javascripts %}{% endblock %}

3
templates/settings/base.html.twig
View File

@ -17,8 +17,6 @@
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<div class="content">
<nav class='main-nav fg'> <nav class='main-nav fg'>
<h1>Settings</h1> <h1>Settings</h1>
<ul> <ul>
@ -111,7 +109,6 @@
</li> </li>
</ul> </ul>
</nav> </nav>
</div>
{% endblock body %} {% endblock body %}
{% block javascripts %}{% endblock %} {% block javascripts %}{% endblock %}