Skip to content

Commit

Permalink
Поправил стили кода, медиа файлов, поправил отступы в bb кодах
Browse files Browse the repository at this point in the history
  • Loading branch information
@visavi
visavi committed Feb 8, 2020
1 parent 4a2fd31 commit 024f8bd
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 106 deletions.
8 changes: 5 additions & 3 deletions app/Classes/BBCode.php
View file
Expand Up @@ -39,7 +39,7 @@ class BBCode
],
'image' => [
'pattern' => '%\[img\]((\w+://|//|/)[^\s()<>\[\]]+\.(jpg|png|gif|jpeg))\[/img\]%s',
'replace' => '<img src="$1" class="media-file img-fluid" alt="image">',
'replace' => '<div class="media-file"><img src="$1" class="img-fluid" alt="image"></div>',
],
'bold' => [
'pattern' => '/\[b\](.+?)\[\/b\]/s',
Expand Down Expand Up @@ -148,8 +148,10 @@ public function parse(string $source): string
private function clearBreakLines(string $source): string
{
$tags = [
'</div><br>' => '</div>',
'</blockquote><br>' => '</blockquote>',
'</div><br>' => '</div>',
'</pre><br>' => '</pre>',
'</blockquote><br>' => '</blockquote>',
'pre-scrollable"><br>' => 'pre-scrollable">',
];

return strtr($source, $tags);
Expand Down
2 changes: 1 addition & 1 deletion app/helpers.php
View file
Expand Up @@ -1357,7 +1357,7 @@ function resizeProcess($path, array $params = [])
}

if (empty($params['class'])) {
$params['class'] = 'img-fluid';
$params['class'] = 'media-file img-fluid';
}

if (empty($params['width'])) {
Expand Down
71 changes: 44 additions & 27 deletions public/assets/css/app.css
View file
@@ -1,19 +1,28 @@
body {
background-color: #ccc;
}

.post {
background: #fff;
padding: 10px;
}

.post-form {
background: #fff;
}

.post-avatar {
width: 64px;
height: 64px;
float: left;
margin-right: 14px;
}

.post-media {
padding: 1.25rem;
margin-top: 1.25rem;
margin-bottom: 1.25rem;
border: 1px solid #eee;
border-radius: .25rem;
border-left: .25rem solid #d9534f;
}

.user-status {
width: 18px;
height: 18px;
Expand All @@ -29,6 +38,19 @@ body {
overflow: hidden;
}

.avatar-default {
height: 64px;
width: 64px;
text-align: center;
font-size: 42px;
}

.avatar-default a {
font-weight: bold;
text-decoration: none;
color: #fff;
}

@media (max-width: 768px) {
.post-avatar {
width: 48px;
Expand All @@ -42,6 +64,19 @@ body {
left: 32px;
bottom: 14px;
}

.avatar-default {
height: 48px;
width: 48px;
font-size: 32px;
}
}

.main-register {
background-image:url('/assets/img/mains/record.png');
background-position: 100% 85%;
background-size: auto 100%;
background-repeat:no-repeat;
}


Expand Down Expand Up @@ -80,19 +115,6 @@ body {
border: 1px solid #fff;
}
.avatar-default {
height: 64px;
width: 64px;
text-align: center;
font-size: 42px;
}
.avatar-default a {
font-weight: bold;
text-decoration: none;
color: #fff;
}
.post-form {
background: #fff;
}*/
Expand Down Expand Up @@ -164,7 +186,7 @@ textarea.form-control {
.blockquote {
padding: 8px 15px;
font-size: 95%;
background:#f2f1f6;
background:#f7f7f9;
border-left: 5px solid #ddd;
font-style:italic;
}
Expand Down Expand Up @@ -226,15 +248,6 @@ textarea.form-control {
border-radius: 4px;
}

.hiding {
padding: 10px;
margin: 10px 0;
border-radius: 3px;
border: 1px solid #eee;
border-left: 5px solid #d9534f;
background-color: #f8f8f8;
}

.post-rating-up.active {
color: #fff;
background-color: #78c062;
Expand All @@ -251,6 +264,7 @@ textarea.form-control {
border-radius: 3px;
}

/*
.progress {
position: relative;
max-width: 250px;
Expand Down Expand Up @@ -295,7 +309,9 @@ textarea.form-control {
color: #fff;
display: block;
}
*/

/*
.online {
width: 14px;
height: 14px;
Expand All @@ -310,6 +326,7 @@ textarea.form-control {
.pagination {
padding-top: 20px;
}
*/

.carousel-control-prev-icon,
.carousel-control-next-icon {
Expand Down
27 changes: 6 additions & 21 deletions public/assets/css/prettify.css
View file
Expand Up @@ -4,47 +4,32 @@
.prettyprint .fun { color: #dc322f; }
.prettyprint .str { color: #D14; }
.prettyprint .atv { color: #d44950; }
.prettyprint .kwd, .prettyprint { color: #0A8; }
.prettyprint .kwd { color: #0A8; }
.prettyprint .tag { color: #2f6f9f; }
.prettyprint .typ, .prettyprint .dec, .prettyprint .var { color: teal; }
.prettyprint .atn { color: #4f9fcf; }
.prettyprint .pln { color: #069; }

pre.prettyprint code {
.prettyprint {
padding: 0;
margin: 0;
border: none;
margin-bottom: 1rem;
display: block;
white-space: pre;
}

pre.prettyprint, code.prettyprint {
overflow: auto;
word-wrap: normal;
tab-size: 2;
display: block;
}

.prettyprint {
font-size: 87.5%;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
font-size: 100%;
border-radius: 4px;
margin-bottom: 0;
}

.prettyprint.linenums {
padding: 0;
}

/* Specify class=linenums on a pre to get line numbering */
.prettyprint ol.linenums {
margin: 0;
box-shadow: inset 35px 0 0 #fbfbfc, inset 36px 0 0 #ececf0;
padding: .5rem 3rem;
box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
}

.prettyprint ol.linenums li {
color: #bebec5;
line-height: 18px;
text-shadow: 0 1px 0 #fff;
}
8 changes: 6 additions & 2 deletions public/assets/js/app.js
View file
Expand Up @@ -158,7 +158,9 @@ function postReply(el)
var post = $(el).closest('.post');
var author = post.find('.post-author').data('login');

var separ = field.val().length ? '\n' : '';
var $lastSymbol = field.val().slice(field.val().length - 1);
var separ = $.inArray($lastSymbol, ['', '\n']) !== -1 ? '' : '\n';

field.focus().val(field.val() + separ + author + ', ');

return false;
Expand All @@ -176,7 +178,9 @@ function postQuote(el)
var text = post.find('.post-message').clone();
var message = text.find('blockquote').remove().end().text();

var separ = field.val().length ? '\n' : '';
var $lastSymbol = field.val().slice(field.val().length - 1);
var separ = $.inArray($lastSymbol, ['', '\n']) !== -1 ? '' : '\n';

field.focus().val(field.val() + separ + '[quote=' + author + ' ' + date + ']' + $.trim(message) + '[/quote]\n');

return false;
Expand Down
Binary file removed public/assets/js/markitup/images/handle.png
View file
Binary file not shown.
12 changes: 1 addition & 11 deletions public/assets/js/markitup/markitup.css
View file
Expand Up @@ -27,17 +27,7 @@
width:99.9%;
margin:5px 0;
}
.markItUpFooter {
width:100%;
}
.markItUpResizeHandle {
overflow:hidden;
width:22px; height:5px;
margin-left:auto;
margin-right:auto;
background-image:url(/assets/js/markitup/images/handle.png);
cursor:n-resize;
}

/***************************************************************************************/
/* first row of buttons */
.markItUpHeader ul li {
Expand Down
7 changes: 0 additions & 7 deletions public/themes/default/assets/css/custom.css
View file
@@ -1,10 +1,3 @@
.main-register {
background-image:url('/assets/img/mains/record.png');
background-position: 100% 85%;
background-size: auto 100%;
background-repeat:no-repeat;
}

.app-sidebar .sidebar-header {
background-image: url("/themes/default/assets/img/sidebar-header.svg");
background-repeat: no-repeat;
Expand Down
64 changes: 34 additions & 30 deletions resources/views/forums/topic.blade.php
View file
Expand Up @@ -108,48 +108,52 @@
@if ($posts->isNotEmpty())
@foreach ($posts as $data)
<?php $num = $posts->firstItem() + $loop->index; ?>
<div class="media post bg-white p-3 mb-2 shadow-sm" id="post_{{ $data->id }}">
<div class="img d-none d-sm-block">
<div class="post mb-3 shadow" id="post_{{ $data->id }}">
<div class="post-avatar">
{!! $data->user->getAvatar() !!}
{!! $data->user->getOnline() !!}
</div>
<div class="media-body">
<div class="float-right text-right">
@if (getUser())
@if (getUser('id') !== $data->user_id)
<a href="#" onclick="return postReply(this)" title="{{ __('main.reply') }}"><i class="fa fa-reply text-muted"></i></a>

<a href="#" onclick="return postQuote(this)" title="{{ __('main.quote') }}"><i class="fa fa-quote-right text-muted"></i></a>
<div class="post-menu float-right">
@if (getUser())
@if (getUser('id') !== $data->user_id)
<a href="#" onclick="return postReply(this)" title="{{ __('main.reply') }}"><i class="fa fa-reply text-muted"></i></a>

<a href="#" onclick="return sendComplaint(this)" data-type="{{ App\Models\Post::class }}" data-id="{{ $data->id }}" data-token="{{ $_SESSION['token'] }}" data-page="{{ $posts->currentPage() }}" rel="nofollow" title="{{ __('main.complain') }}"><i class="fa fa-bell text-muted"></i></a>
@endif
<a href="#" onclick="return postQuote(this)" title="{{ __('main.quote') }}"><i class="fa fa-quote-right text-muted"></i></a>

@if ($topic->isModer || (getUser('id') === $data->user_id && $data->created_at + 600 > SITETIME))
<a href="/posts/edit/{{ $data->id }}?page={{ $posts->currentPage() }}" title="{{ __('main.edit') }}"><i class="fa fa-pencil-alt text-muted"></i></a>
@if ($topic->isModer)
<input type="checkbox" name="del[]" value="{{ $data->id }}">
@endif
@endif
<a href="#" onclick="return sendComplaint(this)" data-type="{{ App\Models\Post::class }}" data-id="{{ $data->id }}" data-token="{{ $_SESSION['token'] }}" data-page="{{ $posts->currentPage() }}" rel="nofollow" title="{{ __('main.complain') }}"><i class="fa fa-bell text-muted"></i></a>
@endif

<div class="js-rating">
@if (getUser() && getUser('id') !== $data->user_id)
<a class="post-rating-down{{ $data->vote === '-' ? ' active' : '' }}" href="#" onclick="return changeRating(this);" data-id="{{ $data->id }}" data-type="{{ App\Models\Post::class }}" data-vote="-" data-token="{{ $_SESSION['token'] }}"><i class="fas fa-angle-down"></i></a>
@if ($topic->isModer || (getUser('id') === $data->user_id && $data->created_at + 600 > SITETIME))
<a href="/posts/edit/{{ $data->id }}?page={{ $posts->currentPage() }}" title="{{ __('main.edit') }}"><i class="fa fa-pencil-alt text-muted"></i></a>
@if ($topic->isModer)
<input type="checkbox" name="del[]" value="{{ $data->id }}">
@endif
<b><span>{!! formatNum($data->rating) !!}</span></b>
@if (getUser() && getUser('id') !== $data->user_id)
<a class="post-rating-up{{ $data->vote === '+' ? ' active' : '' }}" href="#" onclick="return changeRating(this);" data-id="{{ $data->id }}" data-type="{{ App\Models\Post::class }}" data-vote="+" data-token="{{ $_SESSION['token'] }}"><i class="fas fa-angle-up"></i></a>
@endif
</div>
@endif
@endif

<div class="js-rating text-right">
@if (getUser() && getUser('id') !== $data->user_id)
<a class="post-rating-down{{ $data->vote === '-' ? ' active' : '' }}" href="#" onclick="return changeRating(this);" data-id="{{ $data->id }}" data-type="{{ App\Models\Post::class }}" data-vote="-" data-token="{{ $_SESSION['token'] }}"><i class="fas fa-arrow-down"></i></a>
@endif
<b><span>{!! formatNum($data->rating) !!}</span></b>
@if (getUser() && getUser('id') !== $data->user_id)
<a class="post-rating-up{{ $data->vote === '+' ? ' active' : '' }}" href="#" onclick="return changeRating(this);" data-id="{{ $data->id }}" data-type="{{ App\Models\Post::class }}" data-vote="+" data-token="{{ $_SESSION['token'] }}"><i class="fas fa-arrow-up"></i></a>
@endif
</div>
</div>

{{ $num }}. <b>{!! $data->user->getProfile() !!}</b> <small class="text-muted font-italic">{{ dateFixed($data->created_at) }}</small><br>
<span class="font-italic">{!! $data->user->getStatus() !!}</span>
{{ $num }}. {!! $data->user->getProfile() !!}
<small class="post-date text-muted font-italic">{{ dateFixed($data->created_at) }}</small><br>
<small class="font-italic">{!! $data->user->getStatus() !!}</small>

<div class="message">{!! bbCode($data->text) !!}</div>
<div class="post-body border-top my-1 py-1">
<div class="post-message">
{!! bbCode($data->text) !!}
</div>

@if ($data->files->isNotEmpty())
<div class="hiding">
<div class="post-media">
<i class="fa fa-paperclip"></i> <b>{{ __('main.attached_files') }}:</b><br>
@foreach ($data->files as $file)
<?php $ext = getExtension($file->hash); ?>
Expand All @@ -168,7 +172,7 @@
@endif

@if (isAdmin())
<div class="small text-muted font-italic">{{ $data->brow }}, {{ $data->ip }}</div>
<div class="small text-muted font-italic mt-2">{{ $data->brow }}, {{ $data->ip }}</div>
@endif
</div>
</div>
Expand All @@ -188,7 +192,7 @@

@if (getUser())
@if (empty($topic->closed))
<div class="form">
<div class="post-form p-2 my-2 shadow">
<form action="/topics/create/{{ $topic->id }}" method="post" enctype="multipart/form-data">
@csrf
<div class="form-group{{ hasError('msg') }}">
Expand Down

0 comments on commit 024f8bd

Please sign in to comment.