Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 05:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made comments section more subtle

Browse Source 
Also removed spacing from within details above active restrictions
This commit is contained in:
Dan Brown 2018-05-27 20:20:13 +01:00
parent 64eabaf882
commit 173eaf1c98
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/assets/sass/_components.scss
View File

@ -586,6 +586,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
} }
.comment-box { .comment-box {
clear: left;
border: 1px solid #DDD; border: 1px solid #DDD;
margin-bottom: $-s; margin-bottom: $-s;
border-radius: 3px; border-radius: 3px;

9
resources/assets/sass/_lists.scss
View File

@ -445,13 +445,4 @@ ul.pagination {
font-size: .8em; font-size: .8em;
margin: 0; margin: 0;
} }
}
.card.entity-details {
.active-restriction {
margin-top: $-xs;
}
.active-restriction + .active-restriction {
margin-top: 0;
}
} }

13
resources/assets/sass/_pages.scss
View File

@ -35,6 +35,7 @@
} }
.page-content { .page-content {
width: 100%;
max-width: 840px; max-width: 840px;
margin: 0 auto; margin: 0 auto;
margin-top: $-xxl; margin-top: $-xxl;
@ -315,6 +316,18 @@
} }
} }
.comments-container {
width: 100%;
border-top: 1px solid #DDD;
margin-top: $-xl;
margin-bottom: $-m;
h5 {
color: #888;
font-weight: normal;
margin-top: 0.5em;
}
}
.comment-editor .CodeMirror, .comment-editor .CodeMirror-scroll { .comment-editor .CodeMirror, .comment-editor .CodeMirror-scroll {
min-height: 175px; min-height: 175px;
} }

5
resources/views/comments/comments.blade.php
View File

@ -1,5 +1,5 @@
<div page-comments page-id="{{ $page->id }}" ng-non-bindable class="comments-list"> <div page-comments page-id="{{ $page->id }}" ng-non-bindable class="comments-list">
<h3 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h3> <h5 comments-title class="float left">{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
<div class="comment-container" comment-container> <div class="comment-container" comment-container>
@foreach($page->comments as $comment) @foreach($page->comments as $comment)
@ -7,7 +7,6 @@
@endforeach @endforeach
</div> </div>
@if(userCan('comment-create-all')) @if(userCan('comment-create-all'))
<div class="comment-box" comment-box style="display:none;"> <div class="comment-box" comment-box style="display:none;">
@ -33,7 +32,7 @@
</div> </div>
<div class="form-group" comment-add-button> <div class="form-group" comment-add-button>
<button type="button" action="addComment" class="button outline">{{ trans('entities.comment_add') }}</button> <button type="button" action="addComment" class="button outline float right">{{ trans('entities.comment_add') }}</button>
</div> </div>
@endif @endif

9
resources/views/pages/show.blade.php
View File

@ -117,8 +117,11 @@
@stop @stop
@section('body-wrap-classes', 'flex-fill columns')
@section('body') @section('body')
<div class="page-content" page-display="{{ $page->id }}">
<div class="page-content flex" page-display="{{ $page->id }}">
<div class="pointer-container" id="pointer"> <div class="pointer-container" id="pointer">
<div class="pointer anim" > <div class="pointer anim" >
@ -129,10 +132,10 @@
</div> </div>
@include('pages/page-display') @include('pages/page-display')
</div> </div>
@if ($commentsEnabled) @if ($commentsEnabled)
<div class="container small nopad"> <div class="container small nopad comments-container">
@include('comments/comments', ['page' => $page]) @include('comments/comments', ['page' => $page])
</div> </div>
@endif @endif

2
resources/views/sidebar-layout.blade.php
View File

@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="content flex"> <div class="content flex @yield('body-wrap-classes')">
@yield('body') @yield('body')
</div> </div>
</div> </div>