[UI][Mobile][FAQ][ROUTES] FAQ sub pages and routing added, small screen css work started.

This commit is contained in:
rainydaysavings 2020-06-13 23:51:42 +01:00 committed by Hugo Sales
parent 768607fe98
commit 17d737b590
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
6 changed files with 111 additions and 217 deletions

View File

@ -1,132 +0,0 @@
/* GENERAL ----------------------------*/
body, html
{
background-image: linear-gradient(to right bottom, #485563, #404c59, #38434f, #313a45, #29323c);
height: 100%;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
color: #F6F6F6;
font-family: 'Open Sans', sans-serif;
}
ul
{
text-decoration: none;
margin: 0;
padding: 0;
list-style: none;
}
.drop-down ul li
{
position: relative;
}
.drop-down ul li ul a
{
line-height: 1.8em;
}
.drop-down ul li ul
{
display: none;
position: absolute;
background-color: rgba(0, 0, 0, 0.20);
padding: 0.8em 1.5em 1.5em 0.8em;
border-radius: 4px;
}
.drop-down ul li:hover ul
{
display: block;
}
.drop-down ul li ul a:hover
{
opacity: 0.6;
transition: all 0.5s ease;
}
#hover-effect:hover
{
opacity: 0.6;
transition: all 0.5s ease;
}
a:link
{
text-decoration: none;
outline: 0;
color: #F6F6F6;
}
a:visited
{
outline: 0;
color: #F6F6F6;
}
/*-------------------------------------*/
/* HEADER -----------------------------*/
#header
{
margin-top: 2em;
margin-left: 20%;
margin-right: 20%;
display: flex;
justify-content: space-between;
}
.flex-items
{
margin: 2em;
}
/* MENU -------------------------------*/
#menu
{
order: 1;
}
#menu-png
{
height: 2em;
}
/*-------------------------------------*/
/* INSTANCE ---------------------------*/
#instance
{
order: 2;
}
#align-mid
{
}
#logo
{
height: 2em;
}
#down-arrow
{
height: 1em;
}
/*-------------------------------------*/
/* SEARCH -----------------------------*/
#search
{
order: 3;
}
#search-png
{
height: 2em;
}
/*-------------------------------------*/
/*-------------------------------------*/

View File

@ -1,41 +0,0 @@
<?php
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* FAQ main page
*
* @package GNUsocial
* @category Controller
*
* @author Eliseu Amaro <eliseu@fc.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
class FaqHome extends AbstractController
{
public function __invoke()
{
return $this->render('faq/home.html.twig', []);
}
}

View File

@ -1,42 +0,0 @@
<?php
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* Define FAQ's main routes
*
* @package GNUsocial
* @category Router
*
* @author Eliseu Amaro <eliseu@fc.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
namespace App\Routes;
use App\Controller\FaqHome;
use App\Core\RouteLoader;
abstract class Faq
{
public static function load(RouteLoader $r): void
{
$r->connect('doc_faq', '/doc/faq', FaqHome::class);
}
}

View File

@ -5,6 +5,7 @@
{% block title %}{% endblock %}
{% block stylesheets %}
<<<<<<< HEAD
{{ parent() }}
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/faq/faq.css') }}" media="screen and (min-width: 1300px)">
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/faq/faq_mid.css') }}" media="screen and (max-width: 1300px)">
@ -12,5 +13,68 @@
{% endblock %}
{% block header %}{{ parent() }}{% endblock %}
=======
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/faq/base.css') }}" media="screen and (min-width: 777px)">
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/faq/base_small.css') }}" media="screen and (max-width: 777px)">
{% endblock %}
{% block body %}
<div id='header'>
<nav class='drop-down' id='menu'>
<ul>
<li>
<a href="#" class='hover-effect'>
<svg class="icon icon-menu"><use xlink:href="#icon-menu"></use></svg>
</a>
<ul>
<li><a>Bookmarks</a></li>
<li><a>Messages</a></li>
<li><a>Settings</a></li>
<li><a>Logout</a></li>
</ul>
</li>
</ul>
</nav>
<nav class='drop-down' id='instance'>
<ul>
<li>
<a href="#" class='hover-effect'>
<svg class="icon icon-logo"><use xlink:href="#icon-logo"></use></svg>
<b id='instance-name'>GNU social</b>
<svg class="icon icon-drop"><use xlink:href="#icon-drop"></use></svg>
</a>
<ul>
<li><a>Main Page</a></li>
</ul>
</li>
</ul>
</nav>
<div class='flex-item' id='search'>
<svg class="icon icon-search"><use xlink:href="#icon-search"></use></svg>
</div>
<div id='profile'>
<svg class="icon icon-avatar"><use xlink:href="#icon-avatar"></use></svg>
<div id='info'>
<div id='nick'>
<b id='name'>someone</b>
</div>
<div id='tags'>
<i>coffee addict</i>
<i>lazy</i>
</div>
</div>
<div id='stats'>
<div id='followers'>
<b>1337</b> Followers
</div>
<div id='following'>
<b>42</b> Following
</div>
</div>
</div>
</div>
{% endblock %}
>>>>>>> 2ed0d2b706... [UI] FAQ sub pages and routing added, small screen css work started.
{% block javascripts %}{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends 'faq/faq.html.twig' %}
{% extends 'faq/base.html.twig' %}
{% block title %}Help{% endblock %}

View File

@ -1 +1,46 @@
{% extends 'faq/base.html.twig' %}
{% block title %}FAQ{% endblock %}
{% block body %}
{{ parent() }}
<nav class='faq-nav'>
<ul>
<li>
<a href="{{ path('doc_faq') }}" class='hover-effect active'>FAQ</a>
</li>
<li>
<a href="{{ path('doc_help') }}" class='hover-effect'>Help</a>
</li>
<li>
<a href="{{ path('doc_about') }}" class='hover-effect'>About</a>
</li>
<li>
<a href="{{ path('doc_contact') }}" class='hover-effect'>Contact</a>
</li>
<li>
<a href="{{ path('doc_tags') }}" class='hover-effect'>Tags</a>
</li>
<li>
<a href="{{ path('doc_groups') }}" class='hover-effect'>Groups</a>
</li>
<li>
<a href="{{ path('doc_api') }}" class='hover-effect'>API</a>
</li>
<li>
<a href="{{ path('doc_openid') }}" class='hover-effect'>OpenID</a>
</li>
</ul>
</nav>
<div class="content">
{% apply markdown_to_html %}
## What is this site?
This is a social network, running the GNU social software.
You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
{% endapply %}
</div>
{% endblock %}