Skip to content

Commit da90990

Browse files
author
mrmrs
committed
Update display documentation with info from spec.
1 parent a2e0e53 commit da90990

File tree

2 files changed

+54
-32
lines changed

2 files changed

+54
-32
lines changed

docs/layout/display/index.html

+27-16
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
66
<title>
7-
Display / Layout / Docs / TACHYONS
7+
tachyons-display / Layout / Docs / TACHYONS
88
</title>
9-
<meta name="author" content="@mr3rs">
10-
<meta name="description" content="CSS">
9+
<meta name="author" content="@mrmrs">
10+
<meta name="description" content="">
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
12-
<link rel="stylesheet" href="/css/tachyons.css">
12+
<link rel="stylesheet" href="/css/tachyons.min.css">
1313
</head>
1414
<body class="w-100 sans-serif">
1515

@@ -42,7 +42,7 @@
4242
</header>
4343

4444
<main class="">
45-
<article class="bg-near-white bt b--black-10 ph3 pt3 ph5-ns">
45+
<article class="bg-near-white bt b--black-10 pa3 ph5-ns">
4646
<h4 class="f4 mv0 fw6 dib mr4">tachyons-display</h4>
4747
<span class="f4 b dib pl0 ml0 mr4">v3.0.3</span>
4848
<span class="f4 b dib pl0 ml0 mr4">238 B</span>
@@ -64,15 +64,26 @@ <h4 class="f4 mv0 fw6 dib mr4">tachyons-display</h4>
6464
<dd class="db pl0 ml0 f4 f2-ns b">1</dd>
6565
</dl>
6666
</div>
67+
<p class="measure f3 lh-copy">
68+
Single purpose classes for setting the display of an element at any breakpoint.
69+
</p>
70+
<blockquote class="i measure f4 lh-copy mh0">
71+
The display property defines box’s display type, which consists of the two basic qualities of how an element generates boxes:
72+
the inner display type, which defines the kind of formatting context it generates, dictating how its descendant boxes are laid out.
73+
the outer display type, which dictates how the box participates in its parent formatting context.
74+
<footer class="f6">
75+
- <a href="https://www.w3.org/TR/css-display-3/#the-display-properties" class="link dim black-70 i">CSS3 Display Module Spec</a>
76+
</footer>
77+
</blockquote>
6778
</article>
6879
<div class="ph3 ph5-ns pt4 pb5">
6980
<h2 class="f3 bold">Examples</h2>
7081
<h3 class="f5 book pt4 caps">Display Block</h3>
7182
<p>Block will inherently set width to 100% of its parent element. It will also cause a line break, even if the declared width doesn't take up the full width of the parent.</p>
72-
<div class="db bg-black-10 mbs">
83+
<div class="db bg-black-10 mb2">
7384
block
7485
</div>
75-
<div class="db bg-black-10 mbs mw4">
86+
<div class="db bg-black-10 mb2 mw4">
7687
block
7788
</div>
7889

@@ -84,33 +95,33 @@ <h3 class="f5 book pt4 caps">Display Inline-Block</h3>
8495
width: 25% to four elements they will not just render as a 4 column layout by
8596
default.
8697
</p>
87-
<div class="dib bg-black-10 mbs">
98+
<div class="dib bg-black-10 mb2">
8899
display: inline-block
89100
</div>
90-
<div class="dib bg-black-10 mbs">
101+
<div class="dib bg-black-10 mb2">
91102
display: inline-block
92103
</div>
93-
<div class="dib bg-black-10 mbs">
104+
<div class="dib bg-black-10 mb2">
94105
display: inline-block
95106
</div>
96-
<div class="dib bg-black-10 mbs">
107+
<div class="dib bg-black-10 mb2">
97108
display: inline-block
98109
</div>
99110

100111
<h3 class="f5 book pt4 caps">Display Inline</h3>
101112
<p class="measure">
102113
Set content inline. Inline doesn't respect height or width values. It does not render white space between elements.
103114
</p>
104-
<div class="di bg-black-10 mbs">
115+
<div class="di bg-black-10 mb2">
105116
display: inline
106117
</div>
107-
<div class="di bg-black-10 mbs">
118+
<div class="di bg-black-10 mb2">
108119
display: inline
109120
</div>
110-
<div class="di bg-black-10 mbs">
121+
<div class="di bg-black-10 mb2">
111122
display: inline
112123
</div>
113-
<div class="di bg-black-10 mbs">
124+
<div class="di bg-black-10 mb2">
114125
display: inline
115126
</div>
116127

@@ -120,7 +131,7 @@ <h3 class="f5 book pt4 caps">Display Table</h3>
120131
without table markup. This can be useful for vertically aligning content
121132
or for auto-calculating a variable amount of table cells.
122133
</p>
123-
<div class="dt bg-black-10 mbs">
134+
<div class="dt bg-black-10 mb2">
124135
<div class="dtc v-mid paxs bg-black-10">display</div>
125136
<div class="dtc v-mid paxs bg-black-20">table</div>
126137
<div class="dtc v-mid paxs bg-black-10">will automatically</div>

