From 13bd472f5600dedd3357c26fe160a1f972fede17 Mon Sep 17 00:00:00 2001
From: Samuel Couillard <43917914+scouillard@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:31:15 -0500
Subject: [PATCH] Fix SiteSettings jumping (#4743)
---
app/assets/locales/en.json | 2 +-
app/assets/stylesheets/variables.scss | 4 ++--
.../admin/site_settings/appearance/BrandingImage.jsx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json
index c0e376c7..17898ad3 100644
--- a/app/assets/locales/en.json
+++ b/app/assets/locales/en.json
@@ -242,7 +242,7 @@
"click_to_upload": "Click to Upload",
"drag_and_drop": " or drag and drop",
"upload_brand_image_description": "Upload any PNG, JPG, or SVG file. Depending on the size of the file, it may require additional time to upload before it can be used",
- "remove_branding_image": "Remove Custom Branding Image"
+ "remove_branding_image": "Remove Branding Image"
},
"administration": {
"administration": "Administration",
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index 363b784f..aa2820b0 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -14,7 +14,7 @@ $footer-height: 57px;
$table-hover-bg: #F8F8F8;
-$admin-card-height: 550px;
+$admin-card-height: 650px;
$button-min-width: 120px;
@@ -23,4 +23,4 @@ $column-sm-width: 100px;
$column-md-width: 150px;
$column-lg-width: 325px;
-$input-max-width: 300px;
\ No newline at end of file
+$input-max-width: 300px;
diff --git a/app/javascript/components/admin/site_settings/appearance/BrandingImage.jsx b/app/javascript/components/admin/site_settings/appearance/BrandingImage.jsx
index ce098945..9aa73235 100644
--- a/app/javascript/components/admin/site_settings/appearance/BrandingImage.jsx
+++ b/app/javascript/components/admin/site_settings/appearance/BrandingImage.jsx
@@ -46,7 +46,7 @@ export default function BrandingImage() {
</Card>
</FilesDragAndDrop>
<Button
- variant="neutral"
+ variant="delete"
className="btn-sm my-4"
onClick={() => updateBrandingImage.mutate()}
> { t('admin.site_settings.appearance.remove_branding_image') }
--
GitLab