Skip to content

Commit

Permalink
Merge branch 'master' into djwy-fix-regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
iMartzen authored Apr 26, 2024
2 parents 4e9500b + 9d71683 commit 94372ca
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 9 deletions.
18 changes: 17 additions & 1 deletion _sass/_bootstrap_customization.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,30 @@

a:not(.btn) {
color: $blue;

&:hover {
color: $blue-500;
}

&:active {
color: $blue-600;
}
}
}

.bg-black {
background-color: $black !important;

a:not(.btn) {
color: $pink;
color: $blue-500;

&:hover {
color: $blue;
}

&:active {
color: $blue-300;
}
}
}

Expand Down
5 changes: 4 additions & 1 deletion _sass/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// Brand Colors
$blue-300: #124ddb;
$blue: #2d68f4;
$blue-500: #477eff;
$blue-600: #7aa2ff;
$indigo: #6610f2;
$purple: #6f42c1;
$pink: #e10e71;
Expand All @@ -9,7 +12,7 @@ $yellow: #f3b234;
$green: #02c996;
$teal: #20c997;
$cyan: #5bc0de;
$white: #f5f5f5;
$white: #ffffff;
$gray-100: #f9f9f9;
$gray-200: #f5f5f5;
$gray-300: #e9e9e9;
Expand Down
2 changes: 1 addition & 1 deletion index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ title: Home
professional, Hacker101 has something to teach you.
</p>
<a class="btn btn-primary" href="/start-here">
Start Hacking!
Start hacking!
</a>
</div>
<div class="col-md-5 offset-md-1 py-4">
Expand Down
10 changes: 5 additions & 5 deletions playlists/hacktivitycon.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
layout: page
title: H@cktivitycon
title: h@cktivitycon
---

h@cktivitycon is a HackerOne hosted hacker conference built by the community for the community. h@cktivitycon is a place for hackers to learn, share, and meet friends. Hear talks and panelists exploring offensive hacking techniques, recon skills, target selection and more.

Talks
## Talks
---

### H@cktivitycon 2021
### h@cktivitycon 2021

- [Keynote: Launching an InfoSec Career](/conferences/hacktivitycon2021/keynote)
- [Breaking Down OffSec Certifications](/conferences/hacktivitycon2021/offsec_panel)
Expand All @@ -20,7 +20,7 @@ Talks
- [Haptyc: A Library for Building Microfuzzers in Turbo Intruder](/conferences/hacktivitycon2021/haptyc)
- [Hacking on Bug Bounties for Five Years](/conferences/hacktivitycon2021/bugbountyfor5years)

### H@cktivitycon 2020
### h@cktivitycon 2020

- [Keynote by Georgia Weidman](/conferences/hacktivitycon2020/keynote)
- [How I got from 0 to MVH](/conferences/hacktivitycon2020/0tomvh)
Expand All @@ -36,4 +36,4 @@ Talks
- [Cached and Confused: Web Cache Deception in the Wild](/conferences/hacktivitycon2020/web_cache_deception)
- [You've got pwned: exploiting e-mail systems](/conferences/hacktivitycon2020/exploiting_email_systems)
- [The journey of finding and exploiting a bug in GitLab](/conferences/hacktivitycon2020/gitlab)
- [Discover vulnerabilities with CodeQL](/conferences/hacktivitycon2020/codeql)
- [Discover vulnerabilities with CodeQL](/conferences/hacktivitycon2020/codeql)
2 changes: 2 additions & 0 deletions playlists/mobile_hacking.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ This learning track is dedicated to learning the most popular mobile vulnerabili
<div class="col-md-6">
<h2>Android Hacking</h2>

<hr />

<ul>
<li>
<a href="../sessions/android/quickstart">Android Quickstart</a>
Expand Down
3 changes: 2 additions & 1 deletion videos.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ sidebar:
url: /playlists/mentorshipmondays
- text: "Mobile Hacking"
url: /playlists/mobile_hacking
- text: "H@cktivitycon"
updated: true
- text: "h@cktivitycon"
url: /playlists/hacktivitycon
- text: "Cryptography"
url: /playlists/cryptography
Expand Down

0 comments on commit 94372ca

Please sign in to comment.