diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/JQFuncs.js b/JQFuncs.js index b882cb5..f720096 100644 --- a/JQFuncs.js +++ b/JQFuncs.js @@ -1,5 +1,18 @@ // Scroll smoothly between html anchors // Taken from: http://codepen.io/mattsince87/pen/exByn +function varyScrollSpeed(){ + var boxes = $('[data-scroll-speed]'), + $window = $(window); + $window.on('scroll', function(){ + var scrollTop = $window.scrollTop(); + boxes.each(function(){ + var $this = $(this), + scrollspeed = parseInt($this.data('scroll-speed')), + val = - scrollTop / scrollspeed; + $this.css('transform', 'translateY(' + val + 'px)'); + }); + }); +} function updateMagicLine($li, $magicLine) { topPos = $li.position().top; @@ -37,14 +50,9 @@ function scrollNav() { }); $('.scrollTop a').scrollTop(); - /** - * This part handles the highlighting functionality. - * We use the scroll functionality again, some array creation and - * manipulation, class adding and class removing, and conditional testing - */ var prevDivPos = null; var aChildren = $("nav li").children(); // find the a children of the list items - var aArray = []; // create the empty aArray + var aArray = []; // create the empty array for (var i=0; i < aChildren.length; i++) { var aChild = aChildren[i]; var ahref = $(aChild).attr('href'); @@ -115,4 +123,5 @@ $(document).ready(function() { scrollNav(); showHide(); hideByDefault(); + varyScrollSpeed(); }); diff --git a/Session.vim b/Session.vim index af8917f..17d74e9 100644 --- a/Session.vim +++ b/Session.vim @@ -7,9 +7,9 @@ if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' let s:wipebuf = bufnr('%') endif set shortmess=aoO -badd +88 index.htm -badd +20 JQFuncs.js -badd +62 style.css +badd +37 index.htm +badd +15 JQFuncs.js +badd +54 style.css argglobal silent! argdel * argadd index.htm @@ -32,11 +32,11 @@ setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 1 - ((0 * winheight(0) + 23) / 46) +let s:l = 42 - ((4 * winheight(0) + 23) / 46) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -1 +42 normal! 0 tabnext 1 if exists('s:wipebuf') && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' diff --git a/index.htm b/index.htm index ef4a904..be3f29a 100644 --- a/index.htm +++ b/index.htm @@ -31,7 +31,12 @@
-

Sam Perry

+
+

Sam Perry

+
+
+ CodeBlur +
@@ -43,10 +48,10 @@ Profile Picture - Hi! I'm Sam. An aspiring programmer/DSP engineer. I made this website to show some of the projects that - I've completed or am currently working on and as a place to document some of my key skills and interests. - I hope to expand the website as I gain experience in my field but for now I have put together a selection - of some of the work I have created over the past few years whilst at University and working at my + Hi! I'm Sam. An aspiring programmer/DSP engineer. I've made this website to show some of the projects that + I've completed or that I'm currently working on and as a place to document some of my key skills and interests. + I hope to expand the website as I gain experience in my field but for now I've put together a selection + of some of the work I created over the past few years whilst at University and working at my placement in Paris. Enjoy!

