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

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

Browse Source
main
Julian Lam 8 years ago
parent c52056c083 b805747752
commit abc9be8a44
7 changed files with 99 additions and 46 deletions
Show Stats Download Patch File Download Diff File

4
less/chats.less
Unescape Escape View File

@ -36,7 +36,7 @@
&.unread { &.unread {
background: lighten(@brand-primary, 35%); background: lighten(@brand-primary, 35%);
border-bottom: 0; border-bottom: 0;
} }
.teaser-content { .teaser-content {
@ -162,7 +162,7 @@
} }
.chat-modal { .chat-modal {
z-index: 10000 !important; z-index: 10000;
} }
.expanded-chat, .chat-modal { .expanded-chat, .chat-modal {

55
less/style.less
Unescape Escape View File

@ -149,11 +149,56 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 30px 0; padding: 30px 0;
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, white)); }
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), white);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), white); .skin-default, .skin-cerulean, .skin-cosmo, .skin-flatly, .skin-journal, .skin-lumen, .skin-paper, .skin-readable, .skin-sandstone, .skin-spacelab, .skin-united, .skin-yeti {
background-image: -ms-linear-gradient(top, transparent, white); .fade-out {
background-image: -o-linear-gradient(top, transparent, white); background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, white));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), white);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), white);
background-image: -ms-linear-gradient(top, transparent, white);
background-image: -o-linear-gradient(top, transparent, white);
}
}
.skin-cyborg .fade-out {
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #060606));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #060606);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #060606);
background-image: -ms-linear-gradient(top, transparent, #060606);
background-image: -o-linear-gradient(top, transparent, #060606);
}
.skin-darkly .fade-out {
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #222222));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #222222);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #222222);
background-image: -ms-linear-gradient(top, transparent, #222222);
background-image: -o-linear-gradient(top, transparent, #222222);
}
.skin-simplex .fade-out {
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #fcfcfc));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #fcfcfc);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #fcfcfc);
background-image: -ms-linear-gradient(top, transparent, #fcfcfc);
background-image: -o-linear-gradient(top, transparent, #fcfcfc);
}
.skin-slate .fade-out {
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #272b30));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #272b30);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #272b30);
background-image: -ms-linear-gradient(top, transparent, #272b30);
background-image: -o-linear-gradient(top, transparent, #272b30);
}
.skin-superhero .fade-out {
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #2b3e50));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #2b3e50);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #2b3e50);
background-image: -ms-linear-gradient(top, transparent, #2b3e50);
background-image: -o-linear-gradient(top, transparent, #2b3e50);
} }
.icon-container { .icon-container {

2
package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"name": "nodebb-theme-persona", "name": "nodebb-theme-persona",
"version": "4.2.4", "version": "4.2.6",
"nbbpm": { "nbbpm": {
"compatibility": "^1.4.4" "compatibility": "^1.4.4"
}, },

13
templates/groups/details.tpl
Unescape Escape View File

@ -108,10 +108,15 @@
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text" component="groups/members/invite" placeholder="[[groups:invited.search]]"/> <input class="form-control" type="text" component="groups/members/invite" placeholder="[[groups:invited.search]]"/>
<span class="input-group-addon search-button"><i class="fa fa-search"></i></span> <span class="input-group-addon search-button"><i class="fa fa-search"></i></span>
</div><br /> </div>
<div class="form-group">
<textarea class="form-control" component="groups/members/bulk-invite" placeholder="[[groups:bulk-invite-instructions]]"></textarea>
</div>
<textarea class="form-control" component="groups/members/bulk-invite" placeholder="[[groups:bulk-invite-instructions]]"></textarea> <div class="form-group">
<button class="btn btn-default btn-sm pull-right" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button><br/><br/> <button class="btn btn-default btn-sm pull-right" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button>
</div>
<table component="groups/invited" class="table table-striped table-hover"> <table component="groups/invited" class="table table-striped table-hover">
<!-- IF !group.invited.length --> <!-- IF !group.invited.length -->
@ -157,7 +162,7 @@
<form component="groups/settings" role="form"> <form component="groups/settings" role="form">
<div class="form-group"> <div class="form-group">
<label for="name">[[groups:details.group_name]]</label> <label for="name">[[groups:details.group_name]]</label>
<input class="form-control" name="name" id="name" type="text" value="{group.displayName}" /> <input <!-- IF group.system -->readonly<!-- ENDIF group.system --> class="form-control" name="name" id="name" type="text" value="{group.displayName}" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="name">[[groups:details.description]]</label> <label for="name">[[groups:details.description]]</label>

7
templates/header.tpl
Unescape Escape View File

@ -7,13 +7,6 @@
<!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS --> <!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
<!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags --> <!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags -->
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/2.3.0/es5-shim.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
<script>__lt_ie_9__ = 1;</script>
<![endif]-->
<script> <script>
var RELATIVE_PATH = "{relative_path}"; var RELATIVE_PATH = "{relative_path}";
var config = JSON.parse('{{configJSON}}'); var config = JSON.parse('{{configJSON}}');

52
templates/partials/chats/message.tpl
Unescape Escape View File

@ -1,27 +1,27 @@
<li component="chat/message" class="chat-message clear" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}"> <li component="chat/message" class="chat-message clear" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}" data-timestamp="{messages.timestamp}">
<div class="message-header"> <div class="message-header">
<a href="{config.relative_path}/user/{messages.fromUser.userslug}"> <a href="{config.relative_path}/user/{messages.fromUser.userslug}">
<!-- IF messages.fromUser.picture --> <!-- IF messages.fromUser.picture -->
<img class="chat-user-image not-responsive" src="{messages.fromUser.picture}"> <img class="chat-user-image not-responsive" src="{messages.fromUser.picture}">
<!-- ELSE --> <!-- ELSE -->
<div class="user-icon chat-user-image" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div> <div class="user-icon chat-user-image" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div>
<!-- ENDIF messages.fromUser.picture --> <!-- ENDIF messages.fromUser.picture -->
</a> </a>
<strong><span class="chat-user">{messages.fromUser.username}</span></strong> <strong><span class="chat-user">{messages.fromUser.username}</span></strong>
<span class="chat-timestamp timeago" title="{messages.timestampISO}"></span> <span class="chat-timestamp timeago" title="{messages.timestampISO}"></span>
</div> </div>
<div component="chat/message/body" class="message-body"> <div component="chat/message/body" class="message-body">
<!-- IF messages.edited --> <!-- IF messages.edited -->
<small class="text-muted pull-right" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small> <small class="text-muted pull-right" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small>
<!-- ENDIF messages.edited --> <!-- ENDIF messages.edited -->
<!-- IF !config.disableChatMessageEditing --> <!-- IF !config.disableChatMessageEditing -->
<!-- IF messages.self --> <!-- IF messages.self -->
<div class="pull-right btn-group controls"> <div class="pull-right btn-group controls">
<button class="btn btn-xs btn-link" data-action="edit"><i class="fa fa-pencil"></i></button> <button class="btn btn-xs btn-link" data-action="edit"><i class="fa fa-pencil"></i></button>
<button class="btn btn-xs btn-link" data-action="delete"><i class="fa fa-times"></i></button> <button class="btn btn-xs btn-link" data-action="delete"><i class="fa fa-times"></i></button>
</div> </div>
<!-- ENDIF messages.self --> <!-- ENDIF messages.self -->
<!-- ENDIF !config.disableChatMessageEditing --> <!-- ENDIF !config.disableChatMessageEditing -->
{messages.content} {messages.content}
</div> </div>
</li> </li>

12
templates/topic.tpl
Unescape Escape View File

@ -13,7 +13,17 @@
<span class="topic-title" component="topic/title">{title}</span> <span class="topic-title" component="topic/title">{title}</span>
</h1> </h1>
<div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted -->">[[topic:deleted_message]]</div> <div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
<span class="pull-left">[[topic:deleted_message]]</span>
<span class="pull-right">
<!-- IF deleter -->
<a href="{config.relative_path}/user/{deleter.userslug}">
<strong>{deleter.username}</strong>
</a>
<small class="timeago" title="{deletedTimestamp}"></small>
<!-- ENDIF deleter -->
</span>
</div>
<hr class="visible-xs" /> <hr class="visible-xs" />

Write Preview
Loading…
Cancel
Save