src/templates/docs/display/index.html

+27-16
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
66
<title>
7-
Display / Layout / Docs / TACHYONS
7+
<%= name %> / Layout / Docs / TACHYONS
88
</title>
9-
<meta name="author" content="@mr3rs">
10-
<meta name="description" content="CSS">
9+
<meta name="author" content="@mrmrs">
10+
<meta name="description" content="">
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
12-
<link rel="stylesheet" href="/css/tachyons.css">
12+
<link rel="stylesheet" href="/css/tachyons.min.css">
1313
</head>
1414
<body class="w-100 sans-serif">
1515

1616
<%= siteHeader %>
1717
<main class="">
18-
<article class="bg-near-white bt b--black-10 ph3 pt3 ph5-ns">
18+
<article class="bg-near-white bt b--black-10 pa3 ph5-ns">
1919
<h4 class="f4 mv0 fw6 dib mr4"><%= name %></h4>
2020
<span class="f4 b dib pl0 ml0 mr4">v<%= moduleVersion %></span>
2121
<span class="f4 b dib pl0 ml0 mr4"><%= moduleSize %></span>
@@ -37,15 +37,26 @@ <h4 class="f4 mv0 fw6 dib mr4"><%= name %></h4>
3737
<dd class="db pl0 ml0 f4 f2-ns b"><%= moduleObj.rules.size.average %></dd>
3838
</dl>
3939
</div>
40+
<p class="measure f3 lh-copy">
41+
Single purpose classes for setting the display of an element at any breakpoint.
42+
</p>
43+
<blockquote class="i measure f4 lh-copy mh0">
44+
The display property defines box’s display type, which consists of the two basic qualities of how an element generates boxes:
45+
the inner display type, which defines the kind of formatting context it generates, dictating how its descendant boxes are laid out.
46+
the outer display type, which dictates how the box participates in its parent formatting context.
47+
<footer class="f6">
48+
- <a href="https://www.w3.org/TR/css-display-3/#the-display-properties" class="link dim black-70 i">CSS3 Display Module Spec</a>
49+
</footer>
50+
</blockquote>
4051
</article>
4152
<div class="ph3 ph5-ns pt4 pb5">
4253
<h2 class="f3 bold">Examples</h2>
4354
<h3 class="f5 book pt4 caps">Display Block</h3>
4455
<p>Block will inherently set width to 100% of its parent element. It will also cause a line break, even if the declared width doesn't take up the full width of the parent.</p>
45-
<div class="db bg-black-10 mbs">
56+
<div class="db bg-black-10 mb2">
4657
block
4758
</div>
48-
<div class="db bg-black-10 mbs mw4">
59+
<div class="db bg-black-10 mb2 mw4">
4960
block
5061
</div>
5162

@@ -57,33 +68,33 @@ <h3 class="f5 book pt4 caps">Display Inline-Block</h3>
5768
width: 25% to four elements they will not just render as a 4 column layout by
5869
default.
5970
</p>
60-
<div class="dib bg-black-10 mbs">
71+
<div class="dib bg-black-10 mb2">
6172
display: inline-block
6273
</div>
63-
<div class="dib bg-black-10 mbs">
74+
<div class="dib bg-black-10 mb2">
6475
display: inline-block
6576
</div>
66-
<div class="dib bg-black-10 mbs">
77+
<div class="dib bg-black-10 mb2">
6778
display: inline-block
6879
</div>
69-
<div class="dib bg-black-10 mbs">
80+
<div class="dib bg-black-10 mb2">
7081
display: inline-block
7182
</div>
7283

7384
<h3 class="f5 book pt4 caps">Display Inline</h3>
7485
<p class="measure">
7586
Set content inline. Inline doesn't respect height or width values. It does not render white space between elements.
7687
</p>
77-
<div class="di bg-black-10 mbs">
88+
<div class="di bg-black-10 mb2">
7889
display: inline
7990
</div>
80-
<div class="di bg-black-10 mbs">
91+
<div class="di bg-black-10 mb2">
8192
display: inline
8293
</div>
83-
<div class="di bg-black-10 mbs">
94+
<div class="di bg-black-10 mb2">
8495
display: inline
8596
</div>
86-
<div class="di bg-black-10 mbs">
97+
<div class="di bg-black-10 mb2">
8798
display: inline
8899
</div>
89100

@@ -93,7 +104,7 @@ <h3 class="f5 book pt4 caps">Display Table</h3>
93104
without table markup. This can be useful for vertically aligning content
94105
or for auto-calculating a variable amount of table cells.
95106
</p>
96-
<div class="dt bg-black-10 mbs">
107+
<div class="dt bg-black-10 mb2">
97108
<div class="dtc v-mid paxs bg-black-10">display</div>
98109
<div class="dtc v-mid paxs bg-black-20">table</div>
99110
<div class="dtc v-mid paxs bg-black-10">will automatically</div>

0 commit comments

Comments
 (0)