Skip to content

Commit ae20c4d

Browse files
authored
Merge pull request #857 from devtron-labs/feat/new-folder-structure
feat: Navigation 2.0 + New Folder Structure
2 parents 2331822 + f8560e6 commit ae20c4d

File tree

43 files changed

+212
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+212
-26
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.19.0-pre-6",
3+
"version": "1.19.0-pre-7",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/IconV2/ic-bot.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-clipboard.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-cloud.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-coins.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-devtron-text.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-trend-up.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Common/SearchBar/SearchBar.component.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ const SearchBar = ({
7474
noBackgroundAndBorder = false,
7575
size = ComponentSizeType.medium,
7676
keyboardShortcut,
77+
variant = 'default',
7778
}: SearchBarProps) => {
7879
const [showClearButton, setShowClearButton] = useState(!!initialSearchText)
7980
const inputRef = useRef<HTMLInputElement>()
@@ -157,11 +158,14 @@ const SearchBar = ({
157158
return (
158159
<div className={`search-bar-container ${containerClassName || ''}`}>
159160
<div
160-
className={`search-bar ${noBackgroundAndBorder ? 'dc__no-border dc__no-background dc__hover-n50' : 'bg__secondary en-2 dc__hover-border-n300'} focus-within-border-b5 dc__block w-100 min-w-200 dc__position-rel br-4 bw-1 ${getSearchBarHeightFromSize(size)}`}
161+
className={`search-bar search-bar--${variant} ${noBackgroundAndBorder ? 'dc__no-border dc__no-background dc__hover-n50' : 'bg__secondary en-2 dc__hover-border-n300'} focus-within-border-b5 dc__block w-100 min-w-200 dc__position-rel br-4 bw-1 ${getSearchBarHeightFromSize(size)}`}
161162
>
162-
<Search className="search-bar__icon dc__position-abs icon-color-n6 icon-dim-16" />
163+
<Search
164+
className={`search-bar__icon dc__position-abs icon-dim-16 ${variant === 'sidenav' ? 'icon-fill__sidenav' : 'icon-color-n6'}`}
165+
/>
163166
<input
164167
placeholder="Search"
168+
data-variant={variant}
165169
data-testid={dataTestId}
166170
type="text"
167171
{...inputProps}

0 commit comments

Comments
 (0)