1
0
mirror of https://github.com/kremalicious/blog.git synced 2024-11-22 09:56:51 +01:00

switch typography

This commit is contained in:
Matthias Kretschmann 2013-11-23 22:05:58 +01:00
parent 37726d9dcd
commit 234a42f5b8
5 changed files with 7 additions and 17 deletions

View File

@ -5,9 +5,6 @@
.btn { .btn {
font-size: @font-size-small; font-size: @font-size-small;
line-height: 1em; line-height: 1em;
font-family: @headings-font-family;
font-weight: @headings-font-weight;
font-style: normal;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
vertical-align: middle; vertical-align: middle;
@ -68,9 +65,6 @@ a.btn-primary:visited {
.btn-tag { .btn-tag {
line-height: @line-height-base; line-height: @line-height-base;
font-family: @headings-font-family;
font-weight: @headings-font-weight;
font-style: normal;
text-align: center; text-align: center;
text-transform: lowercase; text-transform: lowercase;
vertical-align: middle; vertical-align: middle;

View File

@ -17,7 +17,7 @@
margin-top: 0; margin-top: 0;
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
.format-link & { .h4; } .format-link & { .h3; }
} }
// post content // post content

View File

@ -37,10 +37,6 @@ a.nav-main-link {
.pager { .pager {
.clearfix; .clearfix;
font-family: @headings-font-family;
font-weight: @headings-font-weight;
line-height: @headings-line-height;
.h6;
p { position: relative; } p { position: relative; }
a { display: block; } a { display: block; }

View File

@ -51,9 +51,9 @@ h6 {
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
} }
h1, .h1 { font-size: ceil(@font-size-base * 2.25); } h1, .h1 { font-size: ceil(@font-size-base * 2.75); }
h2, .h2 { font-size: ceil(@font-size-base * 1.70); } h2, .h2 { font-size: ceil(@font-size-base * 2); }
h3, .h3 { font-size: ceil(@font-size-base * 1.60); } h3, .h3 { font-size: ceil(@font-size-base * 1.5); }
h4, .h4 { font-size: ceil(@font-size-base * 1.35); } h4, .h4 { font-size: ceil(@font-size-base * 1.35); }
h5, .h5 { font-size: ceil(@font-size-base * 1.1); } h5, .h5 { font-size: ceil(@font-size-base * 1.1); }
h6, .h6 { font-size: @font-size-base; } h6, .h6 { font-size: @font-size-base; }

View File

@ -11,11 +11,11 @@
// Typography // 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-serif: 'rooney-web',Georgia,Palatino,'Palatino Linotype',Times,'Times New Roman',serif;
@font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace; @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-weight-base: 400;
@font-size-base: 18px; @font-size-base: 18px;
@ -26,7 +26,7 @@
@line-height-base: 1.5; // 27/18 @line-height-base: 1.5; // 27/18
@line-height-computed: floor(@font-size-base * @line-height-base); @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-font-weight: 500;
@headings-line-height: 1.1; @headings-line-height: 1.1;