SONAR-20086 - Change layout for all the pages

diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreateRenderer.tsx
index f6b4caeedd9f1f345a73e3f2679119cae6fd2122..c42983bb13765117ef8ae6d2359b93368caaaa60 100644 (file)
--- a/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreateRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreateRenderer.tsx
@@ -82,11 +82,12 @@ export default function BitbucketProjectCreateRenderer(props: BitbucketProjectCr
       />
 
       <DeferredSpinner loading={loading}>
-        {!selectedAlmInstance && (
+        {!loading && !selectedAlmInstance && (
           <WrongBindingCountAlert alm={AlmKeys.BitbucketServer} canAdmin={!!canAdmin} />
         )}
 
-        {selectedAlmInstance &&
+        {!loading &&
+          selectedAlmInstance &&
           (showPersonalAccessTokenForm ? (
             <BitbucketServerPersonalAccessTokenForm
               almSetting={selectedAlmInstance}

diff --git a/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx b/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx
index d5122cd8003f297f4ab051b6eb27481864dfeba4..a8809db3d829e6f1688f98773cfe065eb39ac07c 100644 (file)
--- a/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx
+++ b/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx
@@ -276,13 +276,17 @@ export class CreateProjectPage extends React.PureComponent<CreateProjectPageProp
     const { creatingAlmDefinition } = this.state;
     const mode: CreateProjectModes | undefined = location.query?.mode;
     const isProjectSetupDone = location.query?.setncd === 'true';
+    const gridLayoutStyle = mode ? 'sw-col-start-2 sw-col-span-10' : 'sw-col-span-12';
 
     return (
-      <LargeCenteredLayout className="sw-pt-8">
-        <Helmet title={translate('onboarding.create_project.select_method')} titleTemplate="%s" />
-        <A11ySkipTarget anchor="create_project_main" />
+      <LargeCenteredLayout
+        id="create-project"
+        className="sw-pt-8 sw-grid sw-gap-x-12 sw-gap-y-6 sw-grid-cols-12"
+      >
+        <div className={gridLayoutStyle}>
+          <Helmet title={translate('onboarding.create_project.select_method')} titleTemplate="%s" />
+          <A11ySkipTarget anchor="create_project_main" />
 
-        <div id="create-project">
           <div className={classNames({ 'sw-hidden': isProjectSetupDone })}>
             {this.renderProjectCreation(mode)}
           </div>