diff --git a/Brock_Unicard.png b/Brock_Unicard.png new file mode 100644 index 0000000..52dc76e Binary files /dev/null and b/Brock_Unicard.png differ diff --git a/ENSF 381 Assignment Backup/PAGE-ADDRESS.md b/ENSF 381 Assignment Backup/PAGE-ADDRESS.md new file mode 100644 index 0000000..a1ffa6a --- /dev/null +++ b/ENSF 381 Assignment Backup/PAGE-ADDRESS.md @@ -0,0 +1,10 @@ +Put the address to your website here. Use this markdown format: + +```bash +[display-name](link) +``` + +example: +```bash +[my website](https://rick-astley.github.io) +``` \ No newline at end of file diff --git a/ENSF 381 Assignment Backup/README.md b/ENSF 381 Assignment Backup/README.md new file mode 100644 index 0000000..f5bb28d --- /dev/null +++ b/ENSF 381 Assignment Backup/README.md @@ -0,0 +1,51 @@ +# CSS +In this assignment, you will add styling to the webpages you created in the HTML assignment, and will **publish** the website using GitHub pages. + +--- + +## :foot: Steps +1. Add the HTML you wrote for the About page to the `index.html` file +1. Add the HTML you wrote for the Skills page to the `skills.html` file +1. Add the HTML you wrote for the Experience page to the `experience.html` file +1. Add the HTML you wrote for the Education page to the `education.html` file +1. Add the HTML you wrote for the Interests page to the `interests.html` file +1. Use Flexbox and other CSS properties to the `style.css` file so that your pages look like these: + + `index.html` + ![index-page](https://res.cloudinary.com/mkf/image/upload/v1674680283/ENSF-381/labs/flexbox/about_paafuq.png) + + `skills.html` + ![skills-page](https://res.cloudinary.com/mkf/image/upload/v1674680283/ENSF-381/labs/flexbox/skills_kudlfj.png) + + `education.html` + ![education-page](https://res.cloudinary.com/mkf/image/upload/v1674680283/ENSF-381/labs/flexbox/education_d9hixu.png) + + `experience.html` + ![experience-page](https://res.cloudinary.com/mkf/image/upload/v1674680283/ENSF-381/labs/flexbox/experience_zjyrux.png) + + `interests.html` + ![interests-page](https://res.cloudinary.com/mkf/image/upload/v1674680283/ENSF-381/labs/flexbox/interests_oa1rhh.png) + +1. Change the content so they represent you (your picture, your education, your experince, etc.) +1. Make sure all the links are working if applicable (for instance, you don't have to add a Pinterest page if you don't have one, but the link to your resume should work) +1. Make sure the website is responsive at least on Desktop and Tablet devices (use `@media` queries for this). Here's an example of how it should react to screen size changes: + ![responsive](https://res.cloudinary.com/mkf/image/upload/v1674681793/ENSF-381/labs/flexbox/responsive-small_nakjwj.gif) + +1. It doesn't matter what threshold you're using for the `@media` query (`800px`, `600px`, etc.) +1. Commit all the changes to the `main` branch and push to the remote repo (here) +1. Create a **public** repo under your **personal** GitHub account with this name: `.github.io` +1. Clone the repo to your local system; add all the files you have here to the project; commit to the `main` branch and push to the remote repo (your repo under your GitHub username) +1. Open up a browser and go to `https://.github.io`. You should be able to see the website (it may take a few minutes) +1. Add the address to your webpage to the [`PAGE-ADDRESS.md`](./PAGE-ADDRESS.md) file +1. Commit to the `main` branch and push to the remote repo (here) + +--- + +### :page_with_curl: Notes +- Make sure you save what you had for the About page in the `index.html` page. That's the default page that the browser shows when someone visits your website +- Make sure you alter the data on the examples so that the website represents you, not Rick +- Don't use any CSS frameworks for this assignment. You need to write all the CSS yourself +- Use Flexbox for the layout +- Feel free to make minor changes, such as changing colors and font-sizes +- Feel free to add new elements, data, etc. +- You may need to change some of the HTML elements you used in the HTML assignment. One example is the navigation menu. You probably choose a paragraph to do that. For this assignment, it makes more sense to use `
- Rick Asley -

Rick Astley

-

Singer, Songwriter

-
rick.astley@meme.com
+ Photo of Brock Tomlinson as of (Aug 29, 2021) +

Brock Tomlinson

+

Student Software Engineer

+

Email I check:

darkicewolf50@gmail.com

+

Professional Email:

brock@eatsleepski.com

+ Phone Number: 1-250-946-6196
-

© Rick Astley

+

© Brock Tomlinson

\ No newline at end of file diff --git a/education.html b/education.html index 0d0f7ab..98bc84b 100644 --- a/education.html +++ b/education.html @@ -4,7 +4,7 @@ - Rick Astley + Brock - Education @@ -18,37 +18,46 @@

Contact

-
- Rick Asley -

Rick Astley

-

Singer, Songwriter

-
rick.astley@meme.com
-
+
+ Photo of Brock Tomlinson as of (Aug 29, 2021) +

Brock Tomlinson

+

Student Software Engineer

+
darkicewolf50@gmail.com
+
brock@eatsleepski.com
+

Education

- - + + - + - - + + - - + + + + + + + + + +
PhD in Computer Engineering          2014-2018Bachelor of Science (Software Engineering)   2021-Present
University of CalgaryCalgary, Canada  Calgary, Canada
MSc in Computer Engineering          2012-2014Current GPA  3.767
University of CalgaryCalgary, CanadaHighschool Diploma   2017-2021
The Fernie Academy  Fernie, Canada
Graduated GPA  3.28

Credentials are available upon request.

-

© Rick Astley

+

