From 4cf861832e0b1e017aa17a0b3fbf14d880a055e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Tue, 25 Jul 2023 10:24:13 +0800 Subject: [PATCH] revert 061aa26b5d63006fcc5e3abfe1a575abbcaeba4a revert * Add btn-link for button. --- module/pivot/css/preview.css | 7 +++---- module/pivot/view/show.html.php | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/module/pivot/css/preview.css b/module/pivot/css/preview.css index 84bcda58c7..de3947b554 100644 --- a/module/pivot/css/preview.css +++ b/module/pivot/css/preview.css @@ -21,13 +21,12 @@ .content-border {padding-top: 16px; padding-bottom: 16px; border-bottom: 1px solid #F1F5F9;} .flex-between {display:flex; justify-content: space-between;} .flex-start {display:flex; justify-content: flex-start;} -.flex-center {align-items: center;} .query-after {position: relative; padding-right: 24px;} .query-after::after {content: ""; position: absolute; top: 0; right: 0; bottom: 0; width: 1px; background-color: #F1F5F9;} .query-color {color: #3785ff;} #filterMargin {padding-top: 8px; padding-bottom: 5px;} -.pivot-design {margin-left: 18px; margin-right: 6px;} -.pivot-edit {margin-left: 6px; margin-right: 6px;} -.pivot-delete {margin-left: 6px; margin-right: 2px;} +.pivot-design {padding-left: 24px; padding-right: 12px;} +.pivot-edit {padding-left: 12px; padding-right: 12px;} +.pivot-delete {padding-left: 12px; padding-right: 8px;} diff --git a/module/pivot/view/show.html.php b/module/pivot/view/show.html.php index ff1aca27db..c84852f73f 100644 --- a/module/pivot/view/show.html.php +++ b/module/pivot/view/show.html.php @@ -37,16 +37,16 @@ -
+
pivot->showOrigin}", '', "id='origin-query' class='query-after query-color btn-query-origin' title='{$lang->pivot->showOrigin}'");?> pivot->showPivot}", '', "id='pivot-query' class='query-after query-color btn-query hidden' title='{$lang->pivot->showPivot}'");?> pivot->isClickable($pivot, 'design'); $params = helper::safe64Encode("dimensionID=$pivot->dimension&groupID=$pivot->group&pivotID=$pivot->id"); - if(common::hasPriv('pivot', 'design') and $clickable) echo html::a($this->createLink('pivot', 'design', "id=$pivot->id&from=preview¶m=$params"), " {$lang->pivot->designAB}", '', "class='pivot-design btn btn-link' title='{$lang->pivot->designAB}'"); - if(common::hasPriv('pivot', 'edit') and $clickable) echo html::a($this->createLink('pivot', 'edit', "id=$pivot->id&from=preview¶ms=$params", '', true), " {$lang->edit}", '', "class='iframe pivot-edit btn btn-link' title='{$lang->edit}' data-width='600'"); - if(common::hasPriv('pivot', 'delete') and $clickable) echo html::a($this->createLink('pivot', 'delete', "id=$pivot->id&confirm=no&from=preview"), " {$lang->delete}", 'hiddenwin', "class='pivot-delete btn btn-link' title='{$lang->delete}'"); + if(common::hasPriv('pivot', 'design') and $clickable) echo html::a($this->createLink('pivot', 'design', "id=$pivot->id&from=preview¶m=$params"), " {$lang->pivot->designAB}", '', "class='pivot-design' title='{$lang->pivot->designAB}'"); + if(common::hasPriv('pivot', 'edit') and $clickable) echo html::a($this->createLink('pivot', 'edit', "id=$pivot->id&from=preview¶ms=$params", '', true), " {$lang->edit}", '', "class='iframe pivot-edit' title='{$lang->edit}' data-width='600'"); + if(common::hasPriv('pivot', 'delete') and $clickable) echo html::a($this->createLink('pivot', 'delete', "id=$pivot->id&confirm=no&from=preview"), " {$lang->delete}", 'hiddenwin', "class='pivot-delete' title='{$lang->delete}'"); ?>