Skip to content

Commit

Permalink
Merge branch 'master' into add-blog
Browse files Browse the repository at this point in the history
  • Loading branch information
Saharsh Yeruva authored Sep 2, 2020
2 parents ab7eb95 + a3849e4 commit 3ed313a
Show file tree
Hide file tree
Showing 7 changed files with 503 additions and 394 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@
".github/workflows/lint.yml",
"./tsconfig.json"
]
}
}
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ updates:
open-pull-requests-limit: 5
rebase-strategy: "auto"
commit-message:
prefix: "️dependabot:"
prefix: "dependabot:"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
Expand All @@ -21,6 +21,6 @@ updates:
open-pull-requests-limit: 5
rebase-strategy: "auto"
commit-message:
prefix: "️dependabot:"
prefix: "dependabot:"
schedule:
interval: "daily"
2 changes: 1 addition & 1 deletion components/Layouts/Layout.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
margin: 0 auto;
width: 100%;
max-width: 65ch;
}
}
5 changes: 5 additions & 0 deletions components/Nav.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@

.username {
color: colors.$gray;

&:visited {
@extend .username;
}

display: block;
margin-left: 0.5em;

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@tryghost/content-api": "^1.4.4",
"imagemin-optipng": "^8.0.0",
"next": "9.5.2",
"next": "9.5.3",
"next-optimized-images": "^2.6.2",
"react": "16.13.1",
"react-dom": "16.13.1",
Expand All @@ -30,7 +30,7 @@
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.1.0",
"prettier": "^2.1.0",
"prettier": "^2.1.1",
"typescript": "^4.0.2"
}
}
2 changes: 0 additions & 2 deletions pages/tutoring.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import Layout from '../components/Layouts/Layout';

import Post from '../components/Copy';

import CalendlyEmbed from '../components/CalendlyEmbed';

const Tutoring = () => {
Expand Down
878 changes: 492 additions & 386 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 3ed313a

Please sign in to comment.