[UI][FAQ] FAQ polish, better use of twig, responsive css.
This commit is contained in:
rainydaysavings
parent
17d737b590
commit
22b68766db
GPG Key ID:
7D0C7EAFC9D835A0
|
|
@ -0,0 +1,18 @@
|
|||
{% extends 'faq/home.html.twig' %}
|
||||
|
||||
{% block title %}Help{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="content">
|
||||
{% block markdown %}
|
||||
{% 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 %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
{% 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)">
|
||||
|
|
@ -13,68 +12,5 @@
|
|||
{% 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 %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'faq/base.html.twig' %}
|
||||
{% extends 'faq/home.html.twig' %}
|
||||
|
||||
{% block title %}Help{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
{% extends 'faq/home.html.twig' %}
|
||||
|
||||
{% block title %}Help{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="content">
|
||||
{% block markdown %}
|
||||
{% 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 %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{% 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 %}
|
||||
Loading…
Reference in New Issue