Skip to content

Commit

Permalink
更新:优化页面整体布局
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhuchunshu
zhuchunshu committed Dec 20, 2022
1 parent 9fa1520 commit 81a039a
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 44 deletions.
4 changes: 2 additions & 2 deletions app/Plugins/Comment/resources/views/topic/edit.blade.php
View file
Expand Up @@ -19,7 +19,7 @@
<div class="mb-3">
<div class="row">
@if(get_options("comment_emoji_close",'false')!=="true" && count((new \App\Plugins\Core\src\Lib\Emoji())->get()))
<div class="col-md-3">
<div class="col-lg-3">
<div class="card">
<ul class="nav nav-tabs" data-bs-toggle="tabs" style="flex-wrap: inherit;
width: 100%;
Expand Down Expand Up @@ -62,7 +62,7 @@ class="col-3 col-sm-2 col-md-4 col-lg-3 hvr-glow emoji-picker"
</div>
</div>
</div>
<div class="col-md-9">
<div class="col-lg-9">
<div id="vditor"></div>
</div>
@else
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/Search/resources/views/data.blade.php
View file
Expand Up @@ -8,7 +8,7 @@
<div class="row row-cards justify-content-center">
<div class="col-md-12">
<div class="row row-cards justify-content-center">
<div class="col-md-9">
<div class="col-lg-9">
<div class="row row-cards justify-content-center">
@if($page->count())
@foreach($page as $data)
Expand Down Expand Up @@ -65,7 +65,7 @@ class="card-title text-reset">{{$data->user->username}}</a>
{!! make_page($page) !!}
</div>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="row row-cards rd">
<div class="col-md-12 sticky" style="top: 105px">
@include('App::index.right')
Expand Down
9 changes: 2 additions & 7 deletions app/Plugins/Topic/bootstrap.php
View file
Expand Up @@ -105,13 +105,10 @@

// topic create - editor plugins

Itf()->add('topic-create-editor-plugins', 0, ['importcss', 'searchreplace', 'autolink', 'autosave', 'directionality', 'code', 'visualblocks', 'visualchars', 'image', 'link', 'media', 'codesample', 'table', 'charmap', 'pagebreak', 'nonbreaking', 'insertdatetime', 'advlist', 'lists', 'wordcount', 'charmap', 'quickbars']);
Itf()->add('topic-create-editor-plugins', 0, ['importcss', 'searchreplace', 'autolink', 'autosave', 'directionality', 'code', 'visualblocks', 'visualchars', 'image', 'link', 'media', 'codesample', 'table', 'charmap', 'pagebreak', 'nonbreaking', 'advlist', 'lists', 'wordcount', 'charmap', 'quickbars']);

Itf()->add('topic-create-editor-toolbar', 0, ['undo', 'redo', 'restoredraft', '|', 'bold', 'italic', 'underline', 'strikethrough', '|', 'fontfamily', 'fontsize', 'blocks', '|', 'alignleft', 'aligncenter', 'alignright', 'alignjustify', 'outdent', 'indent', 'numlist', 'bullist', '|', 'forecolor', 'backcolor', 'removeformat', '|', 'insertfile', 'image', 'media', 'link', 'sfPreview', 'codesample', '|', 'ltr', 'rtl']);
Itf()->add('topic-create-editor-toolbar', 0, ['undo', 'redo', '|','blocks', '|', 'bold', 'italic', 'underline', 'strikethrough', '|', 'alignleft', 'aligncenter', 'alignright', 'alignjustify', 'outdent', 'indent', 'numlist', 'bullist', '|', 'forecolor', 'backcolor', 'removeformat', 'insertfile', 'image', 'media', 'link', 'sfPreview', 'codesample', '|', 'ltr', 'rtl']);

Itf()->add('topic-create-editor-toolbar', 1, [
'basicDateButton',
]);

