diff --git a/_src/assets/less/buttons.less b/_src/assets/less/buttons.less index c9752f61..7c94deff 100644 --- a/_src/assets/less/buttons.less +++ b/_src/assets/less/buttons.less @@ -5,9 +5,6 @@ .btn { font-size: @font-size-small; line-height: 1em; - font-family: @headings-font-family; - font-weight: @headings-font-weight; - font-style: normal; text-align: center; text-transform: uppercase; vertical-align: middle; @@ -68,9 +65,6 @@ a.btn-primary:visited { .btn-tag { line-height: @line-height-base; - font-family: @headings-font-family; - font-weight: @headings-font-weight; - font-style: normal; text-align: center; text-transform: lowercase; vertical-align: middle; diff --git a/_src/assets/less/content.less b/_src/assets/less/content.less index 5ab1bbe7..bcdefc5d 100644 --- a/_src/assets/less/content.less +++ b/_src/assets/less/content.less @@ -17,7 +17,7 @@ margin-top: 0; margin-bottom: @line-height-computed; - .format-link & { .h4; } + .format-link & { .h3; } } // post content diff --git a/_src/assets/less/navigation.less b/_src/assets/less/navigation.less index 3fed52ae..3fa19bd9 100644 --- a/_src/assets/less/navigation.less +++ b/_src/assets/less/navigation.less @@ -37,10 +37,6 @@ a.nav-main-link { .pager { .clearfix; - font-family: @headings-font-family; - font-weight: @headings-font-weight; - line-height: @headings-line-height; - .h6; p { position: relative; } a { display: block; } diff --git a/_src/assets/less/typography.less b/_src/assets/less/typography.less index e79e30fd..f70cc31d 100644 --- a/_src/assets/less/typography.less +++ b/_src/assets/less/typography.less @@ -51,9 +51,9 @@ h6 { margin-bottom: @line-height-computed; } -h1, .h1 { font-size: ceil(@font-size-base * 2.25); } -h2, .h2 { font-size: ceil(@font-size-base * 1.70); } -h3, .h3 { font-size: ceil(@font-size-base * 1.60); } +h1, .h1 { font-size: ceil(@font-size-base * 2.75); } +h2, .h2 { font-size: ceil(@font-size-base * 2); } +h3, .h3 { font-size: ceil(@font-size-base * 1.5); } h4, .h4 { font-size: ceil(@font-size-base * 1.35); } h5, .h5 { font-size: ceil(@font-size-base * 1.1); } h6, .h6 { font-size: @font-size-base; } diff --git a/_src/assets/less/variables.less b/_src/assets/less/variables.less index 4536dc7a..801bc39a 100644 --- a/_src/assets/less/variables.less +++ b/_src/assets/less/variables.less @@ -11,11 +11,11 @@ // Typography ///////////////////////////////////// -@font-family-sans-serif: 'brandon-grotesque', 'Helvetica Neue', Helvetica, Arial, sans-serif; +@font-family-sans-serif: 'ff-tisa-sans-web-pro', 'Helvetica Neue', Helvetica, Arial, sans-serif; @font-family-serif: 'rooney-web',Georgia,Palatino,'Palatino Linotype',Times,'Times New Roman',serif; @font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace; -@font-family-base: @font-family-serif; +@font-family-base: @font-family-sans-serif; @font-weight-base: 400; @font-size-base: 18px; @@ -26,7 +26,7 @@ @line-height-base: 1.5; // 27/18 @line-height-computed: floor(@font-size-base * @line-height-base); -@headings-font-family: @font-family-sans-serif; +@headings-font-family: @font-family-serif; @headings-font-weight: 500; @headings-line-height: 1.1;