move workspace dropdown menu back to the left

2 years ago · 9feb1737a1
parent 6ad00bd246
commit 9feb1737a1
1 changed files with 37 additions and 58 deletions
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@ -682,65 +682,44 @@ export function Workspace () {
          <div>
            <header>
              <div className="mx-2 mb-2 d-flex flex-column">
-                <div className="d-flex justify-content-between">
-                  <span className="d-flex align-items-end">
-                    <label className="pl-1 form-check-label" htmlFor="workspacesSelect" style={{wordBreak: 'keep-all'}}>
-                      <FormattedMessage id='filePanel.workspace' />
-                    </label>
-                  </span>
-                  {currentWorkspace !== LOCALHOST ? (<span className="remixui_menu remixui_topmenu d-flex justify-content-between align-items-end w-75">
-                    <CustomTooltip
-                      placement="top"
-                      tooltipId="createWorkspaceTooltip"
-                      tooltipClasses="text-nowrap"
-                      tooltipText={<FormattedMessage id='filePanel.create' />}
-                    >
-                      <span
-                        hidden={currentWorkspace === LOCALHOST}
-                        id='workspaceCreate'
-                        data-id='workspaceCreate'
-                        onClick={(e) => {
-                          e.stopPropagation()
-                          createWorkspace()
-                          _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceCreate'])
-                        }}
-                        style={{ fontSize: 'medium' }}
-                        className='far fa-plus remixui_menuicon d-flex align-self-end'
-                        >
-                      </span>
-                    </CustomTooltip>
-                    <Dropdown id="workspacesMenuDropdown" data-id="workspacesMenuDropdown" onToggle={() => hideIconsMenu(!showIconsMenu)} show={showIconsMenu}>
-                      <Dropdown.Toggle
-                        as={CustomIconsToggle}
-                        onClick={() => {
-                          hideIconsMenu(!showIconsMenu)
-                        }}
-                        icon={'fas fa-bars'}
-                      ></Dropdown.Toggle>
-                      <Dropdown.Menu as={CustomMenu} data-id="wsdropdownMenu" className='custom-dropdown-items remixui_menuwidth' rootCloseEvent="click">
-                        <HamburgerMenu
-                          createWorkspace={createWorkspace}
-                          renameCurrentWorkspace={renameCurrentWorkspace}
-                          downloadCurrentWorkspace={downloadCurrentWorkspace}
-                          deleteCurrentWorkspace={deleteCurrentWorkspace}
-                          deleteAllWorkspaces={deleteAllWorkspaces}
-                          cloneGitRepository={cloneGitRepository}
-                          downloadWorkspaces={downloadWorkspaces}
-                          restoreBackup={restoreBackup}
-                          hideIconsMenu={hideIconsMenu}
-                          addGithubAction={addGithubAction}
-                          addSlitherGithubAction={addSlitherGithubAction}
-                          addHelperScripts={addHelperScripts}
-                          addTsSolTestGithubAction={addTsSolTestGithubAction}
-                          showIconsMenu={showIconsMenu}
-                          hideWorkspaceOptions={ currentWorkspace === LOCALHOST }
-                          hideLocalhostOptions={ currentWorkspace === NO_WORKSPACE }
-                          />
-                      </Dropdown.Menu>
-                    </Dropdown>
-                  </span>) : null}
+                <div className="d-flex">
+                  {currentWorkspace !== LOCALHOST ? (<span className="remixui_topmenu d-flex">
+                      <Dropdown id="workspacesMenuDropdown" data-id="workspacesMenuDropdown" onToggle={() => hideIconsMenu(!showIconsMenu)} show={showIconsMenu}>
+                        <Dropdown.Toggle
+                          as={CustomIconsToggle}
+                          onClick={() => {
+                            hideIconsMenu(!showIconsMenu)
+                          }}
+                          icon={'fas fa-bars'}
+                        ></Dropdown.Toggle>
+                        <Dropdown.Menu as={CustomMenu} data-id="wsdropdownMenu" className='custom-dropdown-items remixui_menuwidth' rootCloseEvent="click">
+                          <HamburgerMenu
+                            createWorkspace={createWorkspace}
+                            renameCurrentWorkspace={renameCurrentWorkspace}
+                            downloadCurrentWorkspace={downloadCurrentWorkspace}
+                            deleteCurrentWorkspace={deleteCurrentWorkspace}
+                            deleteAllWorkspaces={deleteAllWorkspaces}
+                            cloneGitRepository={cloneGitRepository}
+                            downloadWorkspaces={downloadWorkspaces}
+                            restoreBackup={restoreBackup}
+                            hideIconsMenu={hideIconsMenu}
+                            addGithubAction={addGithubAction}
+                            addSlitherGithubAction={addSlitherGithubAction}
+                            addHelperScripts={addHelperScripts}
+                            addTsSolTestGithubAction={addTsSolTestGithubAction}
+                            showIconsMenu={showIconsMenu}
+                            hideWorkspaceOptions={ currentWorkspace === LOCALHOST }
+                            hideLocalhostOptions={ currentWorkspace === NO_WORKSPACE }
+                            />
+                        </Dropdown.Menu>
+                      </Dropdown>
+                    </span>) : null}
+                    <span className="d-flex">
+                      <label className="pl-1 form-check-label" htmlFor="workspacesSelect" style={{wordBreak: 'keep-all'}}>
+                        <FormattedMessage id='filePanel.workspace' />
+                      </label>
+                    </span>                  
                </div>
-
                <Dropdown id="workspacesSelect" data-id="workspacesSelect" onToggle={toggleDropdown} show={showDropdown}>
                  <Dropdown.Toggle
                    as={CustomToggle}