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

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	less/groups.less
main
Julian Lam 9 years ago
parent 4b27cf95ae 32ce901cff
commit f39c7d039c
16 changed files with 327 additions and 186 deletions
Show Stats Download Patch File Download Diff File

110
less/account.less
Unescape Escape View File

@ -1,9 +1,115 @@
// TODO: Needs to be cleaned up - do not child theme or you will lose your work.
.account {
.cover {
background-size: cover;
background-repeat: no-repeat;
min-height: 200px;
position: relative;
margin-bottom: 1em;
background-origin: content-box;
width: 100%;
top: 50px;
position: absolute;
left: auto;
right: 0px;
&:hover {
.controls {
.opacity(0.8);
}
}
.controls {
text-align: center;
min-height: 200px;
line-height: 200px;
.opacity(0);
.transition(opacity .15s linear);
cursor: pointer;
pointer-events: none;
> * {
pointer-events: all;
}
.fa {
color: white;
background-color: #333;
opacity: 1;
margin: 15px;
padding: 5px;
}
}
&.active {
&:hover {
cursor: move;
}
.controls {
> * {
display: none;
}
}
.save {
display: inline-block;
}
}
&.saving {
.save {
display: none;
}
.indicator {
display: inline-block;
}
}
.save, .indicator {
display: inline-block;
position: absolute;
top: 1em;
right: 2em;
opacity: 1;
background-color: @brand-primary;
color: #eee;
padding: 0.5em;
font-weight: bold;
&:hover {
cursor: pointer;
}
}
.save {
display: none;
}
.indicator {
display: none;
}
}
@media (min-width: @screen-md-min) {
margin-top: 300px;
.cover {
min-height: 300px;
.controls {
min-height: 300px;
line-height: 300px;
}
}
}
}
//
.nav-pills.account-sub-links {
border:none;

168
less/groups.less
Unescape Escape View File

@ -1,41 +1,5 @@
[component="groups/container"] {
[component="groups/summary"] {
.panel-body {
min-height: 72px;
}
.list-cover {
background-size: cover;
min-height: 125px;
background-position: 50% 50%;
.pointer;
h3 {
background-color: rgba(0,0,0,0.5);
display: inline-block;
padding: 0.25em 0.5em;
color: white;
font-weight: bold;
}
}
.members {
padding-left: 0;
> li {
list-style-type: none;
display: inline-block;
img, .user-icon {
.user-icon-style();
}
}
.truncated {
vertical-align: bottom;
}
}
}
.groups.details {
margin-top: 200px;
[component="groups/cover"] {
background-size: cover;
@ -43,19 +7,38 @@
min-height: 200px;
position: relative;
margin-bottom: 1em;
@media (min-width: @screen-md-min) {
min-height: 250px;
background-origin: content-box;
width: 100%;
top: 50px;
position: absolute;
left: auto;
right: 0px;
&:hover {
.controls {
.opacity(0.8);
}
}
.change {
visibility: hidden;
}
.controls {
text-align: center;
min-height: 200px;
line-height: 200px;
.opacity(0);
.transition(opacity .15s linear);
cursor: pointer;
pointer-events: none;
&.initialised:hover {
.change {
.opacity(1);
visibility: visible;
> * {
pointer-events: all;
}
.fa {
color: white;
background-color: #333;
opacity: 1;
margin: 15px;
padding: 5px;
}
}
@ -64,12 +47,10 @@
cursor: move;
}
.instructions {
.opacity(1);
}
.change {
display: none;
.controls {
> * {
display: none;
}
}
.save {
@ -87,15 +68,15 @@
}
}
.change, .save, .indicator {
.save, .indicator {
display: inline-block;
position: absolute;
top: 1em;
right: 1em;
background: rgba(0, 0, 0, 0.2);
right: 2em;
opacity: 1;
background-color: @brand-primary;
color: #eee;
padding: 0.5em;
border-radius: 5px;
font-weight: bold;
&:hover {
@ -103,11 +84,6 @@
}
}
.change {
.opacity(0);
.transition(opacity .15s linear);
}
.save {
display: none;
}
@ -115,20 +91,6 @@
.indicator {
display: none;
}
.instructions {
display: inline-block;
position: absolute;
right: 1em;
bottom: 1em;
background: rgba(0, 0, 0, 0.2);
color: #eee;
padding: 0.5em;
border-radius: 5px;
margin-top: 2em;
.opacity(0);
.transition(opacity .15s linear);
}
}
[component="groups/members"], [component="groups/pending"], [component="groups/invited"] {
@ -152,5 +114,57 @@
}
}
@media (min-width: @screen-md-min) {
margin-top: 300px;
[component="groups/cover"] {
min-height: 300px;
.controls {
min-height: 300px;
line-height: 300px;
}
}
}
}
.groups.list {
[component="groups/summary"] {
.panel-body {
min-height: 72px;
}
.list-cover {
background-size: cover;
min-height: 125px;
background-position: 50% 50%;
.pointer;
h3 {
background-color: rgba(0,0,0,0.5);
display: inline-block;
padding: 0.25em 0.5em;
color: white;
font-weight: bold;
text-transform: capitalize;
}
}
.members {
padding-left: 0;
> li {
list-style-type: none;
display: inline-block;
img, .user-icon {
.user-icon-style();
}
}
.truncated {
vertical-align: bottom;
}
}
}
}

2
package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
"version": "3.0.62",
"version": "3.0.68",
"nbbpm": {
"compatibility": "^0.8.2"
},

5
templates/account/edit.tpl
Unescape Escape View File

@ -1,7 +1,6 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div class="row">
<div class="col-md-2 col-sm-4">
<div class="account-picture-block text-center">

26
templates/account/favourites.tpl
Unescape Escape View File

@ -1,18 +1,20 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div class="favourites">
<div class="favourites">
<!-- IF !posts.length -->
<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
<!-- ENDIF !posts.length -->
<!-- IF !posts.length -->
<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
<!-- ENDIF !posts.length -->
<div class="row">
<div class="col-xs-12">
<!-- IMPORT partials/posts_list.tpl -->
<div class="row">
<div class="col-xs-12">
<!-- IMPORT partials/posts_list.tpl -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
</div>
</div>
</div>
</div>

21
templates/account/followers.tpl
Unescape Escape View File

@ -1,14 +1,15 @@
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<!-- IMPORT partials/account_menu.tpl -->
<div class="users">
<div class="users account">
<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
<!-- IMPORT partials/users_list.tpl -->
</ul>
<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
<!-- IMPORT partials/users_list.tpl -->
</ul>
<!-- IF !users.length -->
<div class="alert alert-warning">[[user:has_no_follower]]</div>
<!-- ENDIF !users.length -->
</div>
<!-- IF !users.length -->
<div class="alert alert-warning">[[user:has_no_follower]]</div>
<!-- ENDIF !users.length -->
</div>
</div>

26
templates/account/following.tpl
Unescape Escape View File

@ -1,13 +1,13 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="users account">
<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
<!-- IMPORT partials/users_list.tpl -->
</ul>
<!-- IF !users.length -->
<div class="alert alert-warning">[[user:follows_no_one]]</div>
<!-- ENDIF !users.length -->
</div>
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div class="users">
<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
<!-- IMPORT partials/users_list.tpl -->
</ul>
<!-- IF !users.length -->
<div class="alert alert-warning">[[user:follows_no_one]]</div>
<!-- ENDIF !users.length -->
</div>
</div>

21
templates/account/groups.tpl
Unescape Escape View File

@ -1,10 +1,13 @@
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<!-- IMPORT partials/account_menu.tpl -->
<div component="groups/container" id="groups-list" class="groups row">
<!-- IF !groups.length -->
<div class="alert alert-warning">[[groups:no_groups_found]]</div>
<!-- ELSE -->
<!-- IMPORT partials/groups/list.tpl -->
<!-- ENDIF !groups.length -->
</div>
<div class="groups list">
<div component="groups/container" id="groups-list" class="row">
<!-- IF !groups.length -->
<div class="alert alert-warning">[[groups:no_groups_found]]</div>
<!-- ELSE -->
<!-- IMPORT partials/groups/list.tpl -->
<!-- ENDIF !groups.length -->
</div>
</div>
</div>

27
templates/account/posts.tpl
Unescape Escape View File

@ -1,19 +1,20 @@
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<!-- IMPORT partials/account_menu.tpl -->
<div class="favourites">
<div class="favourites">
<!-- IF !posts.length -->
<div class="alert alert-warning">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length -->
<!-- IF !posts.length -->
<div class="alert alert-warning">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length -->
<div class="row">
<div class="col-xs-12">
<!-- IMPORT partials/posts_list.tpl -->
<div class="row">
<div class="col-xs-12">
<!-- IMPORT partials/posts_list.tpl -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
</div>
</div>
</div>
</div>

3
templates/account/profile.tpl
Unescape Escape View File

@ -1,6 +1,5 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div class="row">
<div class="col-md-5 account-block">

4
templates/account/settings.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div class="row">
<div class="col-xs-12">
<!-- IF !disableCustomUserSkins -->

4
templates/account/topics.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div>
<!-- IF !topics.length -->
<div class="alert alert-warning">[[user:has_no_topics]]</div>
<!-- ENDIF !topics.length -->

6
templates/account/watched.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<!-- IMPORT partials/account_menu.tpl -->
<div class="account">
<!-- IMPORT partials/account_menu.tpl -->
<div>
<!-- IF !topics.length -->
<div class="alert alert-warning">[[user:has_no_watched_topics]]</div>
<!-- ENDIF !topics.length -->
@ -11,4 +11,4 @@
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
</div>
</div>

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

@ -1,12 +1,17 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div component="groups/container" class="details row">
<div class="col-xs-12" component="groups/cover" style="background-origin: content-box; background-image: url({group.cover:url}); background-position: {group.cover:position};">
<div class="change">[[groups:cover-change]] <i class="fa fa-fw fa-pencil-square-o"></i></div>
<div component="groups/container" class="groups details row">
<div component="groups/cover" style="background-image: url({group.cover:url}); background-position: {group.cover:position};">
<div class="controls">
<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
<span class="resize"><i class="fa fa-fw fa-4x fa-arrows-alt"></i></span>
</div>
<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
<div class="instructions">[[groups:cover-instructions]]</div>
</div>
<div class="col-xs-12">
<!-- IMPORT partials/breadcrumbs.tpl -->
</div>
<div class="col-lg-6 col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">

64
templates/groups/list.tpl
Unescape Escape View File

@ -1,40 +1,42 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div class="groups list">
<!-- IMPORT partials/breadcrumbs.tpl -->
<div class="row">
<div class="col-lg-4">
<!-- IF allowGroupCreation -->
<button class="btn btn-primary" data-action="new"><i class="fa fa-plus"></i> [[groups:new_group]]</button>
<!-- ENDIF allowGroupCreation -->
</div>
<div class="col-lg-8">
<div class="row">
<div class="col-xs-3 text-left pull-right">
<select class="form-control" id="search-sort">
<option value="alpha">[[groups:details.group_name]]</option>
<option value="count">[[groups:details.member_count]]</option>
<option value="date">[[groups:details.creation_date]]</option>
</select>
</div>
<div class="col-xs-5 text-left pull-right">
<div class="input-group">
<input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="" id="search-text">
<span id="search-button" class="input-group-addon search-button"><i class="fa fa-search"></i></span>
<div class="row">
<div class="col-lg-4">
<!-- IF allowGroupCreation -->
<button class="btn btn-primary" data-action="new"><i class="fa fa-plus"></i> [[groups:new_group]]</button>
<!-- ENDIF allowGroupCreation -->
</div>
<div class="col-lg-8">
<div class="row">
<div class="col-xs-3 text-left pull-right">
<select class="form-control" id="search-sort">
<option value="alpha">[[groups:details.group_name]]</option>
<option value="count">[[groups:details.member_count]]</option>
<option value="date">[[groups:details.creation_date]]</option>
</select>
</div>
<div class="col-xs-5 text-left pull-right">
<div class="input-group">
<input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="" id="search-text">
<span id="search-button" class="input-group-addon search-button"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>
</div>
</div>
<hr />
<hr />
<div component="groups/container" class="row" id="groups-list" data-nextstart={nextStart}>
<!-- IF groups.length -->
<!-- IMPORT partials/groups/list.tpl -->
<!-- ELSE -->
<div class="col-xs-12">
<div class="alert alert-warning">
[[groups:no_groups_found]]
<div component="groups/container" class="row" id="groups-list" data-nextstart={nextStart}>
<!-- IF groups.length -->
<!-- IMPORT partials/groups/list.tpl -->
<!-- ELSE -->
<div class="col-xs-12">
<div class="alert alert-warning">
[[groups:no_groups_found]]
</div>
</div>
<!-- ENDIF groups.length -->
</div>
<!-- ENDIF groups.length -->
</div>
</div>

9
templates/partials/account_menu.tpl
Unescape Escape View File

@ -33,4 +33,13 @@
<li><a href="{config.relative_path}/user/{userslug}/edit"><i class="fa fa-pencil-square-o"></i> [[user:edit]]</a></li>
<!-- ENDIF showHidden -->
</ul>
</div>
<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
<div class="controls">
<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
<span class="resize"><i class="fa fa-fw fa-4x fa-arrows-alt"></i></span>
</div>
<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
</div>
Write Preview
Loading…
Cancel
Save