-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from AaronNBrock/bootstrap-refactor-typography
Bootstrap refactor typography
- Loading branch information
Showing
51 changed files
with
1,311 additions
and
2,300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,10 @@ | ||
| // html{ | ||
| // scroll-behavior: smooth; | ||
| // } | ||
|
|
||
| // body { | ||
| // background: $body-color; | ||
| // } | ||
|
|
||
| .section{ | ||
| padding: 100px 0; | ||
| } | ||
|
|
||
| .unstyle-list { | ||
| list-style-type: none; | ||
| padding-left: 0; | ||
| margin-right: 0; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,64 @@ | ||
| @import url('https://fonts.googleapis.com/css?family=Poppins:400,500,600,700,800,900|Yeseva+One&display=swap'); | ||
| .base-font { | ||
| font-family: $font-family-base; | ||
| } | ||
|
|
||
| // body{ | ||
| // font-family: $primary-font; | ||
| // font-size: 16px; | ||
| // color: $text-color; | ||
| // } | ||
| * { | ||
| transition: all 0.3s ease; | ||
| } | ||
|
|
||
| // h1, h2, h3, h4, h5, h6{ | ||
| // font-family: $primary-font; | ||
| // font-weight: 600; | ||
| // color: $text-color-dark; | ||
| // } | ||
| a.text-light, | ||
| a.text-dark { | ||
| // transition: all 0.3s ease; | ||
| &:hover { | ||
| color: $primary !important; | ||
| } | ||
| } | ||
|
|
||
| // p{ | ||
| // font-size: 16px; | ||
| // color: $text-color; | ||
| // } | ||
| .top-title { | ||
| font-size: 20px; | ||
| display: block; | ||
| color: $dark; | ||
| @extend .mb-3; | ||
| } | ||
|
|
||
| // h1{ | ||
| // font-size: 60px; | ||
| // } | ||
| .pre-line { | ||
| margin-left: 20px; | ||
| position: relative; | ||
| &::before { | ||
| position: absolute; | ||
| content: ""; | ||
| height: 2px; | ||
| width: 20px; | ||
| top: 50%; | ||
| left: -20px; | ||
| transform: translateX(-50%); | ||
| background: $secondary; | ||
| } | ||
| } | ||
|
|
||
| // h2{ | ||
| // font-size: 50px; | ||
| // } | ||
|
|
||
| // h3{ | ||
| // font-size: 30px; | ||
| // } | ||
|
|
||
| // h4{ | ||
| // font-size: 25px; | ||
| // } | ||
|
|
||
| // h5{ | ||
| // font-size: 18px; | ||
| // } | ||
|
|
||
| // h6{ | ||
| // font-size: 15px; | ||
| // font-weight: 300; | ||
| // } | ||
| // This fixes the fact that with `markdownify` we can't add `text-light` | ||
| // directly onto the generated `h1`, `h2` etc. | ||
| .text-white { | ||
| h1, | ||
| h2, | ||
| h3, | ||
| h4, | ||
| h5, | ||
| h6 { | ||
| color: $white; | ||
| } | ||
| } | ||
| @each $color, $value in $theme-colors { | ||
| .text-#{$color} { | ||
| h1, | ||
| h2, | ||
| h3, | ||
| h4, | ||
| h5, | ||
| h6, | ||
| p, | ||
| span { | ||
| color: $value; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,35 @@ | ||
| //site color variables | ||
| $primary-color: #5D78FF; | ||
| $secondary-color: #282F49; | ||
| $text-color: #9D9EA5; | ||
| $text-color-dark: #00113E; | ||
| $site-ease: cubic-bezier(0.36, 0.03, 0, 0.91); | ||
| $gray: #F7F9FF; | ||
| $dark-gray: #646569; | ||
| // | ||
| // Colors | ||
| // | ||
|
|
||
| // solid colors | ||
| $white: #fff; | ||
| $black: #000; | ||
| // General | ||
| $primary: #5d78ff; | ||
| $secondary: #282f49; | ||
| // Text | ||
| $headings-color: #282f49; | ||
| $body-color: #7e7e8a; | ||
|
|
||
| // Font Variables | ||
| $primary-font: 'Yeseva One', cursive; | ||
| $secondary-font: 'Poppins', sans-serif; | ||
| // | ||
| // Typography | ||
| // | ||
|
|
||
| // Bootstrap Variables | ||
| $primary: #5D78FF; | ||
| // Fonts | ||
| @import url("https://fonts.googleapis.com/css?family=Poppins:400,500,600,700,800,900|Yeseva+One&display=swap"); | ||
| $font-family-base: "Poppins", sans-serif; | ||
| $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: 22px; | ||
| $h6-font-size: 16px; | ||
|
|
||
| // Spacing | ||
| $headings-margin-bottom: 1.5rem; | ||
| $line-height-base: 1.75; | ||
|
|
||
| // Misc | ||
| $link-hover-decoration: none; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.