From 8b8a4c777ec1c680c5018f4d8324d38a7d3fb11a Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Mon, 4 Mar 2024 18:10:12 +0100 Subject: [PATCH] SONAR-21656 Remove boxed group css and account css --- .../js/app/styles/components/boxed-group.css | 105 ------------------ .../sonar-web/src/main/js/app/styles/sonar.ts | 1 - .../src/main/js/apps/account/Account.tsx | 1 - .../src/main/js/apps/account/account.css | 82 -------------- .../components/tutorials/components/Step.tsx | 2 +- 5 files changed, 1 insertion(+), 190 deletions(-) delete mode 100644 server/sonar-web/src/main/js/app/styles/components/boxed-group.css delete mode 100644 server/sonar-web/src/main/js/apps/account/account.css diff --git a/server/sonar-web/src/main/js/app/styles/components/boxed-group.css b/server/sonar-web/src/main/js/app/styles/components/boxed-group.css deleted file mode 100644 index 02b5cb0f788..00000000000 --- a/server/sonar-web/src/main/js/app/styles/components/boxed-group.css +++ /dev/null @@ -1,105 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2024 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -.boxed-group { - margin-bottom: calc(2.5 * var(--gridSize)); - border: 1px solid var(--barBorderColor); - border-radius: 2px; - background-color: #fff; -} - -.boxed-group.no-border { - border-color: transparent; -} - -.boxed-group-centered { - margin-left: auto; - margin-right: auto; - max-width: 500px; -} - -.boxed-group > h2 { - line-height: var(--controlHeight); - padding: calc(2 * var(--gridSize)) 20px 0; -} - -.boxed-group > h2.boxed-title { - padding: 0 0 8px; - margin: 0; - font-weight: 600; -} - -.boxed-group hr { - height: 0; - border-top: 1px solid var(--gray94); - margin: calc(2 * var(--gridSize)) -20px; -} - -.boxed-group-inner { - padding: calc(2 * var(--gridSize)) 20px; -} - -.boxed-group-inner:empty { - padding-top: 0; -} - -.boxed-group-list { - margin-top: -var(--gridSize); - margin-bottom: -var(--gridSize); -} - -.boxed-group-list > li { - margin-left: -20px; - margin-right: -20px; - padding: var(--gridSize) 20px; -} - -.boxed-group-accordion { - border-color: var(--neutral200); - margin-bottom: var(--gridSize); - transition: border-color 0.3s ease; -} - -.boxed-group-accordion:hover, -.boxed-group-accordion.open { - border-color: var(--info400); -} - -.boxed-group-accordion.not-clickable .boxed-group-accordion-title > svg { - display: none; -} - -.boxed-group-accordion-alert.boxed-group-accordion-alert { - vertical-align: middle; - margin-bottom: -6px; - margin-top: -6px; -} - -.boxed-group-accordion .boxed-group-inner { - padding-top: 0; -} - -.boxed-group-accordion-title { - display: inline-flex; - align-items: center; - vertical-align: middle; - font-weight: bold; - transition: color 0.3s ease; - text-align: left; -} diff --git a/server/sonar-web/src/main/js/app/styles/sonar.ts b/server/sonar-web/src/main/js/app/styles/sonar.ts index aa6fdccd870..cf4ba700eb5 100644 --- a/server/sonar-web/src/main/js/app/styles/sonar.ts +++ b/server/sonar-web/src/main/js/app/styles/sonar.ts @@ -23,7 +23,6 @@ import '../../../../../public/fonts/Inter/inter.css'; import '../../../../../public/fonts/Ubuntu/Ubuntu.css'; -import './components/boxed-group.css'; import './components/global-loading.css'; import './components/page.css'; import './init/base.css'; diff --git a/server/sonar-web/src/main/js/apps/account/Account.tsx b/server/sonar-web/src/main/js/apps/account/Account.tsx index 9af6a4ec10f..bab248526d6 100644 --- a/server/sonar-web/src/main/js/apps/account/Account.tsx +++ b/server/sonar-web/src/main/js/apps/account/Account.tsx @@ -27,7 +27,6 @@ import { useCurrentLoginUser } from '../../app/components/current-user/CurrentUs import A11ySkipTarget from '../../components/a11y/A11ySkipTarget'; import Suggestions from '../../components/embed-docs-modal/Suggestions'; import { translate, translateWithParameters } from '../../helpers/l10n'; -import './account.css'; import Nav from './components/Nav'; import UserCard from './components/UserCard'; diff --git a/server/sonar-web/src/main/js/apps/account/account.css b/server/sonar-web/src/main/js/apps/account/account.css deleted file mode 100644 index 0578071bf8f..00000000000 --- a/server/sonar-web/src/main/js/apps/account/account.css +++ /dev/null @@ -1,82 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2024 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -.account-container { - width: 1000px; - margin-left: auto; - margin-right: auto; -} - -.account-header { - padding-top: 20px; - padding-bottom: 20px; - border-bottom: 1px solid var(--barBorderColor); - background-color: #fff; -} - -.account-nav { - float: right; - padding-top: 11px; -} - -.account-user { - float: left; -} - -.account-user h1 { - line-height: 60px; -} - -.account-user-avatar { - margin-right: 20px; -} - -.account-user-avatar > img { - border-radius: 60px; -} - -.account-user-avatar:empty { - display: none; -} - -.account-body { - padding: 40px 0; -} - -.account-profile .boxed-group-inner:not(:first-child) { - border-top: 1px solid var(--barBorderColor); -} - -.notifications-table { - margin-top: calc(-2 * var(--gridSize)); -} - -.notifications-add-project-no-search-results { - padding: var(--gridSize); -} - -.notifications-add-project-search-results li { - padding: var(--gridSize); - cursor: pointer; -} - -.notifications-add-project-search-results li:hover, -.notifications-add-project-search-results li.active { - background-color: var(--barBackgroundColor); -} diff --git a/server/sonar-web/src/main/js/components/tutorials/components/Step.tsx b/server/sonar-web/src/main/js/components/tutorials/components/Step.tsx index e1734842320..d521c8625bc 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/Step.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/Step.tsx @@ -60,7 +60,7 @@ export default function Step(props: Props) { > - {open ?
{props.renderForm()}
:
} + {open ?
{props.renderForm()}
:
} {!open && props.renderResult && props.renderResult()} -- 2.39.5