From 64d39daf1114e1e37ac8076416833492fc31b4c0 Mon Sep 17 00:00:00 2001 From: Daniel Shleifman Date: Thu, 17 Jun 2021 15:48:06 +0300 Subject: [PATCH] fixed title, font changed --- web/public/index.html | 3 ++- web/src/components/Add/style.js | 4 +-- web/src/components/App/index.jsx | 1 + web/src/components/App/style.js | 2 +- .../DialogTorrentDetailsContent/index.jsx | 6 ++--- .../DialogTorrentDetailsContent/style.js | 4 +-- web/src/components/TorrentCard/style.js | 2 +- web/src/index.css | 25 ++++++++++++------- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/web/public/index.html b/web/public/index.html index fd25f39..7e9388a 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -10,7 +10,8 @@ - + + diff --git a/web/src/components/Add/style.js b/web/src/components/Add/style.js index fd91242..ac7eb26 100644 --- a/web/src/components/Add/style.js +++ b/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; diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index cbe6636..c621db9 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -18,6 +18,7 @@ import Sidebar from './Sidebar' const baseTheme = createMuiTheme({ overrides: { MuiCssBaseline: { '@global': { html: { WebkitFontSmoothing: 'auto' } } } }, palette: { primary: { main: '#00a572' }, secondary: { main: '#ffa724' }, tonalOffset: 0.2 }, + typography: { fontFamily: 'Open Sans, sans-serif' }, }) export default function App() { diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index b940905..b36fe8b 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -73,7 +73,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: #44795e; diff --git a/web/src/components/DialogTorrentDetailsContent/index.jsx b/web/src/components/DialogTorrentDetailsContent/index.jsx index 3fb6401..0138ddd 100644 --- a/web/src/components/DialogTorrentDetailsContent/index.jsx +++ b/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('. ') diff --git a/web/src/components/DialogTorrentDetailsContent/style.js b/web/src/components/DialogTorrentDetailsContent/style.js index f134e01..4884967 100644 --- a/web/src/components/DialogTorrentDetailsContent/style.js +++ b/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` diff --git a/web/src/components/TorrentCard/style.js b/web/src/components/TorrentCard/style.js index 54e131e..1e8e874 100644 --- a/web/src/components/TorrentCard/style.js +++ b/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; diff --git a/web/src/index.css b/web/src/index.css index ec2585e..d45520b 100644 --- a/web/src/index.css +++ b/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; +} \ No newline at end of file