From 25a5fc39b90a458be8094773164f378f5cf3f5f1 Mon Sep 17 00:00:00 2001 From: liuhongbo <916196375@qq.com> Date: Thu, 30 Nov 2023 17:19:48 +0800 Subject: [PATCH 1/4] feat: adjust the style of button --- .../share-link-panel/link-creation.js | 2 +- .../components/share-link-panel/link-list.js | 2 +- frontend/src/css/share-link-dialog.css | 47 ++++++++++--------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/frontend/src/components/share-link-panel/link-creation.js b/frontend/src/components/share-link-panel/link-creation.js index f742def332..18617449c9 100644 --- a/frontend/src/components/share-link-panel/link-creation.js +++ b/frontend/src/components/share-link-panel/link-creation.js @@ -335,7 +335,7 @@ class LinkCreation extends React.Component { )} {this.state.errorInfo && {gettext(this.state.errorInfo)}} - + ); diff --git a/frontend/src/components/share-link-panel/link-list.js b/frontend/src/components/share-link-panel/link-list.js index beb113eaf2..449e421787 100644 --- a/frontend/src/components/share-link-panel/link-list.js +++ b/frontend/src/components/share-link-panel/link-list.js @@ -52,7 +52,7 @@ class LinkList extends React.Component { return ( -
+
{gettext('Share Link')}
{selectedLinks.length == 0 ? ( diff --git a/frontend/src/css/share-link-dialog.css b/frontend/src/css/share-link-dialog.css index ba1855329a..8604502276 100644 --- a/frontend/src/css/share-link-dialog.css +++ b/frontend/src/css/share-link-dialog.css @@ -4,10 +4,11 @@ display: flex; flex-direction: column; } + @media (min-width: 768px) { - .share-dialog .share-dialog-content { - flex-direction: row; - } + .share-dialog .share-dialog-content { + flex-direction: row; + } } .share-dialog-content .share-dialog-side { @@ -22,19 +23,21 @@ } @media (min-width: 768px) { - .share-dialog-content .share-dialog-side { - padding: 12px 8px; - border: 0; - border-right: 1px solid #eee; - } - .share-dialog-side .nav { - flex-direction: column; - } - .share-dialog-side .nav-pills .nav-item .nav-link { - width: 100%; - padding: 0.3125rem 0.5rem; - margin: 0; - } + .share-dialog-content .share-dialog-side { + padding: 12px 8px; + border: 0; + border-right: 1px solid #eee; + } + + .share-dialog-side .nav { + flex-direction: column; + } + + .share-dialog-side .nav-pills .nav-item .nav-link { + width: 100%; + padding: 0.3125rem 0.5rem; + margin: 0; + } } .share-dialog-content .share-dialog-main { @@ -102,12 +105,12 @@ input.expire-input { .expire-input-border { border-bottom-right-radius: 0; border-top-right-radius: 0; - height: 2.375rem!important; - padding: 0.375rem 0.75rem!important; + height: 2.375rem !important; + padding: 0.375rem 0.75rem !important; } .share-dialog-main .permission-editor .permission-editor__menu { - width: 240px; + width: 240px; } .expir-span { @@ -144,11 +147,11 @@ input.expire-input { .custom-permission .permission-name-desc { margin-top: .375rem; } - + .custom-permission .permission-name-desc label { font-size: 14px; color: #999; -} +} .custom-permission .permission-name-desc .permission-name, .custom-permission .permission-name-desc .permission-desc { @@ -162,4 +165,4 @@ input.expire-input { .custom-permission .permissions-list-body { max-height: 350px; overflow-y: scroll; - } +} From 05acb452f3923cc2287e7dd00e143d10d6d656d5 Mon Sep 17 00:00:00 2001 From: liuhongbo <916196375@qq.com> Date: Thu, 30 Nov 2023 17:31:22 +0800 Subject: [PATCH 2/4] feat: recover code format --- .../share-link-panel/link-creation.js | 2 +- frontend/src/css/share-link-dialog.css | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/share-link-panel/link-creation.js b/frontend/src/components/share-link-panel/link-creation.js index 18617449c9..a15458a6f0 100644 --- a/frontend/src/components/share-link-panel/link-creation.js +++ b/frontend/src/components/share-link-panel/link-creation.js @@ -335,7 +335,7 @@ class LinkCreation extends React.Component { )} {this.state.errorInfo && {gettext(this.state.errorInfo)}} - + ); diff --git a/frontend/src/css/share-link-dialog.css b/frontend/src/css/share-link-dialog.css index 8604502276..4882e6add7 100644 --- a/frontend/src/css/share-link-dialog.css +++ b/frontend/src/css/share-link-dialog.css @@ -8,7 +8,7 @@ @media (min-width: 768px) { .share-dialog .share-dialog-content { flex-direction: row; - } + } } .share-dialog-content .share-dialog-side { @@ -27,17 +27,15 @@ padding: 12px 8px; border: 0; border-right: 1px solid #eee; - } - - .share-dialog-side .nav { + } + .share-dialog-side .nav { flex-direction: column; - } - - .share-dialog-side .nav-pills .nav-item .nav-link { + } + .share-dialog-side .nav-pills .nav-item .nav-link { width: 100%; padding: 0.3125rem 0.5rem; margin: 0; - } + } } .share-dialog-content .share-dialog-main { @@ -105,8 +103,8 @@ input.expire-input { .expire-input-border { border-bottom-right-radius: 0; border-top-right-radius: 0; - height: 2.375rem !important; - padding: 0.375rem 0.75rem !important; + height: 2.375rem!important; + padding: 0.375rem 0.75rem!important; } .share-dialog-main .permission-editor .permission-editor__menu { @@ -147,7 +145,6 @@ input.expire-input { .custom-permission .permission-name-desc { margin-top: .375rem; } - .custom-permission .permission-name-desc label { font-size: 14px; color: #999; From 5cc8c5a832b977dd61a1a2cc55fa45716dedfa93 Mon Sep 17 00:00:00 2001 From: liuhongbo <916196375@qq.com> Date: Thu, 30 Nov 2023 17:34:32 +0800 Subject: [PATCH 3/4] feat: recover code format --- frontend/src/css/share-link-dialog.css | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/src/css/share-link-dialog.css b/frontend/src/css/share-link-dialog.css index 4882e6add7..6d155151e5 100644 --- a/frontend/src/css/share-link-dialog.css +++ b/frontend/src/css/share-link-dialog.css @@ -6,9 +6,9 @@ } @media (min-width: 768px) { - .share-dialog .share-dialog-content { - flex-direction: row; - } + .share-dialog .share-dialog-content { + flex-direction: row; + } } .share-dialog-content .share-dialog-side { @@ -23,19 +23,19 @@ } @media (min-width: 768px) { - .share-dialog-content .share-dialog-side { - padding: 12px 8px; - border: 0; - border-right: 1px solid #eee; - } - .share-dialog-side .nav { - flex-direction: column; - } - .share-dialog-side .nav-pills .nav-item .nav-link { - width: 100%; - padding: 0.3125rem 0.5rem; - margin: 0; - } + .share-dialog-content .share-dialog-side { + padding: 12px 8px; + border: 0; + border-right: 1px solid #eee; + } + .share-dialog-side .nav { + flex-direction: column; + } + .share-dialog-side .nav-pills .nav-item .nav-link { + width: 100%; + padding: 0.3125rem 0.5rem; + margin: 0; + } } .share-dialog-content .share-dialog-main { @@ -108,7 +108,7 @@ input.expire-input { } .share-dialog-main .permission-editor .permission-editor__menu { - width: 240px; + width: 240px; } .expir-span { From 0da594cfae138516ecbfa13be785e63d39d29041 Mon Sep 17 00:00:00 2001 From: liuhongbo <916196375@qq.com> Date: Thu, 30 Nov 2023 17:38:09 +0800 Subject: [PATCH 4/4] feat: recover code format --- frontend/src/css/share-link-dialog.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/css/share-link-dialog.css b/frontend/src/css/share-link-dialog.css index 6d155151e5..ccdbd8bcf3 100644 --- a/frontend/src/css/share-link-dialog.css +++ b/frontend/src/css/share-link-dialog.css @@ -24,18 +24,18 @@ @media (min-width: 768px) { .share-dialog-content .share-dialog-side { - padding: 12px 8px; - border: 0; - border-right: 1px solid #eee; - } - .share-dialog-side .nav { - flex-direction: column; - } - .share-dialog-side .nav-pills .nav-item .nav-link { - width: 100%; - padding: 0.3125rem 0.5rem; - margin: 0; - } + padding: 12px 8px; + border: 0; + border-right: 1px solid #eee; + } + .share-dialog-side .nav { + flex-direction: column; + } + .share-dialog-side .nav-pills .nav-item .nav-link { + width: 100%; + padding: 0.3125rem 0.5rem; + margin: 0; + } } .share-dialog-content .share-dialog-main {