amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Typography auto-scroll List

Browse Source
This commit is contained in:
iRouge
2015-02-03 10:52:27 -05:00
committed by Francis Lachapelle
parent 36c931b596
commit 09fa2be5bd
6 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/scss/core/typography/typography.scss
+8 -8
View File
@@ -146,7 +146,7 @@ $md: $md-prefix;
$sg-rem-Base-value: 16 !global;
$sg-sp-value: (1 / $sg-rem-Base-value) !default; // sp value
$sg-md-baseline: 4px;
$sg-md-typo-baseline: 4px;
// Font-size basic scale (from Google)
// NiceToHave : generate with a loop
@@ -183,15 +183,15 @@ $sg-font-size-9: nth($sg-typo-scale, 9) * 1px;
// Basic line heights
// ----------------------------------------------------------------------------
$sg-line-height-1: $sg-font-size-1 + $sg-md-baseline;
$sg-line-height-1: $sg-font-size-1 + $sg-md-typo-baseline;
$sg-line-height-2: 20px;
$sg-line-height-3: 24px;
$sg-line-height-4: $sg-font-size-4 + $sg-md-baseline;
$sg-line-height-4: $sg-font-size-4 + $sg-md-typo-baseline;
$sg-line-height-5: 32px;
$sg-line-height-6: 40px;
$sg-line-height-7: $sg-font-size-7 + $sg-md-baseline;
$sg-line-height-8: $sg-font-size-8 + $sg-md-baseline;
$sg-line-height-9: $sg-font-size-9 + $sg-md-baseline;
$sg-line-height-7: $sg-font-size-7 + $sg-md-typo-baseline;
$sg-line-height-8: $sg-font-size-8 + $sg-md-typo-baseline;
$sg-line-height-9: $sg-font-size-9 + $sg-md-typo-baseline;
// Font weights
// Google Material Design specifications strongly recommend to avoid bold
// font weight. Here are some variables to define weights more conveniently
@@ -256,7 +256,7 @@ $h6-margin-Base: 2.33em 0;
@extend .#{$md}-body-1;
}
.#{$md}-body-2 {
$lineHeight : $sg-line-height-2 + $sg-md-baseline;
$lineHeight : $sg-line-height-2 + $sg-md-typo-baseline;
font-size: $sg-font-size-1;
line-height: $lineHeight;
font-weight: $sg-font-medium;
@@ -280,7 +280,7 @@ $h6-margin-Base: 2.33em 0;
@extend .#{$md}-subhead-1;
}
.#{$md}-subhead-2 {
$lineHeight : $sg-line-height-3 + $sg-md-baseline;
$lineHeight : $sg-line-height-3 + $sg-md-typo-baseline;
font-size: $sg-font-size-3;
line-height: $lineHeight;
font-weight: $sg-font-regular;