merge upstream

web/src/components/Add/style.js

@@ -6,7 +6,7 @@ export const Header = styled.div`
   color: rgba(0, 0, 0, 0.87);
   font-size: 20px;
   color: #fff;
-  font-weight: 500;
+  font-weight: 600;
   box-shadow: 0px 2px 4px -1px rgb(0 0 0 / 20%), 0px 4px 5px 0px rgb(0 0 0 / 14%), 0px 1px 10px 0px rgb(0 0 0 / 12%);
   padding: 15px 24px;
   position: relative;
@@ -303,7 +303,7 @@ export const PosterLanguageSwitch = styled.div`
   display: grid;
   place-items: center;
   color: #e1f4eb;
-  font-weight: 500;
+  font-weight: 600;
   cursor: pointer;
   transition: all 0.3s;
 

web/src/components/App/index.jsx

@@ -49,6 +49,7 @@ export default function App() {
           secondary: { main: '#ffa724' },
           tonalOffset: 0.2,
         },
+        typography: { fontFamily: 'Open Sans, sans-serif' },
       }),
     [prefersDarkMode],
   )

web/src/components/App/style.js

@@ -74,7 +74,7 @@ export const LanguageSwitch = styled.div`
   height: 35px;
   width: 35px;
   transition: all 0.2s;
-  font-weight: 500;
+  font-weight: 600;
   display: grid;
   place-items: center;
   color: #eee;

web/src/components/DialogTorrentDetailsContent/index.jsx

@@ -108,12 +108,12 @@ export default function DialogTorrentDetailsContent({ closeDialog, torrent }) {
 
     if (title !== name) {
       newNameStringArr.push(removeRedundantCharacters(title))
-    } else if (torrentParsedName?.title) newNameStringArr.push(torrentParsedName?.title)
+    } else if (torrentParsedName?.title) newNameStringArr.push(removeRedundantCharacters(torrentParsedName?.title))
 
     // These 2 checks are needed to get year and resolution from torrent name if title does not have this info
-    if (torrentParsedName?.year && !title.includes(torrentParsedName?.year))
+    if (torrentParsedName?.year && !newNameStringArr[0].includes(torrentParsedName?.year))
       newNameStringArr.push(torrentParsedName?.year)
-    if (torrentParsedName?.resolution && !title.includes(torrentParsedName?.resolution))
+    if (torrentParsedName?.resolution && !newNameStringArr[0].includes(torrentParsedName?.resolution))
       newNameStringArr.push(torrentParsedName?.resolution)
 
     const newNameString = newNameStringArr.join('. ')

web/src/components/DialogTorrentDetailsContent/style.js

@@ -113,7 +113,7 @@ export const SectionTitle = styled.div`
   ${({ mb }) => css`
     ${mb && `margin-bottom: ${mb}px`};
     font-size: 35px;
-    font-weight: 200;
+    font-weight: 300;
     line-height: 1;
     word-break: break-word;
 
@@ -187,7 +187,7 @@ export const WidgetFieldTitle = styled.div`
   text-transform: uppercase;
   font-size: 11px;
   margin-bottom: 2px;
-  font-weight: 500;
+  font-weight: 600;
 `
 
 export const WidgetFieldIcon = styled.div`

web/src/components/TorrentCard/style.js

@@ -95,7 +95,7 @@ export const TorrentCardDescription = styled.div`
   .description-section-name {
     text-transform: uppercase;
     font-size: 10px;
-    font-weight: 500;
+    font-weight: 600;
     letter-spacing: 0.4px;
     color: #216e47;
 

web/src/index.css

@@ -1,13 +1,20 @@
-body {
+*,
+*::before,
+*::after {  
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+  padding: 0;
+  box-sizing: inherit;
 }
 
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+body {  
+  font-family: "Open Sans", sans-serif;
+  box-sizing: border-box;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  letter-spacing: -0.1px;
 }
+
+button {
+  font-family: "Open Sans", sans-serif;
+  letter-spacing: -0.1px;
+}