Itf()->add('topic-create-editor-menu', 0, [
'file' => [
Expand Down Expand Up @@ -181,8 +178,6 @@
'nonbreaking',
'anchor',
'tableofcontents',
'|',
'insertdatetime',
],
],
'format' => [
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/Topic/resources/views/KeyWords/data.blade.php
View file
Expand Up @@ -8,10 +8,10 @@
<div class="row row-cards justify-content-center">
<div class="col-md-12">
<div class="row row-cards justify-content-center">
<div class="col-md-9">
<div class="col-lg-9">
@include('Topic::KeyWords.data.index')
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="row row-cards rd">
<div class="col-md-12 sticky" style="top: 105px">
@include('Topic::KeyWords.data.right')
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/Topic/resources/views/Tags/data.blade.php
View file
Expand Up @@ -8,10 +8,10 @@
<div class="row row-cards justify-content-center">
<div class="col-md-12">
<div class="row row-cards justify-content-center">
<div class="col-md-9">
<div class="col-lg-9">
@include('Topic::Tags.data.index')
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="row row-cards rd">
<div class="col-md-12 sticky" style="top: 105px">
@include('Topic::Tags.data.right')
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/Topic/resources/views/create/vditor.blade.php
View file
Expand Up @@ -20,7 +20,7 @@ class="form-select form-select-lg form-control-flush">
<div class="mb-3">
<div class="row">
@if(get_options("topic_emoji_close",'false')!=="true" && count((new \App\Plugins\Core\src\Lib\Emoji())->get()))
<div class="col-md-3">
<div class="col-lg-3">
<div class="card">
<ul class="nav nav-tabs" data-bs-toggle="tabs" style="flex-wrap: inherit;
width: 100%;
Expand Down Expand Up @@ -63,7 +63,7 @@ class="col-3 col-sm-2 col-md-4 col-lg-3 hvr-glow emoji-picker"
</div>
</div>
</div>
<div class="col-md-9">
<div class="col-lg-9">
<div id="content-vditor"></div>
</div>
@else
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/Topic/resources/views/edit.blade.php
View file
Expand Up @@ -46,7 +46,7 @@ class="form-select form-select-lg form-control-flush">
<div class="mb-3">
<div class="row">
@if(get_options("topic_emoji_close",'false')!=="true" && count((new \App\Plugins\Core\src\Lib\Emoji())->get()))
<div class="col-md-3">
<div class="col-lg-3">
<div class="card">
<ul class="nav nav-tabs" data-bs-toggle="tabs" style="flex-wrap: inherit;
width: 100%;
Expand Down Expand Up @@ -83,7 +83,7 @@ class="form-select form-select-lg form-control-flush">
</div>
</div>
</div>
<div class="col-md-9">
<div class="col-lg-9">
<div id="content-vditor"></div>
</div>
@else
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/User/resources/views/data.blade.php
View file
Expand Up @@ -69,7 +69,7 @@ class="card-cover card-cover-blurred"
</div>
</div>

<div class="col-md-3">
<div class="col-lg-3">
<div class="border-0 card">
<div class="card-body">
<ul class="nav nav-pills nav-vertical">
Expand Down Expand Up @@ -131,7 +131,7 @@ class="icon icon-tabler icon-tabler-chevron-right" width="24"
</div>
</div>

<div class="col-md-9">
<div class="col-lg-9">
@php $view=null; @endphp
@foreach(Itf()->get('users_home_menu') as $key => $value)
@if($key === request()->input('m',key(Itf()->get('users_home_menu'))))
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/User/resources/views/notice/pm.blade.php
View file
Expand Up @@ -16,7 +16,7 @@
@endphp
<div class="border-0 card card-body" id="user-pm-container">
<div class="row row-cards justify-content-center">
<div class="col-md-3">
<div class="col-lg-3">
<div class="border-0 card">
<div class="card-header">
<h3 class="card-title">联系人</h3>
Expand Down Expand Up @@ -44,7 +44,7 @@
</div>
</div>
</div>
<div class="col-md-9">
<div class="col-lg-9">
<div class="border-0 card">
<div class="card-header">
<h3 class="card-title">私信</h3>
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/User/resources/views/pm/index.blade.php
View file
Expand Up @@ -6,7 +6,7 @@

<div class="border-0 card card-body" id="user-pm-container">
<div class="row row-cards justify-content-center">
<div class="col-md-3">
<div class="col-lg-3">
<div class="border-0 card">
<div class="card-header">
<h3 class="card-title">联系人</h3>
Expand Down Expand Up @@ -37,7 +37,7 @@ class="text-body d-block">{{$contact->username}}</a>
</div>
</div>
</div>
<div class="col-md-9">
<div class="col-lg-9">
<div class="border-0 card">
<div class="card-header">
<h3 class="card-title"><a href="/users/{{$user->username}}.html" class="avatar avatar-sm"
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/User/resources/views/setting/admin/pm.blade.php
View file
@@ -1,14 +1,14 @@
<div class="card card-body">
<div class="row">
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.user.pm.msg maxlength")}}
</label>
<input type="number" v-model="data.pm_msg_maxlength" class="form-control">
<small>{{__("admin.current",['current' => get_options('pm_msg_maxlength',300)])}}</small>
</div>

<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.user.pm.msg reserve")}}
</label>
Expand Down
18 changes: 9 additions & 9 deletions app/Plugins/User/resources/views/setting/admin/wealth.blade.php
View file
@@ -1,36 +1,36 @@
<div class="card card-body">
<div class="row">
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.money name")}}
</label>
<input type="text" v-model="data.wealth_money_name" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_money_name','余额')])}}</small>
</div>

<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.money unit name",['name' => get_options('wealth_money_name','余额')])}}
</label>
<input type="text" v-model="data.wealth_money_unit_name" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_money_unit_name','元')])}}</small>
</div>

<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.credit name")}}
</label>
<input type="text" v-model="data.wealth_credit_name" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_credit_name','积分')])}}</small>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.golds name")}}
</label>
<input type="text" v-model="data.wealth_golds_name" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_golds_name','金币')])}}</small>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.exp name")}}
</label>
Expand All @@ -53,28 +53,28 @@
<a class="btn-close btn-close-white" data-bs-dismiss="alert" aria-label="close"></a>
</div>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.how many",['number' => 1,'first' => get_options('wealth_money_name','余额'),'last' => get_options('wealth_golds_name','金币')])}}
</label>
<input type="text" v-model="data.wealth_how_many_money_to_golds" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_how_many_money_to_golds','1')])}}</small>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.how many",['number' => 1,'first' => get_options('wealth_money_name','余额'),'last' => get_options('wealth_credit_name','积分')])}}
</label>
<input type="text" v-model="data.wealth_how_many_money_to_credit" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_how_many_money_to_credit',get_options('wealth_how_many_money_to_golds','1')*get_options('wealth_how_many_golds_to_credit',10))])}}</small>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<label for="" class="form-label">
{{__("admin.wealth.how many",['number' => 1,'first' => get_options('wealth_golds_name','金币'),'last' => get_options('wealth_credit_name','积分')])}}
</label>
<input type="text" v-model="data.wealth_how_many_golds_to_credit" class="form-control">
<small>{{__("admin.current",['current' => get_options('wealth_how_many_golds_to_credit',10)])}}</small>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<label class="form-check form-switch">
<input class="form-check-input" type="checkbox" v-model="data.wealth_close_redemption_money_to_golds">
<span class="form-check-label">{{__("admin.wealth.close redemption",['first' => get_options('wealth_money_name','余额'),'last' => get_options('wealth_golds_name','金币')])}}</span>
Expand Down
4 changes: 2 additions & 2 deletions app/Plugins/User/resources/views/topic.blade.php
View file
Expand Up @@ -8,7 +8,7 @@
<div class="row row-cards justify-content-center">
<div class="col-md-12">
<div class="row row-cards justify-content-center">
<div class="col-md-9">
<div class="col-lg-9">
<div class="row row-cards justify-content-center">
@if($page->count())
@foreach($page as $data)
Expand Down Expand Up @@ -104,7 +104,7 @@ class="ms-3 text-muted cursor-pointer" data-bs-toggle="tooltip"
{!! make_page($page) !!}
</div>
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="row row-cards rd">
<div class="col-md-12 sticky" style="top: 105px">
<div class="row row-cards">
Expand Down
4 changes: 2 additions & 2 deletions app/Themes/CodeFec/resources/views/index.blade.php
View file
Expand Up @@ -15,15 +15,15 @@
@endif
@endforeach
<div class="row row-cards justify-content-center">
<div class="col-md-9">
<div class="col-lg-9">
@foreach(Itf()->get('ui-index-content-hook') as $k=>$v)
@if(call_user_func($v['enable'])===true)
@include($v['view'])
@endif
@endforeach
@include('App::index.index')
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="row row-cards rd">
<div class="col-md-12 sticky" style="top: 105px">
@include('App::index.right')
Expand Down
4 changes: 2 additions & 2 deletions app/Themes/CodeFec/resources/views/topic/show/show.blade.php
View file
Expand Up @@ -9,7 +9,7 @@
<div class="row row-cards justify-content-center">
<div class="col-md-12">
<div class="row row-cards justify-content-center">
<div class="col-md-9">
<div class="col-lg-9">
@foreach(Itf()->get('ui-topic-content-start-hook') as $k=>$v)
@if(call_user_func($v['enable'])===true)
@include($v['view'])
Expand All @@ -22,7 +22,7 @@
@endif
@endforeach
</div>
<div class="col-md-3">
<div class="col-lg-3">
<div class="row row-cards rd">
<div class="col-md-12 sticky" style="top: 105px">
@include('App::topic.show.show-right')
Expand Down
4 changes: 2 additions & 2 deletions resources/views/admin/panel/Releases.blade.php
View file
Expand Up @@ -9,7 +9,7 @@
<div class="row row-cards">

{{-- 版本信息--}}
<div class="col-md-9">
<div class="col-lg-9">
<div class="border-0 card">
<div class="card-body">
<h3 class="card-title">版本信息</h3>
Expand All @@ -27,7 +27,7 @@
</div>
</div>
{{-- 作者信息--}}
<div class="col-md-3" v-if="author">
<div class="col-lg-3" v-if="author">
<div class="border-0 card">
<div class="card-body text-center">
<div class="mb-3">
Expand Down

0 comments on commit 81a039a

Please sign in to comment.