flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Pachira 2015-08-18 15:17:54 +02:00
commit 1d4801f9a8
4 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
_sakura/changelog.json
View file

@ -43,7 +43,7 @@
"20150811",
"20150812",
"20150813",
"20150814"
"20150818"
]
@ -2019,9 +2019,13 @@
],
"20150814": [
"20150818": [
{
"type": "FIX",
"change": "Fixed urls in Misaki.",
"user": "Flashwave"
}
]

2
_sakura/sakura.php
View file

@ -8,7 +8,7 @@
namespace Sakura;
// Define Sakura version
define('SAKURA_VERSION', '20150813');
define('SAKURA_VERSION', '20150818');
define('SAKURA_VLABEL', 'Eminence');
define('SAKURA_COLOUR', '#6C3082');
define('SAKURA_STABLE', false);

30
_sakura/templates/misaki/global/header.tpl
View file

@ -54,31 +54,31 @@
<div id="content">
<div id="navigation">
<ul class="nav-left floatLeft">
<li><a href="//{{ sakura.urls.main }}/">Home</a></li>
<li><a href="//{{ sakura.urls.main }}/news">News</a></li>
<li><a href="//{{ sakura.urls.chat }}/">Chat</a></li>
<li><a href="//{{ sakura.urls.main }}/forum">Forum</a></li>
<li><a href="//{{ sakura.urls.main }}/members">Members</a></li>
<li><a href="//{{ sakura.urls.main }}/search">Search</a></li>
<li><a href="//{{ sakura.urls.main }}/donate">Donate</a></li>
<li><a href="/">Home</a></li>
<li><a href="/news">News</a></li>
<li><a href="//chat.{{ sakura.url_main }}/">Chat</a></li>
<li><a href="/forum">Forum</a></li>
<li><a href="/members">Members</a></li>
<li><a href="/search">Search</a></li>
<li><a href="/donate">Donate</a></li>
</ul>
<ul class="nav-right floatRight">
<li class="nav-usermenu">
<a href="#"{% if user.checklogin %} style="color: {{ user.colour }};"{% endif %}>{% if user.checklogin %}{{ user.data.username }}{% else %}Guest{% endif %}</a>
<ul>
{% if user.checklogin %}
<li><a href="//{{ sakura.urls.main }}/u/{{ user.data.id }}">My Profile</a></li>
<li><a href="//{{ sakura.urls.main }}/messages">View Messages</a></li>
<li><a href="//{{ sakura.urls.main }}/settings">User Settings</a></li>
<li><a href="//{{ sakura.urls.main }}/manage">Site Management</a></li>
<li><a href="//{{ sakura.urls.main }}/logout?mode=logout&time={{ php.time }}&session={{ php.sessionid }}&redirect={{ sakura.currentpage }}">Logout</a></li>
<li><a href="/u/{{ user.data.id }}">My Profile</a></li>
<li><a href="/messages">View Messages</a></li>
<li><a href="/settings">User Settings</a></li>
<li><a href="/manage">Site Management</a></li>
<li><a href="/logout?mode=logout&amp;time={{ php.time }}&amp;session={{ php.sessionid }}&amp;redirect={{ sakura.currentpage }}">Logout</a></li>
{% else %}
<li><a href="//{{ sakura.urls.main }}/login">Login</a></li>
<li><a href="//{{ sakura.urls.main }}/register">Register</a></li>
<li><a href="/login">Login</a></li>
<li><a href="/register">Register</a></li>
{% endif %}
</ul>
</li>
<li><a href="#" class="ignore"><img src="//{{ sakura.urls.content }}/pixel.png" alt="{{ user.data.username }}" style="background-image: url('//{{ sakura.urls.main }}/a/{{ user.data.id }}');" class="nav-avatar" /></a></li>
<li><a href="#" class="ignore"><img src="{{ sakura.content_path }}/pixel.png" alt="{{ user.data.username }}" style="background-image: url('/a/{{ user.data.id }}');" class="nav-avatar" /></a></li>
</ul>
<div class="clear"></div>
</div>

10
main/content/data/misaki/css/misaki.css
View file

@ -7,11 +7,11 @@
* Import fonts
*/
@import url('//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css'); /* Font Awesome */
@import url('/fonts/springsteel-light/font.css'); /* Springsteel Light */
@import url('/fonts/exo2-0-italic/font.css'); /* Exo 2.0 Italic */
@import url('/fonts/exo2-0-light/font.css'); /* Exo 2.0 Light */
@import url('/fonts/exo2-0-lightitalic/font.css'); /* Exo 2.0 Light Italic */
@import url('/fonts/aller/font.css'); /* Aller */
@import url('/content/fonts/springsteel-light/font.css'); /* Springsteel Light */
@import url('/content/fonts/exo2-0-italic/font.css'); /* Exo 2.0 Italic */
@import url('/content/fonts/exo2-0-light/font.css'); /* Exo 2.0 Light */
@import url('/content/fonts/exo2-0-lightitalic/font.css'); /* Exo 2.0 Light Italic */
@import url('/content/fonts/aller/font.css'); /* Aller */
/*
* Import markdown stylesheet