Skip to content
This repository was archived by the owner on Dec 11, 2021. It is now read-only.

Commit e1e7ae1

Browse files
Build: minor style tweaks
1 parent 87da451 commit e1e7ae1

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

typography.html renamed to demos/typography.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<title>CSS Chasis - Typography</title>
77
<meta name="description" content="Typography skeleton for styling">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
<link rel="stylesheet" href="dist/css/chassis.css">
9+
<link rel="stylesheet" href="../dist/css/chassis.css">
10+
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic,700italic' rel='stylesheet' type='text/css'>
1011
<style>
1112
body {
1213
max-width: 700px;
@@ -129,7 +130,7 @@ <h2>Text-level elements</h2>
129130
<li>abbreviation: <abbr title="Syntactically Awesome Stylesheets">SASS</abbr> &lt;abbr&gt;</li>
130131
<li><b>bold</b> &lt;b&gt;</li>
131132
<li>citation: <cite>A Study in Scarlet</cite> &lt;cite&gt;</li>
132-
<li>code: <code>&lt;-- @include _hammer --&gt;</code> &lt;code&gt;</li>
133+
<li>Here's the <code>&lt;code&gt;</code> element</li>
133134
<li>deleted text: <del>Episodes I, II, III</del> &lt;del&gt;</li>
134135
<li>definition: The <dfn>definition element</dfn> is the element being defined inline. &lt;dfn&gt;</li>
135136
<li><em>emphasis</em> &lt;em&gt;</li>

scss/atoms/typography/_typography.scss

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
"variables",
77
"functions";
88

9-
// TODO probably should do the import in the `head` in case character sets need to change dynamically
10-
@import url( http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic,700italic );
11-
129
body {
1310
font: $normal #{ map-get( $root-font, font-size ) }/1.5 $sans-serif;
1411

@@ -20,39 +17,40 @@ body {
2017
}
2118
}
2219

23-
h1,
24-
h2,
25-
h3,
26-
h4,
27-
h5,
28-
h6 {
29-
font-weight: 600;
30-
line-height: 1;
31-
}
32-
3320
h1 {
3421
font-size: em( 67px ); // 54px works nicely, as well
3522
font-weight: 700;
23+
line-height: 1;
3624
}
3725

3826
h2 {
3927
font-size: em( 36px );
28+
font-weight: 600;
29+
line-height: 1;
4030
}
4131

4232
h3 {
4333
font-size: em( 30px );
34+
font-weight: 600;
35+
line-height: 1;
4436
}
4537

4638
h4 {
4739
font-size: em( 24px );
40+
font-weight: 600;
41+
line-height: 1;
4842
}
4943

5044
h5 {
5145
font-size: em( 20px );
46+
font-weight: 600;
47+
line-height: 1;
5248
}
5349

5450
h6 {
5551
font-size: em( 16px );
52+
font-weight: 600;
53+
line-height: 1;
5654
text-transform: uppercase;
5755
}
5856

@@ -69,7 +67,7 @@ blockquote {
6967
margin: 0;
7068
padding-left: 1em;
7169
position: relative;
72-
border-left: 4px solid #eee;
70+
border-left: 4px solid #eee; // TODO replace with color variable
7371
font-style: italic;
7472
}
7573

@@ -122,3 +120,10 @@ b,
122120
strong {
123121
font-weight: $bold;
124122
}
123+
124+
code {
125+
background: #f2f2f2; // TODO replace with color variable
126+
font-size: em( 16px );
127+
padding: em( 4px, 16px ) em( 8px, 16px );
128+
border-radius: 3px;
129+
}

0 commit comments

Comments
 (0)