resolve conflicts

StampyAI · Jun 8, 2024 · ad6a1c8 · ad6a1c8
1 parent 7e92c56
commit ad6a1c8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/app/components/Article/Contents.tsx b/app/components/Article/Contents.tsx
@@ -25,7 +25,7 @@ const addPopup = (e: HTMLElement, id: string, contents: string, mobile?: boolean
   if (preexisting) return preexisting
 
   const popup = document.createElement('div')
-    popup.className = 'link-popup bordered small background'
+  popup.className = 'link-popup bordered small background'
   popup.innerHTML = contents
   popup.id = id
 

diff --git a/app/components/Article/article.css b/app/components/Article/article.css
@@ -102,10 +102,7 @@ article .glossary-entry {
 
 article .link-popup {
   visibility: hidden;
-  opacity: 0;
   z-index: 4;
-  position: absolute;
-  top: 0;
   width: 512px;
 }
 
@@ -218,6 +215,10 @@ article .banner h3 .title {
     flex-direction: row;
     flex-wrap: wrap;
   }
+
+  article .link-popup {
+    width: 100%;
+  }
   article .footer-comtainer > div:nth-child(-n + 2) {
     flex: 1 1;
   }

diff --git a/app/components/Button/button.css b/app/components/Button/button.css
@@ -183,6 +183,7 @@
 /* #### Composite button #### */
 .composite-button {
   cursor: pointer;
+  display: flex;
 }
 
 .composite-button > form .button,

diff --git a/app/components/SearchResults/Dropdown.tsx b/app/components/SearchResults/Dropdown.tsx
@@ -22,7 +22,13 @@ export interface SearchResultsProps {
   url: string
 }
 
-export const SearchResults = ({results}: {results: SearchResultsProps[]}) => {
+export const SearchResults = ({
+  results,
+  onSelect,
+}: {
+  results: SearchResultsProps[]
+  onSelect?: () => void
+}) => {
   const isMobile = useIsMobile()
   const noResults = results.length === 0
   if (noResults) {
@@ -34,7 +40,7 @@ export const SearchResults = ({results}: {results: SearchResultsProps[]}) => {
   }
 
   return (
-    <div className="container-search-results bordered col-5">
+    <div className="container-search-results bordered col-5" onClick={onSelect}>
       {results.map((result, i) => (
         <Link key={i} className="search-result" to={result.url}>
           <Paper />

diff --git a/app/components/search.tsx b/app/components/search.tsx
@@ -42,6 +42,7 @@ export default function Search({limitFromUrl, className}: Props) {
       )}
       {!isPendingSearch && searchPhrase && showResults && (
         <SearchResults
+          onSelect={() => setShowResults(false)}
           results={results.map((r) => ({
             title: r.title,
             url: questionUrl(r),