Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to margin-block and margin-inline #2859

Merged
merged 9 commits into from
Mar 5, 2021
Merged

Changes to margin-block and margin-inline #2859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
357ccfc
Fixed cssxref errors in learn/css/css_layout/grids to prevent double-…
meyerweb Mar 2, 2021
19250f5
Merge branch 'main' of github.com:mdn/content into main
meyerweb Mar 4, 2021
b158377
Upgraded LiveSample for margin-inline
meyerweb Mar 4, 2021
8851be4
Upgraded LiveSample for margin-inline
meyerweb Mar 4, 2021
0592e97
Upgraded LiveSample for margin-block
meyerweb Mar 4, 2021
c591fb5
Tweaked LiveSample for margin-inline
meyerweb Mar 4, 2021
7633341
Tweaked LiveSample for margin-block
meyerweb Mar 4, 2021
e409638
Minor edit to margin-block
meyerweb Mar 4, 2021
655dfde
Minor edits to margin-block and margin-inline
meyerweb Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions files/en-us/web/css/margin-block/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
margin-block: unset;
</pre>

<p>These values corresponds to the {{CSSxRef("margin-top")}} and {{CSSxRef("margin-bottom")}}, or {{CSSxRef("margin-right")}}, and {{CSSxRef("margin-left")}} property depending on the values defined for {{CSSxRef("writing-mode")}}, {{CSSxRef("direction")}}, and {{CSSxRef("text-orientation")}}.</p>
<p>This property corresponds to the {{CSSxRef("margin-top")}} and {{CSSxRef("margin-bottom")}}, or the {{CSSxRef("margin-right")}} and {{CSSxRef("margin-left")}} properties, depending on the values defined for {{CSSxRef("writing-mode")}}, {{CSSxRef("direction")}}, and {{CSSxRef("text-orientation")}}.</p>

<h2 id="Constituent_properties">Constituent properties</h2>

Expand Down Expand Up @@ -58,30 +58,38 @@ <h2 id="Examples">Examples</h2>

<h3 id="Setting_block_start_and_end_margins">Setting block start and end margins</h3>

<h4 id="HTML">HTML</h4>

<pre class="brush: html">&lt;div&gt;
&lt;p class="exampleText"&gt;Example text&lt;/p&gt;
&lt;/div&gt;
</pre>

<h4 id="CSS">CSS</h4>

<pre class="brush: css">div {
background-color: yellow;
width: 120px;
height: 120px;
height: auto;
border: 1px solid green;
}

.exampleText {
writing-mode: vertical-rl;
p {
margin: 0;
margin-block: 20px 40px;
background-color: #c8c800;
background-color: tan;
}

.verticalExample {
writing-mode: vertical-rl;
}</pre>

<h4 id="HTML">HTML</h4>

<pre class="brush: html">&lt;div&gt;
&lt;p&gt;Example text&lt;/p&gt;
&lt;/div&gt;
&lt;div class="verticalExample"&gt;
&lt;p&gt;Example text&lt;/p&gt;
&lt;/div&gt;
</pre>

<h4 id="Result">Result</h4>

<p>{{EmbedLiveSample("Setting_block_start_and_end_margins", 140, 140)}}</p>
<p>{{EmbedLiveSample("Setting_block_start_and_end_margins", 140, 200)}}</p>

<h2 id="Specifications">Specifications</h2>

Expand Down
34 changes: 21 additions & 13 deletions files/en-us/web/css/margin-inline/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
margin-inline: unset;
</pre>

<p>This property corresponds to the {{CSSxRef("margin-top")}} and {{CSSxRef("margin-bottom")}}, or {{CSSxRef("margin-right")}}, and {{CSSxRef("margin-left")}} properties, depending on the values defined for {{CSSxRef("writing-mode")}}, {{CSSxRef("direction")}}, and {{CSSxRef("text-orientation")}}.</p>
<p>This property corresponds to the {{CSSxRef("margin-top")}} and {{CSSxRef("margin-bottom")}}, or the {{CSSxRef("margin-right")}} and {{CSSxRef("margin-left")}} properties, depending on the values defined for {{CSSxRef("writing-mode")}}, {{CSSxRef("direction")}}, and {{CSSxRef("text-orientation")}}.</p>

<h2 id="Constituent_properties">Constituent properties</h2>

Expand Down Expand Up @@ -60,30 +60,38 @@ <h2 id="Examples">Examples</h2>

<h3 id="Setting_inline_start_and_end_margins">Setting inline start and end margins</h3>

<h4 id="HTML">HTML</h4>

<pre class="brush: html">&lt;div&gt;
&lt;p class="exampleText"&gt;Example text&lt;/p&gt;
&lt;/div&gt;
</pre>

<h4 id="CSS">CSS</h4>

<pre class="brush: css">div {
background-color: yellow;
width: 120px;
height: 120px;
height: auto;
border: 1px solid green;
}

.exampleText {
writing-mode: vertical-rl;
p {
margin: 0;
margin-inline: 20px 40px;
background-color: #c8c800;
background-color: tan;
}

.verticalExample {
writing-mode: vertical-rl;
}</pre>

<h4 id="HTML">HTML</h4>

<pre class="brush: html">&lt;div&gt;
&lt;p&gt;Example text&lt;/p&gt;
&lt;/div&gt;
&lt;div class="verticalExample"&gt;
&lt;p&gt;Example text&lt;/p&gt;
&lt;/div&gt;
</pre>

<h4 id="Result">Result</h4>

<p>{{EmbedLiveSample("Setting_inline_start_and_end_margins", 140, 140)}}</p>
<p>{{EmbedLiveSample("Setting_inline_start_and_end_margins", 140, 240)}}</p>

<h2 id="Specifications">Specifications</h2>

Expand Down