From 5f30afa2a106523eb7e68c1a0a0c2ddc3698fb32 Mon Sep 17 00:00:00 2001 From: Visman Date: Sat, 8 Sep 2018 19:44:40 +0700 Subject: [PATCH] Fix style for inline buttons --- app/Models/Pages/Admin/Categories.php | 2 +- app/Models/Pages/Admin/Forums.php | 2 +- app/Models/Pages/Admin/Groups.php | 2 +- app/templates/post.forkbb.php | 2 +- app/templates/topic.forkbb.php | 2 +- public/style/ForkBB/style.css | 19 ++++++++++++++++++- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/Models/Pages/Admin/Categories.php b/app/Models/Pages/Admin/Categories.php index c4be0b16..1343310e 100644 --- a/app/Models/Pages/Admin/Categories.php +++ b/app/Models/Pages/Admin/Categories.php @@ -212,7 +212,7 @@ class Categories extends Admin $this->aCrumbs[] = [$this->c->Router->link('AdminCategoriesDelete', ['id' => $args['id']]), \ForkBB\__('Delete category head')]; $this->aCrumbs[] = \ForkBB\__('"%s"', $category['cat_name']); $this->form = $form; - $this->classForm = ['deletecategory', 'btnsrow']; + $this->classForm = 'deletecategory'; $this->titleForm = \ForkBB\__('Delete category head'); return $this; diff --git a/app/Models/Pages/Admin/Forums.php b/app/Models/Pages/Admin/Forums.php index 52b792ed..6e88bb47 100644 --- a/app/Models/Pages/Admin/Forums.php +++ b/app/Models/Pages/Admin/Forums.php @@ -291,7 +291,7 @@ class Forums extends Admin $this->aCrumbs[] = [$this->c->Router->link('AdminForumsDelete', ['id' => $forum->id]), \ForkBB\__('Delete forum head')]; $this->aCrumbs[] = \ForkBB\__('"%s"', $forum->forum_name); $this->form = $form; - $this->classForm = ['deleteforum', 'btnsrow']; + $this->classForm = 'deleteforum'; $this->titleForm = \ForkBB\__('Delete forum head'); return $this; diff --git a/app/Models/Pages/Admin/Groups.php b/app/Models/Pages/Admin/Groups.php index 0190535a..0d902ead 100644 --- a/app/Models/Pages/Admin/Groups.php +++ b/app/Models/Pages/Admin/Groups.php @@ -727,7 +727,7 @@ class Groups extends Admin $this->aCrumbs[] = \ForkBB\__('"%s"', $group->g_title); $this->form = $form; $this->titleForm = \ForkBB\__('Group delete'); - $this->classForm = ['deletegroup', 'btnsrow']; + $this->classForm = 'deletegroup'; return $this; } diff --git a/app/templates/post.forkbb.php b/app/templates/post.forkbb.php index 9fd7786e..434a40a7 100644 --- a/app/templates/post.forkbb.php +++ b/app/templates/post.forkbb.php @@ -26,7 +26,7 @@ @endif @if ($form = $p->form) -
+

{!! $p->formTitle !!}

@include ('layouts/form') diff --git a/app/templates/topic.forkbb.php b/app/templates/topic.forkbb.php index 9d0d0a41..146ce259 100644 --- a/app/templates/topic.forkbb.php +++ b/app/templates/topic.forkbb.php @@ -147,7 +147,7 @@ @include ('layouts/stats') @endif @if ($form = $p->form) -
+

{!! __('Quick post') !!}

@include ('layouts/form') diff --git a/public/style/ForkBB/style.css b/public/style/ForkBB/style.css index 69ef405f..d1990a81 100644 --- a/public/style/ForkBB/style.css +++ b/public/style/ForkBB/style.css @@ -1650,7 +1650,7 @@ select { border: 0; } -.f-btnsrow-form .f-btns .f-btn { +.f-post-form .f-btn { width: auto; display: inline-block; } @@ -1674,6 +1674,11 @@ select { /*********************/ /* Админка/Категории */ /*********************/ +.f-deletecategory-form .f-btn { + width: auto; + display: inline-block; +} + .f-fs-category { display: flex; align-items: stretch; @@ -1726,6 +1731,11 @@ select { /*********************/ /* Админка/Разделы */ /*********************/ +.f-deleteforum-form .f-btn { + width: auto; + display: inline-block; +} + .f-fs-forum { display: flex; align-items: stretch; @@ -1873,6 +1883,13 @@ select { cursor: default; opacity: 0.5; } +/******************/ +/* Админка/Группы */ +/******************/ +.f-deletegroup-form .f-btn { + width: auto; + display: inline-block; +} /*********************/ /* Админка/Цензура */