© Brock Tomlinson

\ No newline at end of file diff --git a/experience.html b/experience.html index 239c1d9..6047f5d 100644 --- a/experience.html +++ b/experience.html @@ -4,7 +4,7 @@ - Rick Astley + Brock - Experience @@ -18,30 +18,31 @@

Contact

-
- Rick Asley -

Rick Astley

-

Singer, Songwriter

-
rick.astley@meme.com
-
+
+ Photo of Brock Tomlinson as of (Aug 29, 2021) +

Brock Tomlinson

+

Student Software Engineer

+
darkicewolf50@gmail.com
+
brock@eatsleepski.com
+

Experience

- - + + - - + + - - + + - - + +
Software Developer    2018-PresentJunior, Chassis Sub-team    2022-Present
FacebookMenlo Park, CASchulich Off-Road (Baja SAE)Calgary, Ab
Web Developer       2016-2018Labourer, Marketing       2018-Present
AmazonVancouver, BCGhostrider StorageFernie, BC

Download my full resume here.

@@ -49,7 +50,7 @@
-

© Rick Astley

+

© Brock Tomlinson

\ No newline at end of file diff --git a/index.html b/index.html index e757e72..a65b903 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Rick Astley + Brock @@ -19,37 +19,21 @@
- Rick Asley -

Rick Astley

-

Singer, Songwriter

-
rick.astley@meme.com
+ Photo of Brock Tomlinson as of (Aug 29, 2021) +

Brock Tomlinson

+

Student Software Engineer

+
darkicewolf50@gmail.com
+
brock@eatsleepski.com

About

-

I'm an English singer, songwriter and radio personality, who has been active in music for several decades. You've probably already seen my video by clicking on random links on the Internet!

-

A few points about me: I will never

- - - - - - - - - - - - - - - - - -
Give You UpMake You Cry
Let You DownSay Goodbye
Tell A LieRun Around
Desert YouHurt You
+

I'm an learning Software Engineer Student, who is trying to learn the language of how to desgin, develop, and create programs that are to industry sandard and reasonably efficent. I hope to bring the lessions learned from each project I have completed, learning from the mistakes I have made and bringing thm forard into the net project.

+

As of writing this I hope to bring the knowldge learned from my time at school in Software Engineering onto a Baja SAE car, where we can collect data remotely and graph live data as it come in while we are driving it, as well as salving it for later for future analysis.

+

I grew up in a small ski town where, I started learning about programming, from of course Minecraft, where I thought the application of this was so futuristic and downright cool that I knew I anted to persure it further. While living there I spend a majority of my time out of school swimming, where I got so good that I was considered top 10 in BC, along with swimming I spend a lot of time volunteering with fundraising events and coaching the disabled.

-

© Rick Astley

+

© Brock Tomlinson

\ No newline at end of file diff --git a/interests.html b/interests.html index fd4314d..901016e 100644 --- a/interests.html +++ b/interests.html @@ -18,25 +18,28 @@

Contact

-
- Rick Asley -

Rick Astley

-

Singer, Songwriter

-
rick.astley@meme.com
-
+
+ Photo of Brock Tomlinson as of (Aug 29, 2021) +

Brock Tomlinson

+

Student Software Engineer

+
darkicewolf50@gmail.com
+
brock@eatsleepski.com
+

Interests

    -
  • Reading
    • +
  • Designing parts in CAD
  • Programming
    • -
  • Playing the violin
    • -
  • Running
    • -
  • Photography (see my work on Pinterest)
    • +
  • Playing the Drums
    • +
  • Swimming
    • +
  • Streaming (see my former work on Youtube)
    • +
  • Playing video games
    • +
  • Cooking
-

© Rick Astley

+

© Brock Tomlinson

\ No newline at end of file diff --git a/skills.html b/skills.html index 309bd2f..bdcbf09 100644 --- a/skills.html +++ b/skills.html @@ -4,7 +4,7 @@ - Rick Astley + Brock - Skills @@ -18,41 +18,66 @@
- Rick Asley -

Rick Astley

-

Singer, Songwriter

-
rick.astley@meme.com
+ Photo of Brock Tomlinson as of (Aug 29, 2021) +

Brock Tomlinson

+

Student Software Engineer

+
darkicewolf50@gmail.com
+
brock@eatsleepski.com

Skills

- Golang - -

-

- HTML - -

-

- Terraform - -

-

- CSS + Python

- JavaScript + HTML + +

+

+ Terraform

+

+ CSS + +

+

+ JavaScript + +

AWS

+

+ YAML + +

+

+ C + +

+

+ C++ + +

+

+ LUA + +

+

+ Java + +

+

+ Manufacturing With Steel + +

\ No newline at end of file diff --git a/style.css b/style.css index af8d80a..3e60e30 100644 --- a/style.css +++ b/style.css @@ -55,7 +55,7 @@ a { img { margin-top: 0px; border-radius: 60%; - height: 40%; + height: 20%; border: solid grey; } @@ -108,6 +108,11 @@ h5 { margin: 0px; } +h4 { + font-weight: lighter; + margin: 0px; +} + ul { list-style-type: '-'; padding-top: 2%; @@ -144,6 +149,7 @@ ul li { background-color: #fcfcfc; justify-content: center; display: flex; + flex-direction: column; padding-top: 5px; border-top: solid purple; margin-top: 5px; @@ -151,6 +157,7 @@ ul li { border-bottom: thin solid rgb(231, 231, 231); font-weight: lighter; font-size: large; + text-align: center; } nav p a{ @@ -169,6 +176,14 @@ ul li { justify-content: center; text-align: center; width: inherit; + height: 500px; + } + + img { + margin-top: 0px; + border-radius: 60%; + height: 50%; + border: solid grey; } article {