diff --git a/requirement/image/company-logo/bit-bee.png b/requirement/image/company-logo/bit-bee.png new file mode 100644 index 00000000..c2cf3316 Binary files /dev/null and b/requirement/image/company-logo/bit-bee.png differ diff --git a/src/_asset/image/company-logo/arcadia.png b/src/_asset/image/company-logo/arcadia.png new file mode 100644 index 00000000..21c5e6a3 Binary files /dev/null and b/src/_asset/image/company-logo/arcadia.png differ diff --git a/src/_asset/image/company-logo/argus.png b/src/_asset/image/company-logo/argus.png new file mode 100644 index 00000000..64a63209 Binary files /dev/null and b/src/_asset/image/company-logo/argus.png differ diff --git a/src/_asset/image/company-logo/big-telematics.png b/src/_asset/image/company-logo/big-telematics.png new file mode 100644 index 00000000..de2801bb Binary files /dev/null and b/src/_asset/image/company-logo/big-telematics.png differ diff --git a/src/_asset/image/company-logo/bit-bee.png b/src/_asset/image/company-logo/bit-bee.png new file mode 100644 index 00000000..c2cf3316 Binary files /dev/null and b/src/_asset/image/company-logo/bit-bee.png differ diff --git a/src/_asset/image/company-logo/chemist-direct.png b/src/_asset/image/company-logo/chemist-direct.png new file mode 100644 index 00000000..4e95b6af Binary files /dev/null and b/src/_asset/image/company-logo/chemist-direct.png differ diff --git a/src/_asset/image/company-logo/colab.png b/src/_asset/image/company-logo/colab.png new file mode 100644 index 00000000..2870ff31 Binary files /dev/null and b/src/_asset/image/company-logo/colab.png differ diff --git a/src/_asset/image/company-logo/content-formula.png b/src/_asset/image/company-logo/content-formula.png new file mode 100644 index 00000000..207e0093 Binary files /dev/null and b/src/_asset/image/company-logo/content-formula.png differ diff --git a/src/_asset/image/company-logo/direct-line-group.png b/src/_asset/image/company-logo/direct-line-group.png new file mode 100644 index 00000000..71aa3b5d Binary files /dev/null and b/src/_asset/image/company-logo/direct-line-group.png differ diff --git a/src/_asset/image/company-logo/fifth9.png b/src/_asset/image/company-logo/fifth9.png new file mode 100644 index 00000000..ceb617a3 Binary files /dev/null and b/src/_asset/image/company-logo/fifth9.png differ diff --git a/src/_asset/image/company-logo/rma.png b/src/_asset/image/company-logo/rma.png new file mode 100644 index 00000000..dda57e93 Binary files /dev/null and b/src/_asset/image/company-logo/rma.png differ diff --git a/src/_asset/image/company-logo/romaris.png b/src/_asset/image/company-logo/romaris.png new file mode 100644 index 00000000..728e89cb Binary files /dev/null and b/src/_asset/image/company-logo/romaris.png differ diff --git a/src/_asset/image/company-logo/solera.png b/src/_asset/image/company-logo/solera.png new file mode 100644 index 00000000..d197ba7c Binary files /dev/null and b/src/_asset/image/company-logo/solera.png differ diff --git a/src/_asset/image/company-logo/zeus-media.png b/src/_asset/image/company-logo/zeus-media.png new file mode 100644 index 00000000..e7423504 Binary files /dev/null and b/src/_asset/image/company-logo/zeus-media.png differ diff --git a/src/_component/about-me/about-me.pug b/src/_component/about-me/about-me.pug index c8ee2dd6..8badecf5 100644 --- a/src/_component/about-me/about-me.pug +++ b/src/_component/about-me/about-me.pug @@ -12,6 +12,7 @@ include ../section-title/section-title .description-box__with-shadow each description in data['about-me'].descriptionList p.description=description + .column(span="row") .column(span="row" height='10px') .button.button__pill--green diff --git a/src/_component/config/reusable.scss b/src/_component/config/reusable.scss new file mode 100644 index 00000000..1eb194f6 --- /dev/null +++ b/src/_component/config/reusable.scss @@ -0,0 +1,5 @@ +%rounder-border-list { + border-radius: 6px; + border: 2px solid #707070; + list-style-type: none; +} diff --git a/src/_component/experience/experience.pug b/src/_component/experience/experience.pug new file mode 100644 index 00000000..077e396f --- /dev/null +++ b/src/_component/experience/experience.pug @@ -0,0 +1,13 @@ +- var sectionTitle = data.experience.sectionTitle; +include ../section-title/section-title + +.column(span="row" height='10px') +.column(span="row") + ul.experience__list + each job in data.experience.jobList + li=job.jobTitle +.column(span="row") +.column(span="row" height='10px') + button.button__disc--blue + i.icon__arrow-down +.column(span="row" height='10px') \ No newline at end of file diff --git a/src/_component/experience/experience.scss b/src/_component/experience/experience.scss new file mode 100644 index 00000000..73f774d8 --- /dev/null +++ b/src/_component/experience/experience.scss @@ -0,0 +1,3 @@ +.experience__list { + @extend %rounder-border-list +} \ No newline at end of file diff --git a/src/_component/skills/skills.pug b/src/_component/skills/skills.pug index dad116f9..7482d457 100644 --- a/src/_component/skills/skills.pug +++ b/src/_component/skills/skills.pug @@ -19,4 +19,9 @@ each skillType in data.skills.skillTypeList )=skill.label .column(span="row") .description-box__with-shadow - p.description=data.skills.description \ No newline at end of file + p.description=data.skills.description + .column(span="row") +.column(span="row" height='10px') + button.button__disc--blue + i.icon__arrow-down +.column(span="row" height='10px') diff --git a/src/_component/skills/skills.scss b/src/_component/skills/skills.scss index aca0a6a4..e68a01ec 100644 --- a/src/_component/skills/skills.scss +++ b/src/_component/skills/skills.scss @@ -1,7 +1,5 @@ .skills__list { - border-radius: 6px; - border: 2px solid #707070; - list-style-type: none; + @extend %rounder-border-list } .skills__item { diff --git a/src/_data/experience.json b/src/_data/experience.json new file mode 100644 index 00000000..65f5ac66 --- /dev/null +++ b/src/_data/experience.json @@ -0,0 +1,27 @@ +{ + "sectionTitle": "Experience", + "jobList": [ + { + "jobTitle": "Starter Web Developer", + "startDate": "2020 August", + "endDate": "2020 November", + "iconPath": "bit-bee.png", + "companyName": "BitBee", + "moreInfoList": [ + "esklfjiekgjiekfjjdfheisjfeksjdf", + "hedfueifhdiufheiufhuierhfuie" + ] + }, + { + "jobTitle": "Junior Web Developer", + "startDate": "2020 November", + "endDate": "Present", + "iconPath": "chemist-direct.png", + "companyName": "Chemist Direct", + "moreInfoList": [ + "esklfjiekgjiekfjjdfheisjfeksjdf", + "hedfueifhdiufheiufhuierhfuie" + ] + } + ] +} \ No newline at end of file diff --git a/src/index.pug b/src/index.pug index db14bc27..50bb94c7 100644 --- a/src/index.pug +++ b/src/index.pug @@ -10,3 +10,4 @@ html include _component/about-me/about-me.pug include _component/connect/connect.pug include _component/skills/skills.pug + include _component/experience/experience.pug diff --git a/src/style.scss b/src/style.scss index a37da607..e3ed16ec 100644 --- a/src/style.scss +++ b/src/style.scss @@ -1,3 +1,4 @@ +@import "_component/config/reusable"; @import "_component/layout/roboto-font"; @import "_component/layout/layout"; @import "_component/about-me/about-me";