Merge branch 'master' of github.com:nodebb/nodebb-theme-persona

main
Peter Jaszkowiak 7 years ago
commit bff38277d2

@ -172,3 +172,19 @@
max-height: 500px;
overflow-y: auto;
}
.merge-topic-card {
position: fixed;
bottom: 10%;
right: 2rem;
z-index: 1;
.topics-section {
text-align: center;
}
}
@media screen and (min-width: @screen-sm-min) {
.merge-topic-card {
max-width: 33%;
}
}

@ -31,8 +31,35 @@ html[data-dir="rtl"] {
margin-left: 15px;
margin-right: 0px;
}
.categories .description, .categories .category-children {
margin-left: auto;
margin-right: 62px;
}
.page-user .posts-list .posts-list-item .user-img {
left: 0;
}
.slideout-menu .menu-section-list a, .slideout-menu .menu-section-list button {
text-align: right;
}
[component="chat/list"] {
.avatar-placeholder, .main-avatar {
right: 0;
left: auto;
}
.room-name, .teaser-content {
padding-right: 80px;
padding-left: 0;
text-align: right;
}
}
.slideout-menu .chat-list li .teaser-content, .slideout-menu .chat-list li .room-name {
padding-right: 60px;
}
}

@ -117,7 +117,7 @@ $(document).ready(function() {
require(['pulling', 'storage'], function (Pulling, Storage) {
// initialization
var guest = !app.user || !parseInt(app.user.uid, 10);
var chatMenuVisible = !config.disableChat && app.user && parseInt(app.user.uid, 10);
var swapped = !!Storage.getItem('persona:menus:legacy-layout');
var margin = window.innerWidth;
@ -140,7 +140,7 @@ $(document).ready(function() {
$('#menu').removeClass('hidden');
var chatsSlideout;
if (!guest) {
if (chatMenuVisible) {
chatsSlideout = Pulling.create({
panel: document.getElementById('panel'),
menu: document.getElementById('chats-menu'),
@ -181,7 +181,7 @@ $(document).ready(function() {
$('#panel').one('click', closeOnClick);
});
if (!guest) {
if (chatMenuVisible) {
chatsSlideout
.ignore('code, code *, .preventSlideout, .preventSlideout *')
.on('closed', onClose)
@ -205,7 +205,7 @@ $(document).ready(function() {
navSlideout.on('opened', loadNotifications);
if (!guest) {
if (chatMenuVisible) {
navSlideout.on('beforeopen', function () {
chatsSlideout.close();
chatsSlideout.disable();
@ -234,7 +234,7 @@ $(document).ready(function() {
});
}
if (!guest) {
if (chatMenuVisible) {
$('#mobile-chats').removeClass('hidden').on('click', function() {
navSlideout.close();
chatsSlideout.enable().toggle();

@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
"version": "7.2.1",
"version": "7.2.7",
"nbbpm": {
"compatibility": "^1.7.0"
},

@ -31,10 +31,12 @@
<p class="hidden-xs">{name}</p>
<!-- IF !topics.length -->
<!-- IF privileges.topics:create -->
<hr class="visible-xs" />
<div class="alert alert-warning" id="category-no-topics">
[[category:no_topics]]
</div>
<!-- ENDIF privileges.topics:create -->
<!-- ENDIF !topics.length -->
<a href="{url}">

@ -10,6 +10,7 @@
<li><a href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest_to_oldest]]</a></li>
<li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
<li><a href="#" class="most_posts" data-sort="most_posts"><i class="fa fa-fw"></i> [[topic:most_posts]]</a></li>
<li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
</ul>
</div>
<!-- ENDIF loggedIn -->

@ -45,6 +45,11 @@
<i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move_all]]
</a>
</li>
<li>
<a component="topic/merge" href="#">
<i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.merge]]
</a>
</li>
<li class="divider"></li>

@ -0,0 +1,25 @@
<div class="panel panel-primary merge-topic-card">
<div class="panel-heading">
<h3 class="panel-title">[[topic:thread_tools.merge_topics]]</h3>
</div>
<div class="panel-body">
<p>
[[topic:merge_topics_instruction]]<br />
<div class="topics-section">
<!-- BEGIN topics -->
<!-- IF @index -->
<i class="fa fa-chevron-up"></i><br/>
<!-- ENDIF @index -->
<span>{topics.title}</span><br/>
<!-- END topics -->
</div>
</p>
</div>
<div class="panel-footer">
&nbsp;
<div class="btn-group pull-right">
<button class="btn btn-link btn-xs" id="merge_topics_cancel">[[global:buttons.close]]</button>
<button class="btn btn-primary btn-xs" id="merge_topics_confirm" disabled>[[topic:thread_tools.merge]]</button>
</div>
</div>
</div>

@ -38,7 +38,6 @@
</span>
</button>
<!-- ENDIF allowProfileImageUploads -->
<!-- IF config.hasImageUploadPlugin -->
<button type="button" class="btn btn-default" data-action="upload-url">
<span class="hidden-xs hidden-sm">
[[user:upload_new_picture_from_url]]
@ -48,7 +47,6 @@
<i class="fa fa-link"></i>
</span>
</button>
<!-- ENDIF config.hasImageUploadPlugin -->
<!-- IF uploaded -->
<button type="button" class="btn btn-default" data-action="remove-uploaded">
<span class="hidden-xs hidden-sm">

@ -4,7 +4,7 @@
<li component="category/topic" class="row clearfix category-item {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
<meta itemprop="name" content="{function.stripTags, title}">
<div class="col-md-7 col-sm-9 col-xs-10 content">
<div class="col-md-6 col-sm-9 col-xs-10 content">
<div class="avatar pull-left" title="{topics.user.username}">
<!-- IF showSelect -->
<div class="select" component="topic/select">
@ -79,6 +79,11 @@
<span class="human-readable-number">{topics.postcount}</span> <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-arrow-circle-right"></i></a>
</div>
<div class="col-md-1 hidden-sm hidden-xs stats">
<span class="human-readable-number" title="{topics.votes}">{topics.votes}</span><br />
<small>[[global:votes]]</small>
</div>
<div class="col-md-1 hidden-sm hidden-xs stats">
<span class="human-readable-number" title="{topics.postcount}">{topics.postcount}</span><br />
<small>[[global:posts]]</small>

@ -5,11 +5,20 @@
<!-- END widgets.header -->
</div>
<div class="popular">
<ul class="nav nav-pills" component="popular/tab">
<li><a href='{config.relative_path}/popular/daily'>[[recent:day]]</a></li>
<li><a href='{config.relative_path}/popular/weekly'>[[recent:week]]</a></li>
<li><a href='{config.relative_path}/popular/monthly'>[[recent:month]]</a></li>
</ul>
<div class="btn-toolbar">
<div class="pull-left">
<!-- IF loggedIn -->
<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
<!-- ELSE -->
<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
<!-- ENDIF loggedIn -->
</div>
<ul class="nav nav-pills pull-right" component="popular/tab">
<li><a href='{config.relative_path}/popular/daily'>[[recent:day]]</a></li>
<li><a href='{config.relative_path}/popular/weekly'>[[recent:week]]</a></li>
<li><a href='{config.relative_path}/popular/monthly'>[[recent:month]]</a></li>
</ul>
</div>
<br />

@ -1,10 +1,8 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div class="tag">
<div class="clearfix">
<div class="btn-toolbar">
<div class="pull-left">
<!-- IMPORT partials/breadcrumbs.tpl -->
</div>
<div class="pull-right">
<!-- IF loggedIn -->
<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
<!-- ELSE -->

@ -0,0 +1,65 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div widget-area="header">
<!-- BEGIN widgets.header -->
{{widgets.header.html}}
<!-- END widgets.header -->
</div>
<div class="top">
<div class="btn-toolbar">
<div class="pull-left">
<!-- IF loggedIn -->
<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
<!-- ELSE -->
<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
<!-- ENDIF loggedIn -->
</div>
<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 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}" 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>
</div>
<div class="btn-group pull-right <!-- IF !filters.length -->hidden<!-- ENDIF !filters.length -->">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{selectedFilter.name} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<!-- BEGIN filters -->
<li role="presentation" class="category">
<a role="menu-item" href="{config.relative_path}/{filters.url}{querystring}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
</li>
<!-- END filters -->
</ul>
</div>
</div>
<hr class="hidden-xs"/>
<div class="category">
<!-- IF !topics.length -->
<div class="alert alert-warning" id="category-no-topics">[[top:no_top_topics]]</div>
<!-- ENDIF !topics.length -->
<a href="{config.relative_path}/{selectedFilter.url}{querystring}">
<div class="alert alert-warning hide" id="new-topics-alert"></div>
</a>
<!-- IMPORT partials/topics_list.tpl -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
</div>

@ -2,6 +2,10 @@
# yarn lockfile v1
pulling@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pulling/-/pulling-1.1.0.tgz#d1460833b623fedcb73c71efb4cbb6824d990749"
striptags@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.0.tgz#763e534338d9cf542f004a4b1eb099e32d295e44"

Loading…
Cancel
Save