From d0d38bf0347cdea7975e66d22396e7585c93642e Mon Sep 17 00:00:00 2001 From: "Aaron N. Brock" Date: Sat, 3 Oct 2020 00:09:49 -0400 Subject: [PATCH] remove most custom formatting --- assets/scss/_typography.scss | 20 ++++- assets/scss/_variables.scss | 23 +++-- assets/scss/components/_about-section.scss | 35 -------- assets/scss/components/_blog-section.scss | 41 --------- assets/scss/components/_hero-section.scss | 46 +++------- .../scss/components/_portfolio-section.scss | 42 +-------- assets/scss/components/_resume-section.scss | 87 +------------------ assets/scss/components/_service-section.scss | 34 -------- assets/scss/components/_skill-section.scss | 27 ------ .../scss/components/_testimonial-section.scss | 14 --- layouts/partials/aboutSection.html | 20 ++--- layouts/partials/blogSection.html | 4 +- layouts/partials/hero.html | 5 +- layouts/partials/portfolioSection.html | 4 +- layouts/partials/resumeSection.html | 16 ++-- layouts/partials/serviceSection.html | 8 +- layouts/partials/skillSection.html | 4 +- layouts/partials/testimonialSection.html | 2 +- 18 files changed, 80 insertions(+), 352 deletions(-) diff --git a/assets/scss/_typography.scss b/assets/scss/_typography.scss index 9dfed94..1b1d988 100644 --- a/assets/scss/_typography.scss +++ b/assets/scss/_typography.scss @@ -11,7 +11,25 @@ a.text-light, a.text-dark { } } - +.top-title{ + font-size: 20px; + position: relative; + display: block; + margin-bottom: 30px; +} +.pre-line{ + margin-left: 20px; + &::before{ + position: absolute; + content: ''; + height: 2px; + width: 20px; + top: 50%; + left: -20px; + transform: translateX(-50%); + background: $secondary-color; + } +} // body{ // font-family: $primary-font; // font-size: 16px; diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss index 72811c4..3095b96 100644 --- a/assets/scss/_variables.scss +++ b/assets/scss/_variables.scss @@ -39,11 +39,18 @@ $headings-font-family: 'Yeseva One', cursive; // Size $font-size-base: 1.125rem; // 18px -$h1-font-size: 60px; -$h2-font-size: 50px; -$h3-font-size: 30px; -$h4-font-size: 25px; -$h5-font-size: 25px; -$h6-font-size: 15px; - -$link-hover-decoration: none; +$h1-font-size: 60px; +$h2-font-size: 50px; +$h3-font-size: 30px; +$h4-font-size: 25px; +$h5-font-size: 25px; +$h6-font-size: 15px; + +// Spacing +$headings-margin-bottom: 1.5rem; +$line-height-base: 1.75; + + + +// Misc +$link-hover-decoration: none; diff --git a/assets/scss/components/_about-section.scss b/assets/scss/components/_about-section.scss index 6366046..03d6e21 100644 --- a/assets/scss/components/_about-section.scss +++ b/assets/scss/components/_about-section.scss @@ -1,20 +1,5 @@ .about { overflow: hidden; - &_header { - margin-bottom: 60px; - span { - display: block; - font-size: 20px; - font-family: $secondary-font; - margin: 0 0 30px 0; - } - h1 { - margin: 0 0 20px 0; - } - p { - font-size: 18px; - } - } &_content { display: flex; align-items: center; @@ -84,26 +69,6 @@ display: none; } } - h3 { - margin: 0 0 35px 0; - } - p { - margin: 0 0 35px 0; - } - ul { - margin: 0; - padding: 0; - li { - list-style: none; - display: inline-block; - &:not(:last-child) { - margin-right: 10px; - @include mobile-s { - margin-bottom: 10px; - } - } - } - } } } } diff --git a/assets/scss/components/_blog-section.scss b/assets/scss/components/_blog-section.scss index cdce9ec..3273de0 100644 --- a/assets/scss/components/_blog-section.scss +++ b/assets/scss/components/_blog-section.scss @@ -16,30 +16,6 @@ display: none; } } - &__header{ - span{ - font-size: 20px; - position: relative; - display: block; - margin: 0 0 20px 30px; - &::before{ - position: absolute; - content: ''; - height: 2px; - width: 20px; - top: 50%; - left: -20px; - transform: translateX(-50%); - background: $secondary-color; - } - } - h2{ - margin: 0 0 30px 0; - } - p{ - margin: 0 0 0 0; - } - } &__header_button{ position: relative; width: 100%; @@ -49,27 +25,10 @@ bottom: 0; right: 0; display: inline-block; - // padding: 15px 40px; - // background: #fff; - // border: 1px solid #E4E6EB; - // border-radius: 7px; - // font-family: $secondary-font; - // text-decoration: none; - // font-size: 17px; - // color: #282F49; - // transition: all .3s ease; - // transform: scale(1); @include desktop{ position: relative; margin-top: 30px; } - // &:hover{ - // background: $primary-color; - // border: 1px solid transparent; - // color: #fff; - // transform: scale(1.03); - // box-shadow: 0 8px 20px rgba(56, 87, 241, 0.3); - // } } } &__item{ diff --git a/assets/scss/components/_hero-section.scss b/assets/scss/components/_hero-section.scss index c52c68b..0965634 100644 --- a/assets/scss/components/_hero-section.scss +++ b/assets/scss/components/_hero-section.scss @@ -29,6 +29,7 @@ } } &_content { + padding: 0 20px 0 0; position: relative; @include desktop { text-align: center; @@ -57,43 +58,20 @@ @include desktop { display: inline-block; } - &::before { - position: absolute; - content: ""; - height: 2px; - width: 20px; - top: 50%; - left: -20px; - transform: translateX(-50%); - background: $secondary-color; - } - } - h1 { - margin: 0 0 30px 0; + // &::before { + // position: absolute; + // content: ""; + // height: 2px; + // width: 20px; + // top: 50%; + // left: -20px; + // transform: translateX(-50%); + // background: $secondary-color; + // } } p { - margin: 0 0 50px 0; - font-size: 20px; + font-size: $font-size-lg; } - - // a { - // display: inline-block; - // padding: 20px 50px; - // font-family: $secondary-font; - // font-size: 16px; - // background: $primary-color; - // border-radius: 7px; - // color: #ffffff; - // text-decoration: none; - // border: 1px solid transparent; - // transition: all 0.3s ease; - // transform: scale(1); - // &:hover { - // background: #425fee; - // box-shadow: 0 8px 20px rgba(56, 87, 241, 0.3); - // transform: scale(1.03); - // } - // } } &_figure { width: 90%; diff --git a/assets/scss/components/_portfolio-section.scss b/assets/scss/components/_portfolio-section.scss index a506ead..8efb9e8 100644 --- a/assets/scss/components/_portfolio-section.scss +++ b/assets/scss/components/_portfolio-section.scss @@ -3,29 +3,13 @@ @include desktop { padding: 100px 0; } - &__header { - margin-bottom: 80px; - @include tablet { - margin-bottom: 50px; - } - span { - display: block; - font-size: 20px; - font-family: $secondary-font; - margin: 0 0 30px 0; - } - h2 { - @include tablet { - font-size: 40px; - } - } - } &-item { width: 50%; padding: 30px; @include tablet { width: 100%; padding: 0; + margin: 0; } &:nth-child(4n-3) { padding-right: 70px; @@ -45,7 +29,6 @@ &-grid { display: flex; flex-wrap: wrap; - margin: 0 -30px; } &-thumb { transition: 0.3s ease; @@ -54,35 +37,16 @@ } &-content { span { - font-family: $secondary-font; color: #7e7e8a; font-size: 18px; line-height: 1; display: block; margin: 28px 0 20px 0; } - // h3 { - // margin: 0 0 20px 0; - // a { - // font-family: $primary-font; - // color: $secondary-color; - // font-size: 25px; - // line-height: 40px; - // transition: all 0.3s ease; - // display: block; - // &:hover { - // text-decoration: none; - // color: $primary-color; - // } - // } - // } .see-more-btn { - text-decoration: none; display: inline-block; - font-family: $secondary-font; - color: $primary-color; + color: $primary; position: relative; - font-size: 17px; margin: 0 0 0 30px; transform: scaleY(0); transform-origin: bottom center; @@ -92,7 +56,7 @@ content: ""; height: 2px; width: 20px; - background: $primary-color; + background: $primary; top: 50%; left: -30px; transform: translateY(-50%); diff --git a/assets/scss/components/_resume-section.scss b/assets/scss/components/_resume-section.scss index 0ba809e..0566cb1 100644 --- a/assets/scss/components/_resume-section.scss +++ b/assets/scss/components/_resume-section.scss @@ -25,73 +25,8 @@ margin-bottom: 30px; } span{ - font-size: 20px; - position: relative; - display: block; - margin: 0 0 20px 30px; &::before{ - position: absolute; - content: ''; - height: 2px; - width: 20px; - top: 50%; - left: -20px; - transform: translateX(-50%); - background: $white; - } - } - h2{ - margin: 0 0 30px 0; - } - p{ - font-size: 18px; - } - ul{ - margin: 40px 0 0 0; - padding: 0; - &.nav-tabs{ - border-bottom: none; - } - li{ - list-style: none; - display: inline-block; - // a { - // padding: 15px 40px; - // text-decoration: none; - // display: block; - // background: $white; - // color: $secondary-color; - // font-family: $secondary-font; - // font-size: 16px; - // transition: all .3s ease; - // @include mobile-s{ - // padding: 15px 28px; - // } - // &:hover{ - // background: #425FEE; - // color: $white; - // box-shadow: 0 8px 20px 0 rgba(56, 87, 241, 0.30); - // } - // &.active{ - // background: $primary-color; - // color: $white; - // box-shadow: 0 8px 20px 0 rgba(56, 87, 241, 0.30); - // &:hover{ - // background: #425FEE; - // } - // } - // } - &:nth-child(1){ - a{ - border-radius: 7px 0 0 7px; - } - } - &:nth-child(2){ - margin-left: -5px; - a{ - border-radius: 0 7px 7px 0; - } - } + background: $light; } } } @@ -103,29 +38,9 @@ margin-bottom: 30px; box-shadow: 0px 20px 40px 0px rgba(50, 65, 141, 0.12); span{ - color: $primary; display: block; margin: 0 0 20px 30px; position: relative; - line-height: 1; - &::before{ - position: absolute; - content: ''; - height: 2px; - width: 20px; - top: 50%; - left: -20px; - transform: translateX(-50%); - background: $secondary-color; - } - } - h4{ - margin: 0 0 30px 0; - line-height: 1; - } - p{ - line-height: 34px; - margin: 0; } } } diff --git a/assets/scss/components/_service-section.scss b/assets/scss/components/_service-section.scss index 26b77ff..cc3d76d 100644 --- a/assets/scss/components/_service-section.scss +++ b/assets/scss/components/_service-section.scss @@ -35,37 +35,6 @@ display: none; } } - &__header{ - margin-bottom: 50px; - span{ - font-size: 20px; - font-family: $secondary-font; - color: $secondary-color; - position: relative; - display: block; - margin: 0 0 20px 30px; - &::before{ - position: absolute; - content: ''; - height: 2px; - width: 20px; - top: 50%; - left: -20px; - transform: translateX(-50%); - background: $secondary-color; - } - } - h2{ - margin: 0 0 30px 0; - font-size: 50px; - @include tablet{ - font-size: 39px; - } - } - p{ - font-size: 18px; - } - } &__slider{ &_item{ margin: 15px; @@ -89,9 +58,6 @@ z-index: 1; } } - h4{ - margin: 40px 0 30px 0; - } } .slick-list { overflow: visible; diff --git a/assets/scss/components/_skill-section.scss b/assets/scss/components/_skill-section.scss index 138b7d5..1b28e9b 100644 --- a/assets/scss/components/_skill-section.scss +++ b/assets/scss/components/_skill-section.scss @@ -66,33 +66,6 @@ margin-left: 0; margin-top: 30px; } - &_heading { - margin-bottom: 40px; - span { - font-size: 20px; - font-family: $secondary-font; - color: $secondary-color; - position: relative; - display: block; - margin: 0 0 20px 30px; - &::before { - position: absolute; - content: ""; - height: 2px; - width: 20px; - top: 50%; - left: -20px; - transform: translateX(-50%); - background: $secondary-color; - } - } - h2 { - margin: 0 0 30px 0; - } - p { - margin: 0 0 0 0; - } - } &_item { &.js-animation { transition: all 0.3s ease; diff --git a/assets/scss/components/_testimonial-section.scss b/assets/scss/components/_testimonial-section.scss index e9db33b..4f97644 100644 --- a/assets/scss/components/_testimonial-section.scss +++ b/assets/scss/components/_testimonial-section.scss @@ -21,20 +21,6 @@ display: none; } } - &__header { - margin-bottom: 50px; - span { - display: block; - font-size: 20px; - font-family: $secondary-font; - margin: 0 0 30px 0; - } - h2 { - @include tablet { - font-size: 40px; - } - } - } &__slider { &_item { background: $white; diff --git a/layouts/partials/aboutSection.html b/layouts/partials/aboutSection.html index f15924b..0001da7 100644 --- a/layouts/partials/aboutSection.html +++ b/layouts/partials/aboutSection.html @@ -4,8 +4,8 @@
-
- {{ .topTitle }} +
+ {{ .topTitle }} {{ .title | markdownify}}
@@ -39,17 +39,15 @@
-
+
{{ .content | markdownify}}
- +
+ {{ .button1Name }} + + {{ .button2Name }} +
diff --git a/layouts/partials/blogSection.html b/layouts/partials/blogSection.html index 747c6ef..962e820 100644 --- a/layouts/partials/blogSection.html +++ b/layouts/partials/blogSection.html @@ -8,13 +8,13 @@
- {{ .topTitle }} + {{ .topTitle }} {{ .title | markdownify }}
- See all post + See all post
diff --git a/layouts/partials/hero.html b/layouts/partials/hero.html index 580d259..21c9935 100644 --- a/layouts/partials/hero.html +++ b/layouts/partials/hero.html @@ -27,11 +27,10 @@ -
- {{ .topTitle }} +
+ {{ .topTitle }} {{ .content | markdownify }}
-

