From 4d2f3ed43ace33ad88525a0edfe27f57f6976667 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 2 Jul 2024 20:03:21 +0100
Subject: [PATCH] fix spacing in github setup

---
 .../git/src/components/github/devicecode.tsx     |  4 ++--
 libs/remix-ui/git/src/components/gitui.tsx       | 16 ++++++++--------
 .../remix-ui/git/src/components/panels/clone.tsx |  2 +-
 .../src/components/panels/githubcredentials.tsx  |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libs/remix-ui/git/src/components/github/devicecode.tsx b/libs/remix-ui/git/src/components/github/devicecode.tsx
index cd611efe4d..9e1a8ce2d9 100644
--- a/libs/remix-ui/git/src/components/github/devicecode.tsx
+++ b/libs/remix-ui/git/src/components/github/devicecode.tsx
@@ -72,7 +72,7 @@ export const GetDeviceCode = () => {
   return (
     <>
       {(context.gitHubUser && context.gitHubUser.login) ? null :
-        <button className='btn btn-primary mt-1 w-100' onClick={async () => {
+        <button className='btn btn-secondary mt-1 w-100' onClick={async () => {
           getDeviceCodeFromGitHub();
         }}><i className="fab fa-github mr-1"></i>Login in with github</button>
       }
@@ -124,4 +124,4 @@ export const GetDeviceCode = () => {
       }
 
     </>)
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/git/src/components/gitui.tsx b/libs/remix-ui/git/src/components/gitui.tsx
index fb9566895b..87d3b2145c 100644
--- a/libs/remix-ui/git/src/components/gitui.tsx
+++ b/libs/remix-ui/git/src/components/gitui.tsx
@@ -200,38 +200,38 @@ export const GitUI = (props: IGitUi) => {
                     <hr></hr>
                     <BranchesNavigation eventKey="2" activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey="2">
-                      <div className="px-2">
+                      <div className="px-2 py-2">
                         <Branches />
                       </div>
                     </Accordion.Collapse>
                     <hr></hr>
                     <RemotesNavigation eventKey="5" activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey="5">
-                      <div className="px-2">
+                      <div className="px-2 py-2">
                         <Remotes plugin={plugin}></Remotes>
                       </div>
                     </Accordion.Collapse>
                     <hr></hr>
                     <CloneNavigation eventKey="4" activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey="4">
-                      <>
-                        <Clone plugin={plugin} /></>
+                      <div className="px-2 py-2">
+                        <Clone plugin={plugin} /></div>
                     </Accordion.Collapse>
                     <hr></hr>
                     <GitHubNavigation eventKey="7" activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey="7">
-                      <>
+                      <div className="px-2 py-2">
                         <GetDeviceCode></GetDeviceCode>
                         <hr></hr>
                         <GitHubCredentials></GitHubCredentials>
-                      </>
+                      </div>
                     </Accordion.Collapse>
                     <hr></hr>
                     <LogNavigation eventKey="6" activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey="6">
-                      <>
+                      <div className="px-2 py-2">
                         <LogViewer />
-                      </>
+                      </div>
                     </Accordion.Collapse>
 
                   </Accordion>
diff --git a/libs/remix-ui/git/src/components/panels/clone.tsx b/libs/remix-ui/git/src/components/panels/clone.tsx
index 4e562be544..daddc53ad7 100644
--- a/libs/remix-ui/git/src/components/panels/clone.tsx
+++ b/libs/remix-ui/git/src/components/panels/clone.tsx
@@ -67,7 +67,7 @@ export const Clone = ({ plugin }: CloneProps) => {
 
   return (
     <>
-      <div data-id="clone-panel-content" className="px-3 py-2">
+      <div data-id="clone-panel-content">
         <SelectAndCloneRepositories cloneAllBranches={cloneAllBranches} cloneDepth={cloneDepth} plugin={plugin} />
         <hr />
         <InputGroup className="mb-2 pb-1">
diff --git a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
index 300e6797f0..607e86f5dc 100644
--- a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
+++ b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
@@ -67,14 +67,14 @@ export const GitHubCredentials = () => {
 
   return (
     <>
-      <div className="input-group text-secondary mb-1 h6">
+      <div className="input-group text-secondary mb-3 h6">
         <input data-id='githubToken' type="password" value={githubToken} placeholder="GitHub token" className="form-control" name='githubToken' onChange={e => handleChangeTokenState(e.target.value)} />
         <div className="input-group-append">
           <CopyToClipboard content={githubToken} data-id='copyToClipboardCopyIcon' className='far fa-copy ml-1 p-2 mt-1' direction={"top"} />
         </div>
       </div>
-      <input data-id='gitubUsername' name='githubUsername' onChange={e => handleChangeUserNameState(e.target.value)} value={githubUsername} className="form-control mb-1" placeholder="Git username" type="text" id="githubUsername" />
-      <input data-id='githubEmail' name='githubEmail' onChange={e => handleChangeEmailState(e.target.value)} value={githubEmail} className="form-control mb-1" placeholder="Git email" type="text" id="githubEmail" />
+      <input data-id='gitubUsername' name='githubUsername' onChange={e => handleChangeUserNameState(e.target.value)} value={githubUsername} className="form-control mb-3" placeholder="Git username" type="text" id="githubUsername" />
+      <input data-id='githubEmail' name='githubEmail' onChange={e => handleChangeEmailState(e.target.value)} value={githubEmail} className="form-control mb-3" placeholder="Git email" type="text" id="githubEmail" />
       <div className="d-flex justify-content-between">
         <button data-id='saveGitHubCredentials' className="btn btn-primary w-100" onClick={saveGithubToken}>
           <FormattedMessage id="save" defaultMessage="Save" />
@@ -87,4 +87,4 @@ export const GitHubCredentials = () => {
       <hr />
     </>
   );
-}
\ No newline at end of file
+}