hyperzlib
/
nodebb-theme-persona
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	.gitignore
main
Baris Usakli 7 years ago
parent 0192d5f5d7 21c74333bc
commit c0090908fb
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
library.js
Unescape Escape View File

@ -1,6 +1,6 @@
'use strict';
var S = require.main.require('string');
var S = require('string');
var meta = module.parent.require('./meta');
var user = module.parent.require('./user');

7
package.json
Unescape Escape View File

@ -1,8 +1,8 @@
{
"name": "nodebb-theme-persona",
"version": "6.1.3",
"version": "6.1.5",
"nbbpm": {
"compatibility": "^1.4.4"
"compatibility": "^1.4.4 || ^1.5.0 || ^1.6.0"
},
"description": "Persona theme for NodeBB",
"main": "theme.less",
@ -37,5 +37,8 @@
"license": "BSD-2-Clause",
"bugs": {
"url": "https://github.com/psychobunny/nodebb-theme-persona/issues"
},
"dependencies": {
"string": "^3.3.3"
}
}

1
templates/category.tpl
Unescape Escape View File

@ -31,6 +31,7 @@
<p class="hidden-xs">{name}</p>
<!-- IF !topics.length -->
<hr class="visible-xs" />
<div class="alert alert-warning" id="category-no-topics">
[[category:no_topics]]
</div>

8
templates/recent.tpl
Unescape Escape View File

@ -14,18 +14,18 @@
<!-- ENDIF loggedIn -->
</div>
<div class="btn-group pull-right category-dropdown-container <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
<div component="category/dropdown" class="btn-group pull-right category-dropdown-container <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><span class="fa-stack"><i style="color: {selectedCategory.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
</button>
<ul class="dropdown-menu category-dropdown-menu" role="menu">
<ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
<li role="presentation" class="category">
<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
</li>
<!-- BEGIN categories -->
<li role="presentation" class="category" data-cid="{categories.cid}">
<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</a>
<li role="presentation" class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}">
<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}?cid={categories.cid}"><i component="category/select/icon" class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</a>
</li>
<!-- END categories -->
</ul>

8
templates/unread.tpl
Unescape Escape View File

@ -35,18 +35,18 @@
</ul>
</div>
<div class="btn-group pull-right category-dropdown-container">
<div component="category/dropdown" class="btn-group pull-right category-dropdown-container">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><span class="fa-stack"><i style="color: {selectedCategory.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
</button>
<ul class="dropdown-menu category-dropdown-menu" role="menu">
<ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
<li role="presentation" class="category">
<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
</li>
<!-- BEGIN categories -->
<li role="presentation" class="category" data-cid="{categories.cid}">
<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</a>
<li role="presentation" class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}">
<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}?cid={categories.cid}"><i component="category/select/icon" class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</a>
</li>
<!-- END categories -->
</ul>

Write Preview
Loading…
Cancel
Save