diff --git a/resources/CodeBlur.jpg b/resources/CodeBlur.jpg index f813a73..7a49c1a 100644 Binary files a/resources/CodeBlur.jpg and b/resources/CodeBlur.jpg differ diff --git a/resources/Open_Sans/LICENSE.txt b/resources/Open_Sans/LICENSE.txt new file mode 100755 index 0000000..75b5248 --- /dev/null +++ b/resources/Open_Sans/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/resources/Open_Sans/OpenSans-Bold.ttf b/resources/Open_Sans/OpenSans-Bold.ttf new file mode 100755 index 0000000..fd79d43 Binary files /dev/null and b/resources/Open_Sans/OpenSans-Bold.ttf differ diff --git a/resources/Open_Sans/OpenSans-BoldItalic.ttf b/resources/Open_Sans/OpenSans-BoldItalic.ttf new file mode 100755 index 0000000..9bc8009 Binary files /dev/null and b/resources/Open_Sans/OpenSans-BoldItalic.ttf differ diff --git a/resources/Open_Sans/OpenSans-ExtraBold.ttf b/resources/Open_Sans/OpenSans-ExtraBold.ttf new file mode 100755 index 0000000..21f6f84 Binary files /dev/null and b/resources/Open_Sans/OpenSans-ExtraBold.ttf differ diff --git a/resources/Open_Sans/OpenSans-ExtraBoldItalic.ttf b/resources/Open_Sans/OpenSans-ExtraBoldItalic.ttf new file mode 100755 index 0000000..31cb688 Binary files /dev/null and b/resources/Open_Sans/OpenSans-ExtraBoldItalic.ttf differ diff --git a/resources/Open_Sans/OpenSans-Italic.ttf b/resources/Open_Sans/OpenSans-Italic.ttf new file mode 100755 index 0000000..c90da48 Binary files /dev/null and b/resources/Open_Sans/OpenSans-Italic.ttf differ diff --git a/resources/Open_Sans/OpenSans-Light.ttf b/resources/Open_Sans/OpenSans-Light.ttf new file mode 100755 index 0000000..0d38189 Binary files /dev/null and b/resources/Open_Sans/OpenSans-Light.ttf differ diff --git a/resources/Open_Sans/OpenSans-LightItalic.ttf b/resources/Open_Sans/OpenSans-LightItalic.ttf new file mode 100755 index 0000000..68299c4 Binary files /dev/null and b/resources/Open_Sans/OpenSans-LightItalic.ttf differ diff --git a/resources/Open_Sans/OpenSans-Regular.ttf b/resources/Open_Sans/OpenSans-Regular.ttf new file mode 100755 index 0000000..db43334 Binary files /dev/null and b/resources/Open_Sans/OpenSans-Regular.ttf differ diff --git a/resources/Open_Sans/OpenSans-Semibold.ttf b/resources/Open_Sans/OpenSans-Semibold.ttf new file mode 100755 index 0000000..1a7679e Binary files /dev/null and b/resources/Open_Sans/OpenSans-Semibold.ttf differ diff --git a/resources/Open_Sans/OpenSans-SemiboldItalic.ttf b/resources/Open_Sans/OpenSans-SemiboldItalic.ttf new file mode 100755 index 0000000..59b6d16 Binary files /dev/null and b/resources/Open_Sans/OpenSans-SemiboldItalic.ttf differ diff --git a/resources/leaguegothic-regular-webfont.ttf b/resources/leaguegothic-regular-webfont.ttf new file mode 100755 index 0000000..072cf7d Binary files /dev/null and b/resources/leaguegothic-regular-webfont.ttf differ diff --git a/style.css b/style.css index fba6657..9aced1b 100644 --- a/style.css +++ b/style.css @@ -3,6 +3,17 @@ html, body { line-height: 1.375; } +@font-face{ + font-family: "OpenSans"; + src: url('./resources/Open_Sans/OpenSans-Regular.ttf'), + url('./resources/Open_Sans/OpenSans-Regular.ttf'); /* IE */ +} + +* { + font-family: "OpenSans"; + /*font-size: 104%;*/ +} + h5 { margin: 0; background-color: LightGray; @@ -28,13 +39,30 @@ article { header { position: relative; - height: 30em; + height: 20em; width: 80%; - background-color: gray; + background-color: #002b36; top: 0; z-index: -100; } +.mainHeader{ + color: white; + font-size: 3em; + margin-top: 0.5em; + margin-bottom: 0.5em; + text-shadow:2px 2px black; + padding-left: 0.5em; + padding-right: 0.5em; + padding-bottom: 0.15em; + background-color: rgba(7, 54, 66, 0.8); +} +#headerDiv { + padding-top: 0.5em; + padding-bottom: 0.5em; + margin: 0; +} + article { padding: 1em; margin: 0 auto; @@ -53,11 +81,18 @@ nav { right: 0; top: -20px; float: right; - background-color: #6f5499; + background-color: #002b36; margin: 0; padding: 0; } +#magic-line { + width: 100%; + position: absolute; + background: #073642; + z-index: -10; +} + .shadow{ pointer-events: none; position: absolute; @@ -69,10 +104,6 @@ nav { box-shadow: inset 5px 0px 25px 2px; } -header > h1 { - margin: 0; - padding: 1em -} nav > ul { padding: 2em 0em 2em 0; @@ -92,6 +123,7 @@ div#maincontent-container { width: 100%; box-shadow: -10px -5px 25px 20px white; z-index: 10; + background-color: white; } div#maincontent { position: relative; @@ -99,6 +131,7 @@ div#maincontent { margin: 0; padding: 0; z-index: 10; + background-color: white; } /*A bit of a hack to fix the jquery slide toggle*/ @@ -176,13 +209,6 @@ div.infoBox > div > div > p { padding: 1.67em; } -#magic-line { - width: 100%; - position: absolute; - background: #8565B8; - z-index: -10; -} - .circular { border-radius: 150px; -webkit-border-radius: 150px; @@ -191,3 +217,11 @@ div.infoBox > div > div > p { -webkit-box-shadow: 0 0 8px rgba(0, 0, 0, .8); -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8); } + +.coverDiv { + top: 0; + text-align: center; + color: #fff; + position: absolute; + z-index: -101; +}