From b8b62a2bddfa548a96533900338700155f4b3885 Mon Sep 17 00:00:00 2001 From: Jeremiah Boby Date: Sat, 14 Apr 2018 18:09:30 +0100 Subject: Added an About category with Partners view (#1pv7h) (#50) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added Partners view, and Navbar item * Moved info/rules to about/rules and fixed references * Added Partner images, and populated the partners page * Fixed responsiveness on smaller displays Added like 2 characters to the column tag, to enable stacking of columns if the display width is lower than 960 pixels. * Fixed indentation * Updated Code Monkeys Banner Added the shiny new CM Banner, and rearranged the partner cards. * Fixed newlines at end of HTML files * Partners page updated to generate from JSON file • The templates/main/about/partners.html file now uses the static/partners.json file to generate the Partner cards. • Flexboxes are nice. * Rearranged containers on Partners page I have no idea how flexboxes work :DDD * Updated Partners page to fix styling issues * Moved tag styling to the appropriate CSS file * Changed code style of stylesheet :D * Addresses Lemon's code style issues • Partner cards now have id="partner-card", which is selected with a CSS selector for styling, rather than styling all card objects. • Removed nonbreaking spaces that PyCharm didn't tell me about • Indented conditional HTML content to match Jinja conditionals • Fixed unclosed image tag * Removed div bloating, and increased specifity of CSS selection --- static/images/partners/code monkeys.png | Bin 0 -> 57930 bytes static/images/partners/dyep.png | Bin 0 -> 67897 bytes static/images/partners/hacking-coding.png | Bin 0 -> 346142 bytes static/images/partners/programming.png | Bin 0 -> 90027 bytes static/images/partners/stem.png | Bin 0 -> 260063 bytes static/partners.json | 27 +++++++++++++++++++++++++++ static/style.css | 13 ++++++++----- 7 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 static/images/partners/code monkeys.png create mode 100644 static/images/partners/dyep.png create mode 100644 static/images/partners/hacking-coding.png create mode 100644 static/images/partners/programming.png create mode 100644 static/images/partners/stem.png create mode 100644 static/partners.json (limited to 'static') diff --git a/static/images/partners/code monkeys.png b/static/images/partners/code monkeys.png new file mode 100644 index 00000000..198885a2 Binary files /dev/null and b/static/images/partners/code monkeys.png differ diff --git a/static/images/partners/dyep.png b/static/images/partners/dyep.png new file mode 100644 index 00000000..5cb5c398 Binary files /dev/null and b/static/images/partners/dyep.png differ diff --git a/static/images/partners/hacking-coding.png b/static/images/partners/hacking-coding.png new file mode 100644 index 00000000..80ce0ca3 Binary files /dev/null and b/static/images/partners/hacking-coding.png differ diff --git a/static/images/partners/programming.png b/static/images/partners/programming.png new file mode 100644 index 00000000..75f4fbb1 Binary files /dev/null and b/static/images/partners/programming.png differ diff --git a/static/images/partners/stem.png b/static/images/partners/stem.png new file mode 100644 index 00000000..24ec97a7 Binary files /dev/null and b/static/images/partners/stem.png differ diff --git a/static/partners.json b/static/partners.json new file mode 100644 index 00000000..d3211a99 --- /dev/null +++ b/static/partners.json @@ -0,0 +1,27 @@ +{ + "Do You Even Python?": { + "banner": "/static/images/partners/dyep.png", + "description": "Do You Even Python? is a server for discussions and learning about Python where you can come and chat with beginners and experienced Pythonistas alike, come and join us!", + "invite": "https://discord.gg/jQtfh66" + }, + "STEM": { + "banner": "/static/images/partners/stem.png", + "description": "STEM is a growing server dedicated to discussion and education pertaining to subjects within the fields of Science, Technology, Engineering, and Mathematics. We aim to provide our members with an engaged, skilled, friendly community. We hope to see you soon!", + "invite": "https://discord.gg/XBGetGp" + }, + "Code Monkeys": { + "banner": "/static/images/partners/code monkeys.png", + "description": "We at Code Monkeys are dedicated to provide a friendly environment for programmers and tech enthusiasts alike. The community here is dedicated to giving and receiving great help and advice for a variety of programming languages. Help us build a large and friendly community at Code Monkeys by joining today!", + "invite": "https://discord.gg/vywQPxd" + }, + "Programming": { + "banner": "/static/images/partners/programming.png", + "description": "Programming was created in 2016, and is an active community around various programming languages, operating systems, as well as hardware, security, and low-level programming.", + "invite": "https://discord.gg/010z0Kw1A9ql5c1Qe" + }, + "Hacking - Coding": { + "banner": "/static/images/partners/hacking-coding.png", + "description": "Hacking-Coding is a server for discussions about ethical hacking, programming, and infosec in general. We have over 5,000 members. People of all skill levels are welcome to join.", + "invite": "https://discord.gg/0kvPIGKKEACoKQ8C" + } +} \ No newline at end of file diff --git a/static/style.css b/static/style.css index 86dfd6ee..42afa519 100644 --- a/static/style.css +++ b/static/style.css @@ -119,10 +119,13 @@ footer div.uk-section div.uk-text-center { padding-right: 40px; } -/* -Rendered document fixes - */ - +/* Rendered document fixes */ .document li p { margin-bottom: 0; -} \ No newline at end of file +} + +/* Styling for Partners page cards */ +div#partner-cards div.uk-card-default { + margin-top: 2em; + text-align:center; +} -- cgit v1.2.3