Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 08:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

less padding, closes #5811

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-07-09 16:08:03 -04:00
parent 2b3a88365c
commit e9360347ea
3 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/less/admin/manage/categories.less
View File

@@ -12,8 +12,6 @@ div.categories {
.row { .row {
margin-left: -15px; margin-left: -15px;
margin-right: -15px; margin-right: -15px;
padding-bottom: 12px;
margin-bottom: 12px;
} }
> li li:last-child { > li li:last-child {
@@ -37,7 +35,6 @@ div.categories {
li { li {
min-height: @acp-line-height; min-height: @acp-line-height;
margin: @acp-base-line 0; margin: @acp-base-line 0;
margin-top: 28px;
&.placeholder { &.placeholder {
border: 1px dashed #2196F3; border: 1px dashed #2196F3;
@@ -56,21 +53,40 @@ div.categories {
} }
} }
.icon { .toggle {
width: @acp-line-height; width: 24px;
height: @acp-line-height; height: 24px;
border-radius: 50%; border-radius: 50%;
line-height: @acp-line-height; line-height: 24px;
text-align: center; text-align: center;
vertical-align: bottom; vertical-align: bottom;
background-size: cover; background-size: cover;
float: left; float: left;
margin-right: @acp-margin; margin-right: 0px;
cursor: pointer;
.fa {
font-size: 85%;
}
}
.icon {
width: 24px;
height: 24px;
border-radius: 50%;
line-height: 24px;
text-align: center;
vertical-align: bottom;
background-size: cover;
float: left;
margin-right: 0px;
cursor: move; cursor: move;
.fa {
font-size: 85%;
}
} }
.information { .information {
padding-left: 70px; padding-left: 60px;
} }
.category-header { .category-header {

6
public/src/admin/manage/categories.js
View File

@@ -31,6 +31,12 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
Categories.toggle([cid].concat(children), !disabled); Categories.toggle([cid].concat(children), !disabled);
return false; return false;
}); });
$('.categories').on('click', '.toggle', function () {
var el = $(this);
el.find('i').toggleClass('fa-minus').toggleClass('fa-plus');
el.closest('[data-cid]').find('> ul[data-cid]').toggleClass('hidden');
});
}; };
Categories.throwCreateModal = function () { Categories.throwCreateModal = function () {

10
src/views/admin/partials/categories/category-rows.tpl
View File

@@ -4,6 +4,9 @@
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-9">
<div class="clearfix"> <div class="clearfix">
<div class="toggle">
<i class="fa fa-minus"></i>
</div>
<div class="icon" style=" <div class="icon" style="
color: {categories.color}; color: {categories.color};
background-color: {categories.bgColor}; background-color: {categories.bgColor};
@@ -15,24 +18,23 @@
</div> </div>
<div class="information"> <div class="information">
<h5 class="category-header">{categories.name}</h5> <h5 class="category-header">{categories.name}</h5>
<p class="description">{categories.descriptionParsed}</p>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="clearfix pull-right text-right"> <div class="clearfix pull-right text-right">
<div class="btn-group"> <div class="btn-group">
<button data-cid="{categories.cid}" data-action="toggle" data-disabled="{categories.disabled}" class="btn <!-- IF categories.disabled -->btn-primary<!-- ELSE -->btn-danger<!-- ENDIF categories.disabled -->"> <button data-cid="{categories.cid}" data-action="toggle" data-disabled="{categories.disabled}" class="btn btn-sm <!-- IF categories.disabled -->btn-primary<!-- ELSE -->btn-danger<!-- ENDIF categories.disabled -->">
<!-- IF categories.disabled --> <!-- IF categories.disabled -->
[[admin/manage/categories:enable]] [[admin/manage/categories:enable]]
<!-- ELSE --> <!-- ELSE -->
[[admin/manage/categories:disable]] [[admin/manage/categories:disable]]
<!-- ENDIF categories.disabled --> <!-- ENDIF categories.disabled -->
</button> </button>
<a href="./categories/{categories.cid}/analytics" class="btn btn-default"> <a href="./categories/{categories.cid}/analytics" class="btn btn-default btn-sm">
<i class="fa fa-line-chart"></i> <i class="fa fa-line-chart"></i>
</a> </a>
<a href="./categories/{categories.cid}" class="btn btn-default"> <a href="./categories/{categories.cid}" class="btn btn-default btn-sm">
[[admin/manage/categories:edit]] [[admin/manage/categories:edit]]
</a> </a>
</div> </div>