Skip to content

Commit f0a62f8

Browse files
authored
feat: Move help bar nav item to bottom of nav bar (#4622)
* feat: moving help and support item to the bottom * feat: moved helpbar to the bottom of nav bar * feat: adjust position of helpbar popover * fix: prettier * chore: clean up * chore: clean up * chore: update clockface * chore: clean up
1 parent 582e53c commit f0a62f8

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"dependencies": {
165165
"@codingame/monaco-jsonrpc": "^0.3.1",
166166
"@docsearch/react": "^3.0.0-alpha.37",
167-
"@influxdata/clockface": "^4.0.1",
167+
"@influxdata/clockface": "^4.2.0",
168168
"@influxdata/flux-lsp-browser": "0.8.8",
169169
"@influxdata/giraffe": "^2.26.0",
170170
"@influxdata/influxdb-templates": "0.9.0",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.helpBarStyle {
2+
margin-top: auto !important;
3+
}

src/pageLayout/containers/TreeNav.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {connect, ConnectedProps} from 'react-redux'
66
import {withRouter, RouteComponentProps} from 'react-router-dom'
77

88
// Components
9-
import {Icon, IconFont, TreeNav} from '@influxdata/clockface'
9+
import {Icon, IconFont, PopoverPosition, TreeNav} from '@influxdata/clockface'
1010
import UserWidget from 'src/pageLayout/components/UserWidget'
1111
import NavHeader from 'src/pageLayout/components/NavHeader'
1212
import OrgSettings from 'src/cloud/components/OrgSettings'
@@ -27,6 +27,7 @@ import {NavItem, NavSubItem} from 'src/pageLayout/constants/navigationHierarchy'
2727
import {AppState} from 'src/types'
2828

2929
import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
30+
import './TreeNav.scss'
3031

3132
type ReduxProps = ConnectedProps<typeof connector>
3233

@@ -163,8 +164,9 @@ const TreeSidebar: FC<ReduxProps & RouteComponentProps> = () =>
163164
icon={<Icon glyph={IconFont.QuestionMark_New} />}
164165
label="Help & Support"
165166
shortLabel="Support"
167+
className="helpBarStyle"
166168
>
167-
<TreeNav.SubMenu>
169+
<TreeNav.SubMenu position={PopoverPosition.ToTheRight}>
168170
<TreeNav.SubHeading label="Support" />
169171
<TreeNav.SubItem
170172
id="documentation"

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,10 +1451,10 @@
14511451
gud "^1.0.0"
14521452
warning "^4.0.3"
14531453

1454-
"@influxdata/clockface@^4.0.1":
1455-
version "4.0.1"
1456-
resolved "https://registry.yarnpkg.com/@influxdata/clockface/-/clockface-4.0.1.tgz#fe9175301b3c7914bf2165e15f0a904572aadeff"
1457-
integrity sha512-c4tFxs1/9zR3kc7/Y77mZdo6NsThznfYz+q6O64PqOykqDClgpfCzbpVmG+Tfm06Je4jF4Om3Ssek3cC6lYodw==
1454+
"@influxdata/clockface@^4.2.0":
1455+
version "4.2.0"
1456+
resolved "https://registry.yarnpkg.com/@influxdata/clockface/-/clockface-4.2.0.tgz#f41aba10b00bb21f24075bffe7b48a95507dfd24"
1457+
integrity sha512-DXReWwAOqMM+GqfP3pMiskPpOJRflHlymxgfaxpQkLOkXVeaK5UcQBaV1MKdgNFlPS8vAb1nE0KTnbg7/25SAw==
14581458

14591459
"@influxdata/flux-lsp-browser@0.8.8":
14601460
version "0.8.8"

0 commit comments

Comments
 (0)