{{ .buttonName }}
diff --git a/layouts/partials/portfolioSection.html b/layouts/partials/portfolioSection.html index 607ad30..03b6423 100644 --- a/layouts/partials/portfolioSection.html +++ b/layouts/partials/portfolioSection.html @@ -4,8 +4,8 @@
-
- {{ .topTitle }} +
+ {{ .topTitle }} {{ .title | markdownify }}
diff --git a/layouts/partials/resumeSection.html b/layouts/partials/resumeSection.html index 38f7d5e..7b5d44b 100644 --- a/layouts/partials/resumeSection.html +++ b/layouts/partials/resumeSection.html @@ -7,16 +7,14 @@
- {{ .topTitle }} + {{ .topTitle }} {{ .title | markdownify }}
- +
+ {{ .tab1Name }} + {{ .tab2Name }} +
@@ -25,7 +23,7 @@ {{ $Section := .education }} {{ range $Section }}
- {{ .time }} + {{ .time }} {{ .content | markdownify }}
{{ end }} @@ -36,7 +34,7 @@ {{ $Section := .experience }} {{ range $Section }}
- {{ .time }} + {{ .time }} {{ .content | markdownify }}
{{ end }} diff --git a/layouts/partials/serviceSection.html b/layouts/partials/serviceSection.html index 0dd8671..f414575 100644 --- a/layouts/partials/serviceSection.html +++ b/layouts/partials/serviceSection.html @@ -29,8 +29,8 @@
-
- {{ .topTitle }} +
+ {{ .topTitle }} {{ .title | markdownify }}
@@ -54,7 +54,9 @@ ui-ux
- {{ .content | markdownify }} +
+ {{ .content | markdownify }} +
{{ end }}
diff --git a/layouts/partials/skillSection.html b/layouts/partials/skillSection.html index d7b6e3c..6fd1359 100644 --- a/layouts/partials/skillSection.html +++ b/layouts/partials/skillSection.html @@ -37,8 +37,8 @@
-
- {{ .topTitle }} +
+ {{ .topTitle }} {{ .content | markdownify }}
{{ $section := .skill }} diff --git a/layouts/partials/testimonialSection.html b/layouts/partials/testimonialSection.html index ddc3f70..0c3da60 100644 --- a/layouts/partials/testimonialSection.html +++ b/layouts/partials/testimonialSection.html @@ -10,7 +10,7 @@
- {{ .topTitle }} + {{ .topTitle }} {{ .title | markdownify }}