Merge branch 'master' into statusbar-updates

pull/5370/head
Liana Husikyan 5 months ago committed by GitHub
commit 9977f0f7a7
  1. 2
      libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
  2. 2
      libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
  3. 4
      libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
  4. 6
      libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
  5. 2
      libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx

@ -194,7 +194,7 @@ const RemixApp = (props: IRemixAppUi) => {
<DragBar <DragBar
resetTrigger={resetLeftTrigger} resetTrigger={resetLeftTrigger}
maximiseTrigger={maximiseLeftTrigger} maximiseTrigger={maximiseLeftTrigger}
minWidth={285} minWidth={305}
refObject={sidePanelRef} refObject={sidePanelRef}
hidden={hideSidePanel} hidden={hideSidePanel}
setHideStatus={setHideSidePanel} setHideStatus={setHideSidePanel}

@ -209,7 +209,7 @@ function HomeTabFile({ plugin }: HomeTabFileProps) {
await plugin.call('filePanel', 'clone') await plugin.call('filePanel', 'clone')
}}> }}>
<i className="fa-brands fa-github-alt pl-1 pr-2"></i> <i className="fa-brands fa-github-alt pl-1 pr-2"></i>
Git Clone Clone
</button> </button>
</CustomTooltip> </CustomTooltip>
<CustomTooltip placement={'top'} tooltipId="overlay-tooltip" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="home.connectToLocalhost" />} tooltipTextClasses="border bg-light text-dark p-1 pr-3"> <CustomTooltip placement={'top'} tooltipId="overlay-tooltip" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="home.connectToLocalhost" />} tooltipTextClasses="border bg-light text-dark p-1 pr-3">

@ -157,12 +157,12 @@ function HomeTabGetStarted({ plugin }: HomeTabGetStartedProps) {
<div ref={carouselRefDiv} className="w-100 d-flex flex-column pt-1"> <div ref={carouselRefDiv} className="w-100 d-flex flex-column pt-1">
<ThemeContext.Provider value={themeFilter}> <ThemeContext.Provider value={themeFilter}>
<div className="pt-3"> <div className="pt-3">
<div className="d-flex flex-row align-items-center mb-3 flex-wrap"> <div className="d-flex flex-row align-items-center flex-wrap">
{workspaceTemplates.map((template, index) => ( {workspaceTemplates.map((template, index) => (
<CustomTooltip tooltipText={template.description} tooltipId={template.gsID} tooltipClasses="text-nowrap" tooltipTextClasses="border bg-light text-dark p-1 pr-3" placement="top-start" key={`${template.gsID}-${template.workspaceTitle}-${index}`}> <CustomTooltip tooltipText={template.description} tooltipId={template.gsID} tooltipClasses="text-nowrap" tooltipTextClasses="border bg-light text-dark p-1 pr-3" placement="top-start" key={`${template.gsID}-${template.workspaceTitle}-${index}`}>
<button <button
key={index} key={index}
className={index === 0 ? 'btn btn-primary border p-2 text-nowrap mr-3 mb-3' : index === workspaceTemplates.length - 1 ? 'btn border p-2 text-nowrap mr-2 mb-3' : 'btn border p-2 text-nowrap mr-3 mb-3'} className={index === 0 ? 'btn btn-primary border p-2 text-nowrap mr-3 mb-2' : index === workspaceTemplates.length - 1 ? 'btn border p-2 text-nowrap mr-2 mb-2' : 'btn border p-2 text-nowrap mr-3 mb-3'}
onClick={(e) => { onClick={(e) => {
createWorkspace(template.templateName) createWorkspace(template.templateName)
}} }}

@ -10,6 +10,12 @@
max-height: 600px; max-height: 600px;
white-space: pre-line; white-space: pre-line;
} }
.modal-ok {
min-width: 4rem;
}
.modal-cancel {
min-width: 4rem;
}
@-webkit-keyframes animatetop { @-webkit-keyframes animatetop {
from {top: -300px; opacity: 0} from {top: -300px; opacity: 0}
to {top: 0; opacity: 1} to {top: 0; opacity: 1}

@ -52,7 +52,7 @@ export function HamburgerMenu(props: HamburgerMenuProps) {
></HamburgerMenuItem> ></HamburgerMenuItem>
<HamburgerMenuItem <HamburgerMenuItem
kind="clone" kind="clone"
fa="fab fa-github" fa="fa-brands fa-github-alt"
hideOption={hideWorkspaceOptions} hideOption={hideWorkspaceOptions}
actionOnClick={() => { actionOnClick={() => {
props.cloneGitRepository() props.cloneGitRepository()

Loading…
Cancel
Save