Skip to content

Commit ee83523

Browse files
committed
Adjust picture, add figure to spec, adjust default styling of figures.
1 parent 5d2fd42 commit ee83523

4 files changed

Lines changed: 25 additions & 10 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,11 @@ <h3 id=flex-property><span class=secno>7.1. </span> The ‘<a
15751575
class=css>0</code>’.</span>
15761576

15771577
<p> The keyword ‘<code class=property>none</code>’ computes to ‘<code
1578-
class=css>0 0 auto</code>’.
1578+
class=css>0 0 auto</code>’. <figure> <img height=240
1579+
src="images/rel-vs-abs-flex.svg" width=504> <figcaption> A diagram showing
1580+
the difference between "absolute" flex (starting from a basis of zero) and
1581+
"relative" flex (starting from a basis of the item's content size).
1582+
</figcaption> </figure>
15791583

15801584
<h3 id=flex-examples><span class=secno>7.2. </span> Common Values of ‘<a
15811585
href="#flex"><code class=property>flex</code></a></h3>

css3-flexbox/Overview.src.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,16 @@ <h3 id='flex-property'>
10861086

10871087
<p>
10881088
The keyword 'none' computes to ''0 0 auto''.
1089+
1090+
<figure>
1091+
<img src='images/rel-vs-abs-flex.svg' width='504' height='240'>
1092+
<figcaption>
1093+
A diagram showing the difference between "absolute" flex
1094+
(starting from a basis of zero)
1095+
and "relative" flex
1096+
(starting from a basis of the item's content size).
1097+
</figcaption>
1098+
</figure>
10891099

10901100

10911101
<h3 id='flex-examples'>

css3-flexbox/images/rel-vs-abs-flex.svg

Lines changed: 1 addition & 1 deletion
Loading

default.css

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ body {
2525

2626
/* Pagination */
2727
h1, h2, h3, h4, h5, h6 { page-break-after: avoid }
28-
div.figure, div.sidefigure, pre, table.propdef, table.propdef-extra,
28+
figure, div.figure, div.sidefigure, pre, table.propdef, table.propdef-extra,
2929
div.example { page-break-inside: avoid }
3030
dt { page-break-after: avoid }
3131

@@ -215,36 +215,37 @@ ul.index {
215215
s, del {text-decoration: line-through; color: red}
216216
u, ins {text-decoration: underline; background: #bfa}
217217

218-
div.figure, div.sidefigure {
218+
div.figure, div.sidefigure, figure {
219219
text-align: center;
220220
margin: 2.5em 0;
221221
}
222-
div.sidefigure {
222+
div.sidefigure, figure.sidefigure {
223223
float: right;
224224
width: 50%;
225225
margin: 0 0 0.5em 0.5em
226226
}
227-
div.figure img, div.sidefigure img {
227+
div.figure img, div.sidefigure img, figure img,
228+
div.figure object, div.sidefigure object, figure object {
228229
display: block;
229230
margin: auto;
230231
max-width: 100%
231232
}
232-
p.caption, caption {
233+
p.caption, figcaption, caption {
233234
text-align: center;
234235
font-style: italic;
235236
font-size: 90%;
236237
}
237-
p.caption:before {
238+
p.caption:before, figcaption:before {
238239
content: "Figure " counter(figure) ". ";
239240
font-weight: bold;
240241
}
241-
p.caption {
242+
p.caption, figcaption {
242243
counter-increment: figure;
243244
}
244245

245246
/* DL list is indented, but figure inside it is not */
246247
dd { margin-left: 2em }
247-
dd div.figure { margin-left: -2em }
248+
dd div.figure, dd figure { margin-left: -2em }
248249

249250
sup {
250251
vertical-align: super;

0 commit comments

Comments
 (0)