From 9b1fa551f29d17285e871ae459b10774d881c103 Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 27 Jun 2024 14:29:28 +0200 Subject: [PATCH 1/5] layout update for FE bottom --- .../src/app/tabs/locales/en/filePanel.json | 3 +- .../workspace/src/lib/remix-ui-workspace.tsx | 34 +++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json index 8159675a7e..9804377ea9 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json +++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json @@ -141,5 +141,6 @@ "filePanel.movingFolderFailed": "Moving Folder Failed", "filePanel.movingFolderFailedMsg": "Unexpected error while moving folder: {src}", "filePanel.workspaceActions": "Workspace actions", - "filePanel.saveCodeSample": "This code-sample workspace will not be persisted. Click here to save it." + "filePanel.saveCodeSample": "This code-sample workspace will not be persisted. Click here to save it.", + "filePanel.updateSubmodules": "Update all submodules." } diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index 3da9063576..450df30360 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -1343,22 +1343,34 @@ export function Workspace() { - {selectedWorkspace && ( + { selectedWorkspace && (
-
-
GIT
- {selectedWorkspace.hasGitSubmodules? -
- {global.fs.browser.isRequestingCloning ?
updating submodules
: -
update submodules
} -
+
+
GIT
+ { selectedWorkspace.hasGitSubmodules? + } + > +
+ {global.fs.browser.isRequestingCloning ? : + } +
+
: null} -
- +
+ {global.fs.browser.isRequestingCloning ? : currentBranch || '-none-'} From 0640a5b6e3ae8f2d898967e1113dba50d3858e0c Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 27 Jun 2024 14:32:05 +0200 Subject: [PATCH 2/5] tooltip[ update --- apps/remix-ide/src/app/tabs/locales/en/filePanel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json index 9804377ea9..158f3772b2 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json +++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json @@ -142,5 +142,5 @@ "filePanel.movingFolderFailedMsg": "Unexpected error while moving folder: {src}", "filePanel.workspaceActions": "Workspace actions", "filePanel.saveCodeSample": "This code-sample workspace will not be persisted. Click here to save it.", - "filePanel.updateSubmodules": "Update all submodules." + "filePanel.updateSubmodules": "Update all submodules of repository. Click to pull dependencies." } From 5c7257da8d943890dd0fbaeb7122a87113daa951 Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 27 Jun 2024 17:45:44 +0200 Subject: [PATCH 3/5] ttoltips and internal element layout fix for FE bottom menu --- .../src/lib/components/custom-dropdown.tsx | 2 +- .../src/lib/components/homeTabFeatured.tsx | 2 +- .../src/lib/css/remix-ui-workspace.css | 4 + .../workspace/src/lib/remix-ui-workspace.tsx | 175 +++++++++--------- 4 files changed, 97 insertions(+), 86 deletions(-) diff --git a/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx b/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx index f429cd0d04..14c7838a89 100644 --- a/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx +++ b/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx @@ -29,7 +29,7 @@ export const CustomToggle = React.forwardRef( className={className.replace('dropdown-toggle', '')} >
-
{children}
+
{children}
{icon && (
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx index bc5fb49f62..7f1eb98d59 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx @@ -12,7 +12,7 @@ function HomeTabFeatured() { const themeFilter = useContext(ThemeContext) return ( -
+
diff --git a/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css b/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css index 24c7d462c6..7d8aa0c276 100644 --- a/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css +++ b/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css @@ -77,6 +77,10 @@ background: var(--custom-select); } + .branches-dropdown { + max-width: 16rem; + } + .custom-dropdown-items a { border-radius: .25rem; text-transform: none; diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index 450df30360..6099599695 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -1364,93 +1364,100 @@ export function Workspace() { }
- : null} -
- - - {global.fs.browser.isRequestingCloning ? : currentBranch || '-none-'} - - - -
-
- - - -
{ - toggleBranches(false) - }} - > - + : null + } + +
+ + + {global.fs.browser.isRequestingCloning ? : currentBranch || '-none-'} + + +
+
+ + + +
{ + toggleBranches(false) + }} + > + +
-
-
- -
-
- {filteredBranches.length > 0 ? ( - filteredBranches.map((branch, index) => { - return ( - { - switchToBranch(branch) - }} - title={intl.formatMessage({ id: `filePanel.switchToBranch${branch.remote ? 'Title1' : 'Title2'}` })} - > -
- {currentBranch === branch.name && !branch.remote ? ( - - ✓ - {branch.name} - - ) : ( - - - {branch.remote ? `${branch.remote}/${branch.name}` : branch.name} - - )} -
-
- ) - }) - ) : ( - -
- - - : {branchFilter} from '{currentBranch}' - -
-
+
+ +
+
+ {filteredBranches.length > 0 ? ( + filteredBranches.map((branch, index) => { + return ( + { + switchToBranch(branch) + }} + title={intl.formatMessage({ id: `filePanel.switchToBranch${branch.remote ? 'Title1' : 'Title2'}` })} + > +
+ {currentBranch === branch.name && !branch.remote ? ( + + ✓ + {branch.name} + + ) : ( + + + {branch.remote ? `${branch.remote}/${branch.name}` : branch.name} + + )} +
+
+ ) + }) + ) : ( + +
+ + + : {branchFilter} from '{currentBranch}' + +
+
+ )} +
+ {(selectedWorkspace.branches || []).length > 4 && ( +
+ +
)}
- {(selectedWorkspace.branches || []).length > 4 && ( -
- -
- )} -
- - -
+ + +
+
)} From 419a33ac75a58341cac429dcefc11038b76f7449 Mon Sep 17 00:00:00 2001 From: lianahus Date: Fri, 28 Jun 2024 11:54:56 +0200 Subject: [PATCH 4/5] fixed spinner --- .../workspace/src/lib/remix-ui-workspace.tsx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index 6099599695..6540eb1e09 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -1355,11 +1355,11 @@ export function Workspace() { tooltipText={} >
- {global.fs.browser.isRequestingCloning ? : - }
@@ -1367,17 +1367,17 @@ export function Workspace() { : null }
- + {global.fs.browser.isRequestingCloning ? : currentBranch || '-none-'} @@ -1447,11 +1447,9 @@ export function Workspace() { )}
{(selectedWorkspace.branches || []).length > 4 && ( -
- -
+ )}
From 50efbdf99afd53d39e23a0c2a397bdae194b297b Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Fri, 28 Jun 2024 16:29:36 +0530 Subject: [PATCH 5/5] fix linting --- libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index 6540eb1e09..005ae1d821 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -1355,13 +1355,13 @@ export function Workspace() { tooltipText={} >
- { global.fs.browser.isRequestingCloning ? : - : + } + }
: null