Skip to content

Commit b827f0e

Browse files
authored
Merge pull request #167 from medyo/develop
Version 1.19.0
2 parents a5857c8 + 07d6df6 commit b827f0e

File tree

27 files changed

+430
-374
lines changed

27 files changed

+430
-374
lines changed

src/assets/App.css

Lines changed: 201 additions & 201 deletions
Large diffs are not rendered by default.

src/assets/baidu_logo.svg

Lines changed: 1 addition & 1 deletion
Loading

src/assets/index.css

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
@import "variables.css";
2-
3-
:focus { outline: none; }
1+
@import 'variables.css';
42

53
body {
64
margin: 0;
7-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
8-
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
9-
sans-serif;
5+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
6+
'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
107
-webkit-font-smoothing: antialiased;
118
-moz-osx-font-smoothing: grayscale;
12-
139
}
1410

1511
code {
16-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
17-
monospace;
12+
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
1813
}

src/assets/phind_logo.svg

Lines changed: 27 additions & 0 deletions
Loading

src/components/DropDownMenu.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { Item, Menu, animation, useContextMenu } from 'react-contexify'
12
import { RiArrowDownSFill } from 'react-icons/ri'
2-
import { Menu, Item, animation, useContextMenu } from 'react-contexify'
33

44
const DropDownMenu = ({ data, tagId, label, setSelectedDropDownItem }) => {
55
const { show: showMenu } = useContextMenu()
@@ -17,10 +17,10 @@ const DropDownMenu = ({ data, tagId, label, setSelectedDropDownItem }) => {
1717

1818
return (
1919
<>
20-
<span onClick={displayMenu} className="headerSelect" data-target-id={tagId}>
20+
<button onClick={displayMenu} className="headerSelect" data-target-id={tagId}>
2121
{label}
2222
<RiArrowDownSFill className="headerSelectIcon" />
23-
</span>
23+
</button>
2424
<Menu id={tagId} animation={animation.fade}>
2525
{data &&
2626
data.map((tag) => {

src/components/Elements/BottomNavigation/BottomNavigation.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const BottomNavigation = ({
3838
})}
3939
{
4040
<button
41+
aria-label="Open settings"
4142
className={'navigationItem '}
4243
onClick={() => setShowSettings((prev: boolean) => !prev)}>
4344
{<AiOutlineMenu />}

src/components/Elements/SearchBarWithLogo/SearchBarWithLogo.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.searchBarWithLogo {
22
display: flex;
3+
flex-grow: 1;
34
flex-direction: column;
45
row-gap: 24px;
56
align-items: center;
@@ -16,3 +17,7 @@
1617
width: 100%;
1718
height: 100%;
1819
}
20+
21+
.dark .searchEngineLogo .themeAdaptiveFillColor {
22+
fill: white;
23+
}

src/components/Elements/SearchBarWithLogo/SearchBarWithLogo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export const SearchBarWithLogo = () => {
1111

1212
return (
1313
<div className="searchBarWithLogo">
14-
{userSearchEngine && userSearchEngine.logo && (
14+
{userSearchEngine?.logo && (
1515
<div className="searchEngineLogo">
16-
<userSearchEngine.logo />
16+
<userSearchEngine.logo className={userSearchEngine?.className} />
1717
</div>
1818
)}
1919
<SearchBar />
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react'
21
import { TiPlus } from 'react-icons/ti'
32
import { useUserPreferences } from 'src/stores/preferences'
43

@@ -10,15 +9,15 @@ export const UserTags = ({ onAddClicked }: UserTagsProps) => {
109
const { userSelectedTags } = useUserPreferences()
1110

1211
return (
13-
<nav className="tags">
12+
<div className="tags">
1413
{userSelectedTags.map((tag, index) => (
1514
<span key={index} className="tag">
1615
{tag.value}
1716
</span>
1817
))}
19-
<span className="tag tagHoverable" onClick={onAddClicked}>
18+
<button aria-label="Open settings" className="tag tagHoverable" onClick={onAddClicked}>
2019
<TiPlus className="tagIcon" />
21-
</span>
22-
</nav>
20+
</button>
21+
</div>
2322
)
2423
}

src/components/Layout/AppContentLayout.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ export const AppContentLayout = ({
1515
const [selectedCard, setSelectedCard] = useState(cards[0])
1616

1717
return (
18-
<section>
18+
<>
1919
<main className="AppContent">
2020
<ScrollCardsNavigator />
2121
{isDesktop ? (
2222
<DesktopCards cards={cards} userCustomCards={userCustomCards} />
2323
) : (
24-
<div className="HorizontalScroll">
24+
<div className="Cards HorizontalScroll">
2525
<MobileCards selectedCard={selectedCard} />
2626
</div>
2727
)}
@@ -31,6 +31,6 @@ export const AppContentLayout = ({
3131
setSelectedCard={setSelectedCard}
3232
setShowSettings={setShowSettings}
3333
/>
34-
</section>
34+
</>
3535
)
3636
}

0 commit comments

Comments
 (0)